diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/.travis.yml b/.travis.yml
index 529f3ea0ae3..6f54232a1d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
 # We use dist: precise to have php 5.3 available 
-dist: precise
+dist: trusty
 sudo: required
 
 language: php
@@ -31,7 +31,6 @@ addons:
     - pgloader
 
 php:
-- '5.3'
 - '5.4'
 - '5.5'
 - '5.6'
@@ -64,8 +63,6 @@ matrix:
   - php: nightly
   # We exclude some combinations not usefull to save Travis CPU
   exclude:
-  - php: '5.4'
-    env: DB=postgresql
   - php: '5.5'
     env: DB=postgresql
   - php: '5.6'
@@ -123,7 +120,7 @@ install:
 
 - |
   echo "Installing PHP Unit"
-  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
     composer -n require phpunit/phpunit ^4
   fi
   if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
@@ -143,137 +140,143 @@ install:
   echo "Adding path of binaries tools installed by composer to the PATH"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
   echo
-  
+
+
 
 before_script:
-- |
-  echo Start travis
-  echo Current dir is `pwd`
-  echo Home dir is `echo ~`
-  echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR
+  - |
+    echo Start travis
+    echo Current dir is `pwd`
+    echo Home dir is `echo ~`
+    echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR
 
-- |
-  echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit"
-  phpenv config-add /tmp/xdebug.ini
-  echo
-
-- |
-  echo "Setting up PHP"
-  echo
-  echo "Set timezone"
-  echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
-    #echo
-    #echo "Enabling APC for PHP <= 5.4"
-    #   Documentation says it should be available for PHP <= 5.6 but it's not for 5.5 and 5.6!
-    #echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  - |
+    echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit"
+    phpenv config-add /tmp/xdebug.ini
     echo
-    echo "Enabling Memcached for PHP <= 5.4"
-    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1, 7.2 and nightly!
-    echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-  fi
-  phpenv rehash
-  echo
 
-- |
-  if [ "$DEBUG" = true ]; then
-    echo "Debugging informations"
+  - |
+    echo "Setting up PHP"
+    echo
+    echo "Set timezone"
+    echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+    if [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
+      #echo
+      #echo "Enabling APC for PHP <= 5.4"
+      #   Documentation says it should be available for PHP <= 5.6 but it's not for 5.5 and 5.6!
+      #echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+      echo
+      echo "Enabling Memcached for PHP <= 5.4"
+      #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1, 7.2 and nightly!
+      echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+    fi
+    phpenv rehash
+    echo
+
+  - |
+    echo "Versions information"
     # Check PHP
-    php -i
+    echo "PHP version"
+    php -i | head -
     # Check PHP CodeSniffer installation
+    echo "PHPCS version"
     which phpcs
-    phpcs --version
-    phpcs -i
+    phpcs --version | head -
+    phpcs -i | head -
     # Check PHPUnit installation
+    echo "PHPUnit version"
     which phpunit
-    phpunit --version
-    # Check MySQL
-    mysql --version
-    mysql -e "SELECT VERSION();"
+    phpunit --version | head -
+    # Check Apache version
+    echo "Apache version"
+    apache2 -v | head -
+    # Check MariaDb
+    echo "MariaDb version"
+    mysql --version | head -
+    mysql -e "SELECT VERSION();"  | head -
     echo
-  fi
   
-- |
-  echo "Setting up database"
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
-    echo "MySQL"
-    mysql -e 'DROP DATABASE IF EXISTS travis;'
-    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
-    mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-    mysql -e 'FLUSH PRIVILEGES;'    
-    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-  fi
-  if [ "$DB" = 'postgresql' ]; then
-    #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-    #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr
-    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-  fi
-  # TODO: SQLite
-  echo
+  - |
+    echo "Setting up database"
+    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
+      echo "MySQL"
+      mysql -e 'DROP DATABASE IF EXISTS travis;'
+      mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+      mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
+      mysql -e 'FLUSH PRIVILEGES;'    
+      mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+    fi
+    if [ "$DB" = 'postgresql' ]; then
+      #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+      #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr
+      pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+    fi
+    # TODO: SQLite
+    echo
 
-- |
-  export CONF_FILE=htdocs/conf/conf.php
-  echo "Setting up Dolibarr $CONF_FILE"
-  echo '<?php ' > $CONF_FILE
-  echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
-  echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
-  echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
-  echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
-  echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
-  echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
-    echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
-  fi
-  if [ "$DB" = 'postgresql' ]; then
-    echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
-  fi
-  # TODO: SQLite
-  echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
-  cat $CONF_FILE
-  echo
+  - |
+    export CONF_FILE=htdocs/conf/conf.php
+    echo "Setting up Dolibarr $CONF_FILE"
+    echo '<?php ' > $CONF_FILE
+    echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
+    echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
+    echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
+    echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
+    echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
+    echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
+    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
+      echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
+    fi
+    if [ "$DB" = 'postgresql' ]; then
+      echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
+    fi
+    # TODO: SQLite
+    echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
+    cat $CONF_FILE
+    echo
 
-- |
-  echo "Create documents directory and set permissions"
-  # and admin/temp subdirectory needed for unit tests
-  mkdir -p documents/admin/temp
-  echo "first line" > documents/dolibarr.log
-  echo
+  - |
+    echo "Create documents directory and set permissions"
+    # and admin/temp subdirectory needed for unit tests
+    mkdir -p documents/admin/temp
+    echo "first line" > documents/dolibarr.log
+    echo
 
-- |
-  echo "Setting up Apache + FPM"
+
+  - echo "Setting up Apache + FPM"
+  - sudo apt-get update
+  - sudo apt-get install apache2 libapache2-mod-fastcgi
   # enable php-fpm
-  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
-  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
-    # Copy the included pool
-    cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf
-  fi
-  if [ "$DEBUG" = true ]; then
-    cat ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
-  fi
-  sudo a2enmod rewrite actions fastcgi alias
-  echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-  if [ "$DEBUG" = true ]; then
-    cat ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-  fi
-  ~/.phpenv/versions/$PHP_VERSION_NAME/sbin/php-fpm
-  # configure apache virtual hosts
-  sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/default
-  sudo sed -e "s?%TRAVIS_BUILD_DIR%?$TRAVIS_BUILD_DIR?g" --in-place /etc/apache2/sites-available/default
-  if [ "$DEBUG" = true ]; then
-    sudo cat /etc/apache2/sites-available/default
-  fi
-  sudo service apache2 restart
-  echo
+  - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
+  - |
+    if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+      # Copy the included pool
+      sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
+    fi
+  - sudo a2enmod rewrite actions fastcgi alias
+  - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
+  - sudo chown -R travis:travis /var/lib/apache2/fastcgi
+  - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+  # configure apache virtual hosts for precise
+  #- sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
+  #- sudo cat /etc/apache2/sites-available/default
+  # configure apache virtual hosts for trusty
+  - sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
+  - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
+  - sudo cat /etc/apache2/sites-available/000-default.conf
+  - sudo service apache2 restart
+
+
 
 script:
 - |
-  echo "Checking webserver availability"
+  echo "Checking webserver availability by a wget -O - http://127.0.0.1"
   # Ensure we catch errors
   set -e
-  wget http://127.0.0.1
-  if [ "$DEBUG" = true ]; then
-    cat index.html
-  fi
+  # The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
+  wget -O - http://127.0.0.1 > test.html
+  head test.html
   set +e
   echo
 
@@ -341,7 +344,6 @@ script:
   
 - |
   echo "Unit testing"
-  phpunit --version
   # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file.
   set -e
   phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000000..9a84fdbbda0
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,84 @@
+# Code of Conduct
+
+## 1. Purpose
+
+A primary goal of Dolibarr is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+
+This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+We invite all those who participate in Dolibarr to help us create safe and positive experiences for everyone.
+
+## 2. Open Source Citizenship
+
+A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
+
+Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
+
+If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
+
+## 3. Expected Behavior
+
+The following behaviors are expected and requested of all community members:
+
+*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+*   Exercise consideration and respect in your speech and actions.
+*   Attempt collaboration before conflict.
+*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
+*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
+*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
+
+## 4. Unacceptable Behavior
+
+The following behaviors are considered harassment and are unacceptable within our community:
+
+*   Violence, threats of violence or violent language directed against another person.
+*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
+*   Posting or displaying sexually explicit or violent material.
+*   Posting or threatening to post other people’s personally identifying information ("doxing").
+*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+*   Inappropriate photography or recording.
+*   Inappropriate physical contact. You should have someone’s consent before touching them.
+*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
+*   Deliberate intimidation, stalking or following (online or in person).
+*   Advocating for, or encouraging, any of the above behavior.
+*   Sustained disruption of community events, including talks and presentations.
+
+## 5. Consequences of Unacceptable Behavior
+
+Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
+
+Anyone asked to stop unacceptable behavior is expected to comply immediately.
+
+If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
+
+## 6. Reporting Guidelines
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. contact@dolibarr.org.
+
+
+
+Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
+
+## 7. Addressing Grievances
+
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Dolibarr with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
+
+
+
+## 8. Scope
+
+We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
+
+This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
+
+## 9. Contact info
+
+contact@dolibarr.org
+
+## 10. License and attribution
+
+This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
+
+Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
+
+Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)
diff --git a/ChangeLog b/ChangeLog
index 610f34d669f..410e49eaf4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ English Dolibarr ChangeLog
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* Remove old deprecated hook 'insertExtraFields'. Triggers must be used for action on CRUD events.
 * Hook 'maildao' was renamed into 'mail' into the method sendfile that send emails, and method was renamed from
   'doaction' into 'sendMail'. 
 * Rename trigger CONTRACT_SERVICE_ACTIVATE into LINECONTRACT_ACTIVATE and
@@ -20,8 +21,100 @@ Following changes may create regressions for some external modules, but were nec
 * Removed method fetch_prods() and get_each_prod() not used, keep only get_arbo_each_prod() that is better.
 * The hook contaxt commcard has been renamed thirdpartycomm
 * The hook contaxt thirdpartycard has been renamed thirdpartycontact
+* Remove method Categorie:get_nb_categories() that was not used.
 
 
+
+***** ChangeLog for 7.0.2 compared to 7.0.1 *****
+FIX: #8023
+FIX: #8259 can't update contact birthday with REST API
+FIX: #8359
+FIX: #8389
+FIX: #8478 !empty instead of count to avoid warning
+FIX: #8488
+FIX: #8559 Bug to generate cheque receipt
+FIX: #8571
+FIX: #8574
+FIX: #8580
+FIX: #8650
+FIX: actioncomm export: type filtering not working
+FIX: Add a test to avoid to reset binding by error.
+FIX: addline on invoice supplier manage rank on its own if not provided
+FIX: Add warning when expense report line not into range
+FIX: avoid Error: Call to undefined method mysqli::get_charset()
+FIX: avoid focus problem when select2 is in a modal dialog window
+FIX: Binding pages must start on fiscal month not calendar month
+FIX: button "Classify bill" on supplier order was not visible
+FIX: Button receive products not visible
+FIX: can bypass the CSRF protection with url with domain inside
+FIX: Can't edit option PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY
+FIX: commonobject: don't require notnull field if default set
+FIX: CommonObject: don't require 'notnull' field if 'default' set
+FIX: cron script disabled if module disabled
+FIX: CVE-2018-10092
+FIX: CVE-2018-10094
+FIX: CVE-2018-10095
+FIX: CVE-2018-9019
+FIX: CWE-89
+FIX: Data on income/expense report was always 0
+FIX: default addupdatedelete actions: uniformize add/update value checks
+FIX: default currency not set on supplier order creation from commercial menu #8459
+FIX: delete all product variants of a parent product
+FIX: Detail per account not visible when total < 0
+FIX: DOL_AUTOSET_COOKIE was not correctly setting value of cookie
+FIX: don't print empty date in CommonObject::showOutputField
+FIX: dont print empty date in CommonObject::showOutputField
+FIX: Draft invoice must be excluded from report
+FIX: environment shown on cron card
+FIX: Error in ContractLigne not return to Contract
+FIX: extrafields price and double were lost during a failed post.
+FIX: File name not visible in email preview
+FIX: filter/sorting on extrafield on contact list from contact tab
+FIX: Initial month on report income/expense per predefined group
+FIX: issue #8037
+FIX: Issue #8455
+FIX: issue #8470
+FIX: label in getnomurl projectlist
+FIX: limit access of email template page to internal users
+FIX: look and feel v7 "back to" for bookkeeping record
+FIX: Max nb of generation of recurring invoice should not show warning
+FIX: missing english name for object
+FIX: Missing include
+FIX: missing User object with API REST
+FIX: modulebuilder: could not create html fields
+FIX: modulebuilder: handle 'price' fieldtype
+FIX: multiple creation of same event
+FIX: Name of user not visible on journalizing expense report payments
+FIX: Not approved holidays must not be visible into timesheet
+FIX: Only approved expense report must be journalized
+FIX: payment term doc-specific label was not used
+FIX: payment term doc-specific label was not used (issue #8414)
+FIX: project category is type 6 not 5
+FIX: Projet is not prefilled when created from overwiew page
+FIX: Related contact printed in societe agenda
+FIX: Removed error when no error on accounting setup page
+FIX: remove var_dump
+FIX: sanitize setup params
+FIX: selectForFormsList: entity checked even is object not multi-entity managed
+FIX: service creation, right is tested regarding the product type
+FIX: some localtaxes errors
+FIX: Some report have data when several chart of accounts exists
+FIX: sql error using no category
+FIX: SQL Injection CWE-89
+FIX: Support or multicompany for sheduled jobs
+FIX: Test on mandatory status when closing proposal failed
+FIX: to allow IRPF not null even if main VAT is null.
+FIX: update wrong datetime extrafield
+FIX: Use priority to define order of sheduled jobs
+FIX: various modulebuilder-related issues
+FIX: view of balance before field
+FIX: weird password autocompletion in Goocle Chrome (issue #8479)
+FIX: weird password autocompletion in Google Chrome (issue #8479)
+FIX: When clearing filter, we must not save tmp criterias in session
+FIX: With x extrafields, request for multicompany label was done x times
+FIX: several XSS
+FIX: zip not filtered
+
 ***** ChangeLog for 7.0.1 compared to 7.0.0 *****
 FIX: #8139 User search does not work if MAIN_USE_OLD_SEARCH_FORM, missing list.php
 FIX: #8200
@@ -377,7 +470,22 @@ Following changes may create regressions for some external modules, but were nec
 
 
 
-***** ChangeLog for 6.0.6 compared to 6.0.6 *****
+***** ChangeLog for 6.0.7 compared to 6.0.6 *****
+FIX: #8023
+FIX: #8259 can't update contact birthday with REST API
+FIX: #8478 !empty instead of count to avoid warning
+FIX: #8488
+FIX: actioncomm export: type filtering not working
+FIX: addline on invoice supplier manage rank on its own if not provided
+FIX: issue #8037
+FIX: label in getnomurl projectlist
+FIX: payment term doc-specific label was not used
+FIX: payment term doc-specific label was not used (issue #8414)
+FIX: project category is type 6 not 5 !!
+FIX: some localtaxes errors
+FIX: weird password autocompletion in Google Chrome (issue #8479)
+
+***** ChangeLog for 6.0.6 compared to 6.0.5 *****
 FIX: #7974 Contract - Invalid reference on the document
 FIX: #8139
 FIX: #8139 User search does not work if MAIN_USE_OLD_SEARCH_FORM, missing list.php
diff --git a/README-FR.md b/README-FR.md
index 8e6a2c5aac0..a9745bb8dbb 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -138,9 +138,10 @@ Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 Les documentations utilisateur, développeur et traducteur sont disponible sous forme de ressources de la communautés via la site [Wiki](https://wiki.dolibarr.org).
 
 
-## CONTRIBUTING
+## CONTRIBUER
 
-Voir le fichier [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
+Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
+<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
 
 
 ## CREDITS
diff --git a/README.md b/README.md
index 3d9ba75f1f5..b68e8b65558 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
 
-## FUTURE
+## WHAT DOLIBARR CAN'T DO YET
 
 These are features that Dolibarr does **not** yet fully support:
 
@@ -179,7 +179,8 @@ Administrator, user, developer and translator's documentations are available alo
 
 ## CONTRIBUTING
 
-See [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md) file
+This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
+<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
 
 
 ## CREDITS
@@ -199,3 +200,8 @@ Follow Dolibarr project on:
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
+
+
+### Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 5f54c95d7e0..93ee76e3359 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -45,7 +45,7 @@ $includeconstants=array();
 
 if (empty($argv[1]))
 {
-    print "Usage:   ".$script_file." release=auto|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+    print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
     print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
     exit -1;
 }
@@ -68,30 +68,52 @@ while ($i < $argc)
     $i++;
 }
 
+if (empty($release))
+{
+	print "Error: Missing release paramater\n";
+	print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+	exit -1;
+}
+
+$savrelease = $release;
+
 // If release is auto, we take current version
 $tmpver=explode('-', $release, 2);
-if ($tmpver[0] == 'auto')
+if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable')
 {
 	$release=DOL_VERSION;
-	if ($tmpver[1]) $release.='-'.$tmpver[1];
+	if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
 }
 
 if (empty($includecustom))
 {
-	$tmpver=explode('-', $release, 2);
-	if (DOL_VERSION != $tmpver[0])
-    {
-    	print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpver[0].')'."\n";
-        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
-        exit -1;
-    }
+	$tmpverbis=explode('-', $release, 2);
+	if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable')
+	{
+		if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
+	    {
+	    	print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
+	    	print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+	        exit -1;
+	    }
+	}
+	else
+	{
+		$tmpverter=explode('-', DOL_VERSION, 2);
+		if ($tmpverter[0] != $tmpverbis[0])
+		{
+			print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
+			print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+			exit -1;
+		}
+	}
 }
 else
 {
     if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
     {
-        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
-        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
+        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
+        print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
         exit -1;
     }
 }
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 77d78da1dc5..1ab3269d0de 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -466,10 +466,12 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.xz`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.xz`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.xz`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
@@ -849,6 +851,8 @@ if ($nboftargetok) {
 			unlink("$NEWDESTI/${FILENAMEDEB}.changes");
 			print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n";
 			unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz");
+			print "Remove target ${FILENAMEDEB}.debian.tar.xz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.xz");
 			print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
 			unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");
 
@@ -1024,7 +1028,7 @@ if ($nboftargetok) {
 			$ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
 			$ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
 			$ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
-			$ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.debian.tar.xz "$NEWDESTI/"`;
 			$ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
 			next;
 		}
@@ -1168,7 +1172,7 @@ if ($nboftargetok) {
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_amd64.changes"=>'none',		# none means it won't be published on SF
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.dsc"=>'none',					# none means it won't be published on SF
-			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.gz"=>'none',		# none means it won't be published on SF
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.xz"=>'none',		# none means it won't be published on SF
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none',		# none means it won't be published on SF
 			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
@@ -1181,8 +1185,7 @@ if ($nboftargetok) {
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_amd64.changes"=>'package_debian-ubuntu',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.dsc"=>'package_debian-ubuntu',
-			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.gz"=>'package_debian-ubuntu',
-			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'package_debian-ubuntu',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.xz"=>'package_debian-ubuntu',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'package_debian-ubuntu',
 			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
diff --git a/build/travis-ci/apache.conf b/build/travis-ci/apache.conf
index 5ba713924f2..a4965c40d68 100644
--- a/build/travis-ci/apache.conf
+++ b/build/travis-ci/apache.conf
@@ -1,11 +1,10 @@
 <VirtualHost *:80>
   DocumentRoot %TRAVIS_BUILD_DIR%/htdocs
 
-  <Directory "%TRAVIS_BUILD_DIR%/htdocs">
+  <Directory "%TRAVIS_BUILD_DIR%/htdocs/">
     Options FollowSymLinks MultiViews ExecCGI
     AllowOverride All
-    Order deny,allow
-    Allow from all
+    Require all granted
   </Directory>
 
   # Wire up Apache to use Travis CI's php-fpm.
@@ -14,5 +13,9 @@
     Action php5-fcgi /php5-fcgi
     Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
     FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
+    
+    <Directory /usr/lib/cgi-bin>
+        Require all granted
+    </Directory>
   </IfModule>
 </VirtualHost>
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 9e6ab3a8ddc..cdbc2e2bb40 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -90,6 +90,14 @@ var vTmpNode=this.newNode(vTmpCell, 'div', null, '');
 vTmpNode=this.newNode(vTmpNode, 'a', null, '', vLangs[vLang]['moreinfo']);
 vTmpNode.setAttribute('href',vTaskList[i].getLink());
                         
+* Replace '% Comp.' to have a smaller text column header
+'comp':'% Comp.'
+with
+'comp':'%'
+
+
+
+
 
 JCROP:
 ------
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index e5485b280ae..5e2337fd67e 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -138,9 +138,7 @@
 
 	<rule ref="Generic.NamingConventions.ConstructorName" />
 	<!-- Check if we use PHP4 constructor instead of __construct() -->
-	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle">
-        <severity>0</severity>
-	</rule>
+	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle" />
 
 	<rule ref="Generic.NamingConventions.UpperCaseConstantName" />
 
@@ -156,8 +154,8 @@
     <!-- Warning when using @ before functions -->
     <!-- <rule ref="Generic.PHP.NoSilencedErrors" /> -->
 
-	<!-- Say if null, true, false must be uppercase -->
-	<!-- <rule ref="Generic.PHP.UpperCaseConstant" /> -->
+	<!-- Say if null, true, false must be uppercase (Rule 2.5 of PSR2 https://www.php-fig.org/psr/psr-2/) -->
+	<rule ref="Generic.PHP.LowerCaseConstant" />
 
 	<rule ref="Generic.Strings.UnnecessaryStringConcat" />
 
diff --git a/dev/tools/github_authors_peryear.sh b/dev/tools/github_authors_peryear.sh
index 99b28d4d417..1f3a7fea5f6 100755
--- a/dev/tools/github_authors_peryear.sh
+++ b/dev/tools/github_authors_peryear.sh
@@ -1,7 +1,13 @@
 #!/bin/sh
 
-FROM=2016-01-01
-TO=2016-12-31
+if [ "x$1" = "x" ]; then
+	echo "Usage: $0 YEAR"
+	exit
+fi
+
+
+FROM=$1-01-01
+TO=$1-12-31
 
 echo "git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l"
 git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l
diff --git a/dev/tools/github_commits_perversion.sh b/dev/tools/github_commits_perversion.sh
index 40ddafee617..bf76e68bc43 100755
--- a/dev/tools/github_commits_perversion.sh
+++ b/dev/tools/github_commits_perversion.sh
@@ -1,10 +1,11 @@
 #/bin/bash
-Releases=("3.8" "3.9" "4.0" "5.0", "develop")
-Dates=("2010-01-01", "2011-01-01", "2012-01-01", "2013-01-01", "2014-01-01", "2015-01-01", "2016-07-01")
+Releases=("3.8" "3.9" "4.0" "5.0" "6.0" " 7.0" "develop")
+Dates=("2013-01-01", "2014-01-01", "2015-01-01", "2016-07-01", "2017-02-01", "2017-07-01", "2018-02-01", "2050-01-01")
 let "counter = 1"
 
 for i in "${Releases[@]}"
 do
+  echo "=== $counter git shortlog -s -n  --after=${Dates[counter-1]} --before=${Dates[counter]}"
   git shortlog -s -n  --after=${Dates[counter-1]} --before=${Dates[counter]}
   echo -n "Total $i: " 
   git log --pretty=oneline --after=${Dates[counter-1]} --before=${Dates[counter]} | wc -l
diff --git a/dev/tools/test/testtcpdf.php b/dev/tools/test/testtcpdf.php
index ad67bce8af9..e14dae9c2a3 100755
--- a/dev/tools/test/testtcpdf.php
+++ b/dev/tools/test/testtcpdf.php
@@ -101,7 +101,7 @@ $pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
 $pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
 
 //set auto page breaks
-$pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
+$pdf->SetAutoPageBreak(true, PDF_MARGIN_BOTTOM);
 
 //set image scale factor
 $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
diff --git a/dev/tools/test/testutf.php b/dev/tools/test/testutf.php
index cb83f431b93..c626a92a57d 100644
--- a/dev/tools/test/testutf.php
+++ b/dev/tools/test/testutf.php
@@ -76,7 +76,7 @@ $pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
 $pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
 
 //set auto page breaks
-$pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
+$pdf->SetAutoPageBreak(true, PDF_MARGIN_BOTTOM);
 
 //set image scale factor
 //$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 7d73202eb79..b831a242bbf 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -28,12 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
-// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("admin");
-$langs->load("accountancy");
-$langs->load("salaries");
+$langs->loadLangs(array("compta","bills","admin","accountancy","salaries"));
 
 $mesg = '';
 $action = GETPOST('action','aZ09');
@@ -175,9 +170,9 @@ $pcgver = $conf->global->CHARTOFACCOUNTS;
 $sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.pcg_subtype, aa.account_number, aa.account_parent , aa.label, aa.active, ";
 $sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
 $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-if ($db->type == 'pgsql') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent";
-else $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version AND aa.entity = " . $conf->entity;
+if ($db->type == 'pgsql') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = " . $conf->entity;
+else $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = " . $conf->entity;
 $sql .= " WHERE asy.rowid = " . $pcgver;
 //print $sql;
 if (strlen(trim($search_account)))			$sql .= natural_search("aa.account_number", $search_account);
@@ -193,6 +188,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -225,9 +225,11 @@ if ($resql)
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-	$htmlbuttonadd = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>';
+	$newcardbutton = '<a class="butActionNew" href="./card.php?action=create">' . $langs->trans("Addanaccount");
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 
-	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $htmlbuttonadd, '', $limit);
+	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
 
 	// Box to select active chart of account
     print $langs->trans("Selectchartofaccounts") . " : ";
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 9728a9524ea..f8a31b239bb 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2015  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2018  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
  * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
@@ -45,7 +45,7 @@ $langs->loadLangs(array("errors","admin","companies","resource","holiday","compt
 
 $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
-$id=GETPOST('id','int');
+$id=31;
 $rowid=GETPOST('rowid','alpha');
 $code=GETPOST('code','alpha');
 
@@ -58,8 +58,8 @@ $listoffset=GETPOST('listoffset');
 $listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
 $active = 1;
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
+$sortfield = GETPOST("sortfield",'aZ09comma');
+$sortorder = GETPOST("sortorder",'aZ09comma');
 $page = GETPOST("page",'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $listlimit * $page ;
@@ -84,59 +84,48 @@ $hookmanager->initHooks(array('admin'));
 $tabname=array();
 
 $tabname[31]= MAIN_DB_PREFIX."accounting_system";
-$tabname[32]= MAIN_DB_PREFIX."c_accounting_category";
 
 // Dictionary labels
 $tablib=array();
 $tablib[31]= "Pcg_version";
-$tablib[32]= "DictionaryAccountancyCategory";
 
 // Requests to extract data
 $tabsql=array();
 $tabsql[31]= "SELECT s.rowid as rowid, pcg_version, s.label, s.fk_country as country_id, c.code as country_code, c.label as country, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_country as c WHERE s.fk_country=c.rowid and c.active=1";
-$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.sens, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
 $tabsqlsort[31]="pcg_version ASC";
-$tabsqlsort[32]="position ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
 $tabfield[31]= "pcg_version,label,country_id,country";
-$tabfield[32]= "code,label,range_account,sens,category_type,formula,position,country_id,country";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
 $tabfieldvalue[31]= "pcg_version,label,country";
-$tabfieldvalue[32]= "code,label,range_account,sens,category_type,formula,position,country";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
 $tabfieldinsert[31]= "pcg_version,label,fk_country";
-$tabfieldinsert[32]= "code,label,range_account,sens,category_type,formula,position,fk_country";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
 //          "nameoffield" if id field is not "rowid" or has not autoincrement on
 $tabrowid=array();
 $tabrowid[31]= "";
-$tabrowid[32]= "";
 
 // Condition to show dictionary in setup page
 $tabcond=array();
 $tabcond[31]= ! empty($conf->accounting->enabled);
-$tabcond[32]= ! empty($conf->accounting->enabled);
 
 // List of help for fields
 $tabhelp=array();
 $tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
-$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck=array();
 $tabfieldcheck[31] = array();
-$tabfieldcheck[32] = array();
 
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
@@ -484,7 +473,7 @@ print "<br>\n";
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.urlencode($page).'&':'').'sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder).'&rowid='.urlencode($rowid).'&code='.urlencode($code).'&id='.urlencode($id), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
 //var_dump($elementList);
 
@@ -503,24 +492,9 @@ if ($id)
 		$sql.= " c.rowid = ".$search_country_id;
 	}
 
-	if ($sortfield)
-	{
-		// If sort order is "country", we use country_code instead
-		if ($sortfield == 'country') $sortfield='country_code';
-		$sql.= " ORDER BY ".$sortfield;
-		if ($sortorder)
-		{
-			$sql.=" ".strtoupper($sortorder);
-		}
-		$sql.=", ";
-		// Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-		$tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
-		$tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
-	}
-	else {
-		$sql.=" ORDER BY ";
-	}
-	$sql.=$tabsqlsort[$id];
+	// If sort order is "country", we use country_code instead
+	if ($sortfield == 'country') $sortfield='country_code';
+	$sql.=$db->order($sortfield,$sortorder);
 	$sql.=$db->plimit($listlimit+1,$offset);
 	//print $sql;
 
@@ -643,25 +617,13 @@ if ($id)
 		$reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
 		$error=$hookmanager->error; $errors=$hookmanager->errors;
 
-		if ($id == 3) unset($fieldlist[2]);
-
 		if (empty($reshook))
 		{
-			if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
-			{
-				fieldListAccountModel($fieldlist,$obj,$tabname[$id],'hide');
-			}
-			else
-			{
-				fieldListAccountModel($fieldlist,$obj,$tabname[$id],'add');
-			}
+			fieldListAccountModel($fieldlist,$obj,$tabname[$id],'add');
 		}
 
 		print '<td colspan="3" align="right">';
-		if ($tabname[$id] != MAIN_DB_PREFIX.'c_email_templates' || $action != 'edit')
-		{
-			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-		}
+		print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
 		print '</td>';
 		print "</tr>";
 
@@ -683,7 +645,6 @@ if ($id)
 	{
 		$num = $db->num_rows($resql);
 		$i = 0;
-		$var=true;
 
 		$param = '&id='.$id;
 		if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
@@ -880,7 +841,7 @@ if ($id)
 								$valuetoshow=price($valuetoshow);
 							}
 							else if ($fieldlist[$field]=='libelle_facture') {
-								$langs->load("bills");
+								$langs->loadLangs(array("bills"));
 								$key=$langs->trans("PaymentCondition".strtoupper($obj->code));
 								$valuetoshow=($obj->code && $key != "PaymentCondition".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 								$valuetoshow=nl2br($valuetoshow);
@@ -890,7 +851,7 @@ if ($id)
 								$valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 							}
 							else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_availability') {
-								$langs->load("propal");
+								$langs->loadLangs(array("propal"));
 								$key=$langs->trans("AvailabilityType".strtoupper($obj->code));
 								$valuetoshow=($obj->code && $key != "AvailabilityType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 							}
@@ -915,17 +876,17 @@ if ($id)
 								$valuetoshow=($obj->code && $key != "Civility".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 							}
 							else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_type_contact') {
-								$langs->load('agenda');
+								$langs->loadLangs(array("agenda"));
 								$key=$langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
 								$valuetoshow=($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 							}
 							else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_payment_term') {
-								$langs->load("bills");
+								$langs->loadLangs(array("bills"));
 								$key=$langs->trans("PaymentConditionShort".strtoupper($obj->code));
 								$valuetoshow=($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 							}
 							else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_paiement') {
-								$langs->load("bills");
+								$langs->loadLangs(array("bills"));
 								$key=$langs->trans("PaymentType".strtoupper($obj->code));
 								$valuetoshow=($obj->code && $key != "PaymentType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 							}
@@ -934,12 +895,12 @@ if ($id)
 								$valuetoshow=($obj->code && $key != "DemandReasonType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 							}
 							else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_input_method') {
-								$langs->load("orders");
+								$langs->loadLangs(array("orders"));
 								$key=$langs->trans($obj->code);
 								$valuetoshow=($obj->code && $key != $obj->code)?$key:$obj->{$fieldlist[$field]};
 							}
 							else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_shipment_mode') {
-								$langs->load("sendings");
+								$langs->loadLangs(array("sendings"));
 								$key=$langs->trans("SendingMethod".strtoupper($obj->code));
 								$valuetoshow=($obj->code && $key != "SendingMethod".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
 							}
@@ -950,7 +911,7 @@ if ($id)
 							}
 							else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
 							{
-								$langs->load('trips');
+								$langs->loadLangs(array("trips"));
 								$key = $langs->trans(strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
 							}
@@ -961,11 +922,11 @@ if ($id)
 								$valuetoshow = $langs->getCurrencySymbol($obj->code,1);
 							}
 							else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
-								$langs->load("products");
+								$langs->loadLangs(array("products"));
 								$valuetoshow=$langs->trans($obj->{$fieldlist[$field]});
 							}
 							else if ($fieldlist[$field]=='short_label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
-								$langs->load("products");
+								$langs->loadLangs(array("products"));
 								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
 							}
 							else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
@@ -1062,7 +1023,6 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 	global $form;
 	global $region_id;
 	global $elementList,$sourceList;
-	global $bc;
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
@@ -1162,16 +1122,11 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 		}
 		elseif (in_array($fieldlist[$field], array('content')))
 		{
-			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
-			{
-				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
-			}
-			else print '<td>';
+			print '<td>';
 			if ($context != 'hide')
 			{
 				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
 				$okforextended=true;
-				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
 				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_5, '90%');
 				print $doleditor->Create(1);
 			}
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 61166f88d07..669283077d9 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -31,9 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $error = 0;
 
-// Langs
-$langs->load("bills");
-$langs->load("accountancy");
+$langs->loadLangs(array("bills","accountancy"));
 
 $mesg = '';
 $action = GETPOST('action','aZ09');
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index a91c22ffe4c..34a857d65d4 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $error = 0;
 
-$langs->load("bills");
-$langs->load("accountancy");
+$langs->loadLangs(array("bills","accountancy"));
 
 $mesg = '';
 $id = GETPOST('id', 'int');
@@ -71,7 +70,7 @@ if (! empty($selectcpt)) {
 	if ($return<0) {
 		setEventMessages($langs->trans('errors'), $accountingcategory->errors, 'errors');
 	} else {
-		setEventMessages($langs->trans('Saved'), null, 'mesgs');
+		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
 	}
 }
 if ($action == 'delete') {
@@ -94,7 +93,7 @@ $formaccounting = new FormAccounting($db);
 
 llxheader('', $langs->trans('AccountingCategory'));
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories_list.php?search_country_id='.$mysoc->country_id.'">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 print load_fiche_titre($langs->trans('AccountingCategory'), $linkback);
 
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index fb7561dda94..681030a179f 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -54,8 +54,8 @@ $listoffset=GETPOST('listoffset');
 $listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
 $active = 1;
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
+$sortfield = GETPOST("sortfield",'aZ09comma');
+$sortorder = GETPOST("sortorder",'aZ09comma');
 $page = GETPOST("page",'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $listlimit * $page ;
@@ -178,7 +178,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     }
     if (! is_numeric(GETPOST('position','alpha')))
     {
-    	$langs->load("errors");
+    	$langs->loadLangs(array("errors"));
    		$ok=0;
    		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
     }
@@ -300,7 +300,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
     if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
     else { $rowidcol="rowid"; }
 
-    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = '".$this->db->escape($rowid)."'";
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
 
     dol_syslog("delete", LOG_DEBUG);
     $result = $db->query($sql);
@@ -324,10 +324,10 @@ if ($action == $acts[0])
     else { $rowidcol="rowid"; }
 
     if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$this->db->escape($rowid)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
     }
     elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$this->db->escape($code)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
     }
 
     $result = $db->query($sql);
@@ -344,10 +344,10 @@ if ($action == $acts[1])
     else { $rowidcol="rowid"; }
 
     if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$this->db->escape($rowid)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
     }
     elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$this->db->escape($code)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
     }
 
     $result = $db->query($sql);
@@ -364,10 +364,10 @@ if ($action == 'activate_favorite')
     else { $rowidcol="rowid"; }
 
     if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$this->db->escape($rowid)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
     }
     elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$this->db->escape($code)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
     }
 
     $result = $db->query($sql);
@@ -384,10 +384,10 @@ if ($action == 'disable_favorite')
     else { $rowidcol="rowid"; }
 
     if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$this->db->escape($rowid)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
     }
     elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$this->db->escape($code)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
     }
 
     $result = $db->query($sql);
@@ -437,24 +437,9 @@ if ($id)
         $sql.= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
     }
 
-    if ($sortfield)
-    {
-        // If sort order is "country", we use country_code instead
-    	if ($sortfield == 'country') $sortfield='country_code';
-        $sql.= " ORDER BY ".$sortfield;
-        if ($sortorder)
-        {
-            $sql.=" ".strtoupper($sortorder);
-        }
-        $sql.=", ";
-        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
-        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
-    }
-    else {
-        $sql.=" ORDER BY ";
-    }
-    $sql.=$tabsqlsort[$id];
+    // If sort order is "country", we use country_code instead
+    if ($sortfield == 'country') $sortfield='country_code';
+    $sql.=$db->order($sortfield,$sortorder);
     $sql.=$db->plimit($listlimit+1,$offset);
     //print $sql;
 
@@ -471,7 +456,6 @@ if ($id)
     if ($tabname[$id])
     {
         $alabelisused=0;
-        $var=false;
 
         $fieldlist=explode(',',$tabfield[$id]);
 
@@ -565,7 +549,6 @@ if ($id)
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        $var=true;
 
         $param = '&id='.$id;
         if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
@@ -735,7 +718,7 @@ if ($id)
                                 $valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_availability') {
-                                $langs->load("propal");
+                                $langs->loadLangs(array("propal"));
                                 $key=$langs->trans("AvailabilityType".strtoupper($obj->code));
                                 $valuetoshow=($obj->code && $key != "AvailabilityType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
@@ -793,7 +776,7 @@ if ($id)
                     print '<td class="center">';
                     if (empty($obj->formula))
                     {
-                        print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&account_category='.$obj->rowid.'">';
+                        print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&save_lastsearch_values=1&account_category='.$obj->rowid.'">';
                         print $langs->trans("ListOfAccounts");
                         print '</a>';
                     }
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index c4b31c0f169..9d254338526 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -34,12 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("admin");
-$langs->load("accountancy");
-$langs->load("salaries");
-$langs->load("loan");
+$langs->loadLangs(array("compta","bills","admin","accountancy","salaries","loan"));
 
 // Security check
 if (empty($user->rights->accounting->chartofaccount))
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index dbe2a3b0c1c..6845491d003 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -28,15 +28,11 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancyexport.class.php';
 
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("admin");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","admin","accountancy"));
 
 // Security access
 if (empty($user->rights->accounting->chartofaccount))
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 147c140bdd1..3910e1148b4 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -39,8 +39,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield="f.rowid"; // Set here default search field
 if (! $sortorder) $sortorder="ASC";
 
-$langs->load("admin");
-$langs->load("compta");
+$langs->loadLangs(array("admin","compta"));
 
 // Security check
 if ($user->societe_id > 0)
@@ -95,6 +94,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 78c6510469b..db323881bdc 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -26,8 +26,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 
-$langs->load("admin");
-$langs->load("compta");
+$langs->loadLangs(array("admin","compta"));
 
 // Security check
 if ($user->societe_id > 0)
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index baadbdc0828..f8f0bd5668e 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -26,8 +26,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 
-$langs->load("admin");
-$langs->load("compta");
+$langs->loadLangs(array("admin","compta"));
 
 // Security check
 if ($user->societe_id > 0)
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 93d41b3cbc6..6e235bc183e 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -24,16 +24,12 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
-// langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("main");
-$langs->load("accountancy");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("compta","bills","accountancy"));
 
 // Security check
 if (! $user->admin)
@@ -141,7 +137,6 @@ if ($result) {
 	$form = new Form($db);
 	$formaccounting = new FormAccounting($db);
 
-	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		print '<tr class="oddeven">';
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 44c816530dd..64857fbfbb4 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -32,10 +32,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("admin");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","admin","accountancy"));
 
 // Security access
 if (empty($user->rights->accounting->chartofaccount))
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index a7811a2d606..f43eb6c7444 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -30,13 +30,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
-$langs->load("admin");
-$langs->load("compta");
-$langs->load("accountancy");
+$langs->loadLangs(array("admin","compta","accountancy"));
 
 $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
-$id=GETPOST('id','int');
+$id=35;
 $rowid=GETPOST('rowid','alpha');
 $code=GETPOST('code','alpha');
 
@@ -86,7 +84,7 @@ $tablib[35]= "DictionaryAccountancyJournal";
 
 // Requests to extract data
 $tabsql=array();
-$tabsql[35]= "SELECT a.rowid as rowid, a.code as code, a.label, a.nature, a.active FROM ".MAIN_DB_PREFIX."accounting_journal as a";
+$tabsql[35]= "SELECT a.rowid as rowid, a.code as code, a.label, a.nature, a.active FROM ".MAIN_DB_PREFIX."accounting_journal as a WHERE a.entity=".$conf->entity;
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
@@ -102,7 +100,7 @@ $tabfieldvalue[35]= "code,label,nature";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
-$tabfieldinsert[35]= "code,label,nature";
+$tabfieldinsert[35]= "code,label,nature,entity";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
@@ -401,24 +399,9 @@ if ($id)
 	$sql=$tabsql[$id];
 	$sql.= " WHERE a.entity = ".$conf->entity;
 
-	if ($sortfield)
-	{
-		// If sort order is "country", we use country_code instead
-		if ($sortfield == 'country') $sortfield='country_code';
-		$sql.= " ORDER BY ".$sortfield;
-		if ($sortorder)
-		{
-			$sql.=" ".strtoupper($sortorder);
-		}
-		$sql.=", ";
-		// Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-		$tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
-		$tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
-	}
-	else {
-		$sql.=" ORDER BY ";
-	}
-	$sql.=$tabsqlsort[$id];
+	// If sort order is "country", we use country_code instead
+	if ($sortfield == 'country') $sortfield='country_code';
+	$sql.=$db->order($sortfield,$sortorder);
 	$sql.=$db->plimit($listlimit+1,$offset);
 
 	$fieldlist=explode(',',$tabfield[$id]);
@@ -434,7 +417,6 @@ if ($id)
 	if ($tabname[$id])
 	{
 		$alabelisused=0;
-		$var=false;
 
 		$fieldlist=explode(',',$tabfield[$id]);
 
@@ -514,7 +496,6 @@ if ($id)
 	{
 		$num = $db->num_rows($resql);
 		$i = 0;
-		$var=true;
 
 		$param = '&id='.$id;
 		if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
@@ -629,7 +610,7 @@ if ($id)
 								$valuetoshow=$langs->trans('All');
 							}
 							else if ($fieldlist[$field]=='nature' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') {
-								$langs->load("accountancy");
+								$langs->loadLangs(array("accountancy"));
 								$key=$langs->trans("AccountingJournalType".strtoupper($obj->nature));
 								$valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($obj->nature)?$key:$obj->{$fieldlist[$field]});
 							}
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index f6552d3d1e1..eb4d331f228 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -26,7 +26,6 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
@@ -35,12 +34,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
-// Langs
-$langs->load("companies");
-$langs->load("compta");
-$langs->load("main");
-$langs->load("accountancy");
-$langs->load("products");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("companies","compta","accountancy","products"));
 
 // Security check
 if (empty($conf->accounting->enabled)) {
@@ -261,7 +256,13 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
+
 $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("/accountancy/admin/productaccount.php:: sql=" . $sql, LOG_DEBUG);
@@ -360,7 +361,6 @@ if ($result)
 
 	$product_static = new Product($db);
 
-	$var = true;
 	$i=0;
     while ($i < min($num,$limit))
     {
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 15e7acd7deb..d8a59a5ba43 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2016       Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2016       Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2016-2017  Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2016       Olivier Geffroy     <jeff@jeffinfo.com>
+ * Copyright (C) 2016       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2016-2018  Alexandre Spangaro  <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
 // Langs
-$langs->load("accountancy");
+$langs->loadLangs(array("accountancy"));
 
 $page = GETPOST("page");
 $sortorder = GETPOST("sortorder");
@@ -138,8 +138,7 @@ if ($action == 'export_csv') {
 
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
-	$journal = 'balance';
-
+	$filename = 'balance';
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
 	$result = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
@@ -153,7 +152,6 @@ if ($action == 'export_csv') {
 		print $object->get_compte_desc($line->numero_compte) . $sep;
 		print price($line->debit) . $sep;
 		print price($line->credit) . $sep;
-		print price($line->debit) . $sep;
 		print price($line->credit - $line->debit) . $sep;
 		print "\n";
 	}
@@ -188,7 +186,7 @@ else {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	$button = '<input type="submit" name="exportcsv" class="butAction" value="' . $langs->trans("Export") . ' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
+	$button = '<input type="submit" name="exportcsv" class="butActionNew" value="' . $langs->trans("Export") . ' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
 	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button);
 
 	$moreforfilter = '';
@@ -254,8 +252,8 @@ else {
 		print '<tr class="oddeven">';
 
 		// Permet d'afficher le compte comptable
-		if ($root_account_description != $displayed_account) {
-
+		if (empty($displayed_account) || $root_account_description != $displayed_account)
+		{
 			// Affiche un Sous-Total par compte comptable
 			if ($displayed_account != "") {
 				print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit - $sous_total_debit) . '</td>';
@@ -263,9 +261,9 @@ else {
 				print '</tr>';
 			}
 
-			// Affiche le compte comptable en d�but de ligne
+			// Affiche le compte comptable en debut de ligne
 			print "<tr>";
-			print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">' . $root_account_description . '</td>';
+			print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">' . $line->numero_compte . ($root_account_description ? ' - ' . $root_account_description : '') . '</td>';
 			print '</tr>';
 
 			$displayed_account = $root_account_description;
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index 1d746b4d4df..a433e19a09d 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -26,16 +26,11 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
-// Langs
-$langs->load("main");
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("accountancy");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("bills","compta","accountancy","other"));
 
 // Filter
 $year = GETPOST("year",'int');
@@ -75,8 +70,6 @@ if ($result) {
 
 $y = $year_current;
 
-$var = true;
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td width=150>' . $langs->trans("Label") . '</td><td align="center">' . $langs->trans("JanuaryMin") . '</td><td align="center">' . $langs->trans("FebruaryMin") . '</td><td align="center">' . $langs->trans("MarchMin") . '</td><td align="center">' . $langs->trans("AprilMin") . '</td><td align="center">' . $langs->trans("MayMin") . '</td><td align="center">' . $langs->trans("JuneMin") . '</td><td align="center">' . $langs->trans("JulyMin") . '</td><td align="center">' . $langs->trans("AugustMin") . '</td><td align="center">' . $langs->trans("SeptemberMin") . '</td><td align="center">' . $langs->trans("OctoberMin") . '</td><td align="center">' . $langs->trans("NovemberMin") . '</td><td align="center">' . $langs->trans("DecemberMin") . '</td><td align="center"><b>Total</b></td></tr>';
 
@@ -108,7 +101,7 @@ if ($resql) {
 		
 		$row = $db->fetch_row($resql);
 		
-		print '<tr><td width="14%">' . length_accountg($row[0]) . '</td>';
+		print '<tr class="oddeven"><td width="14%">' . length_accountg($row[0]) . '</td>';
 		print '<td align="right" width="6.5%">' . price($row[1]) . '</td>';
 		print '<td align="right" width="6.5%">' . price($row[2]) . '</td>';
 		print '<td align="right" width="6.5%">' . price($row[3]) . '</td>';
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index f655d245e86..f0cc48a4878 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2013-2017 Olivier Geffroy	  <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
- * Copyright (C) 2017	  Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2013-2017 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2017 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2018 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2017      Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -32,9 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
-$langs->load("accountancy");
-$langs->load("bills");
-$langs->load("compta");
+$langs->loadLangs(array("accountancy", "bills", "compta"));
 
 $action = GETPOST('action','aZ09');
 
@@ -89,36 +87,36 @@ if ($action == "confirm_update") {
 
 	if (! $error)
 	{
-		$book = new BookKeeping($db);
+		$object = new BookKeeping($db);
 
-		$result = $book->fetch($id, null, $mode);
+		$result = $object->fetch($id, null, $mode);
 		if ($result < 0) {
 			$error++;
-			setEventMessages($book->error, $book->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			$book->numero_compte = $account_number;
-			$book->subledger_account = $subledger_account;
-			$book->label_compte = $label_compte;
-			$book->label_operation= $label_operation;
-			$book->debit = $debit;
-			$book->credit = $credit;
+			$object->numero_compte = $account_number;
+			$object->subledger_account = $subledger_account;
+			$object->label_compte = $label_compte;
+			$object->label_operation= $label_operation;
+			$object->debit = $debit;
+			$object->credit = $credit;
 
 			if (floatval($debit) != 0.0) {
-				$book->montant = $debit;
-				$book->sens = 'D';
+				$object->montant = $debit;
+				$object->sens = 'D';
 			}
 			if (floatval($credit) != 0.0) {
-				$book->montant = $credit;
-				$book->sens = 'C';
+				$object->montant = $credit;
+				$object->sens = 'C';
 			}
 
-			$result = $book->update($user, false, $mode);
+			$result = $object->update($user, false, $mode);
 			if ($result < 0) {
-				setEventMessages($book->error, $book->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
 				if ($mode != '_tmp')
 				{
-					setEventMessages($langs->trans('Saved'), null, 'mesgs');
+					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 				}
 
 				$debit = 0;
@@ -147,39 +145,39 @@ else if ($action == "add") {
 	}
 
 	if (! $error) {
-		$book = new BookKeeping($db);
+		$object = new BookKeeping($db);
 
-		$book->numero_compte = $account_number;
-		$book->subledger_account = $subledger_account;
-		$book->label_compte = $label_compte;
-		$book->label_operation= $label_operation;
-		$book->debit = $debit;
-		$book->credit = $credit;
-		$book->doc_date = GETPOST('doc_date','alpha');
-		$book->doc_type = GETPOST('doc_type','alpha');
-		$book->piece_num = $piece_num;
-		$book->doc_ref = GETPOST('doc_ref','alpha');
-		$book->code_journal = GETPOST('code_journal','alpha');
-		$book->fk_doc = GETPOST('fk_doc','alpha');
-		$book->fk_docdet = GETPOST('fk_docdet','alpha');
+		$object->numero_compte = $account_number;
+		$object->subledger_account = $subledger_account;
+		$object->label_compte = $label_compte;
+		$object->label_operation= $label_operation;
+		$object->debit = $debit;
+		$object->credit = $credit;
+		$object->doc_date = GETPOST('doc_date','alpha');
+		$object->doc_type = GETPOST('doc_type','alpha');
+		$object->piece_num = $piece_num;
+		$object->doc_ref = GETPOST('doc_ref','alpha');
+		$object->code_journal = GETPOST('code_journal','alpha');
+		$object->fk_doc = GETPOST('fk_doc','alpha');
+		$object->fk_docdet = GETPOST('fk_docdet','alpha');
 
 		if (floatval($debit) != 0.0) {
-			$book->montant = $debit;
-			$book->sens = 'D';
+			$object->montant = $debit;
+			$object->sens = 'D';
 		}
 
 		if (floatval($credit) != 0.0) {
-			$book->montant = $credit;
-			$book->sens = 'C';
+			$object->montant = $credit;
+			$object->sens = 'C';
 		}
 
-		$result = $book->createStd($user, false, $mode);
+		$result = $object->createStd($user, false, $mode);
 		if ($result < 0) {
-			setEventMessages($book->error, $book->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			if ($mode != '_tmp')
 			{
-				setEventMessages($langs->trans('Saved'), null, 'mesgs');
+				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			}
 
 			$debit = 0;
@@ -191,17 +189,17 @@ else if ($action == "add") {
 }
 
 else if ($action == "confirm_delete") {
-	$book = new BookKeeping($db);
+	$object = new BookKeeping($db);
 
-	$result = $book->fetch($id, null, $mode);
-	$piece_num = $book->piece_num;
+	$result = $object->fetch($id, null, $mode);
+	$piece_num = $object->piece_num;
 
 	if ($result < 0) {
-		setEventMessages($book->error, $book->errors, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
-		$result = $book->delete($user, false, $mode);
+		$result = $object->delete($user, false, $mode);
 		if ($result < 0) {
-			setEventMessages($book->error, $book->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 	$action = '';
@@ -210,7 +208,7 @@ else if ($action == "confirm_delete") {
 else if ($action == "confirm_create") {
 	$error = 0;
 
-	$book = new BookKeeping($db);
+	$object = new BookKeeping($db);
 
 	if (! GETPOST('code_journal','alpha') || GETPOST('code_journal','alpha') == '-1') {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Journal")), null, 'errors');
@@ -225,29 +223,29 @@ else if ($action == "confirm_create") {
 
 	if (! $error)
 	{
-		$book->label_compte = '';
-		$book->debit = 0;
-		$book->credit = 0;
-		$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth','int'), GETPOST('doc_dateday','int'), GETPOST('doc_dateyear','int'));
-		$book->doc_type = GETPOST('doc_type','alpha');
-		$book->piece_num = GETPOST('next_num_mvt','alpha');
-		$book->doc_ref = GETPOST('doc_ref','alpha');
-		$book->code_journal = GETPOST('code_journal','alpha');
-		$book->fk_doc = 0;
-		$book->fk_docdet = 0;
-		$book->montant = 0;
+		$object->label_compte = '';
+		$object->debit = 0;
+		$object->credit = 0;
+		$object->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth','int'), GETPOST('doc_dateday','int'), GETPOST('doc_dateyear','int'));
+		$object->doc_type = GETPOST('doc_type','alpha');
+		$object->piece_num = GETPOST('next_num_mvt','alpha');
+		$object->doc_ref = GETPOST('doc_ref','alpha');
+		$object->code_journal = GETPOST('code_journal','alpha');
+		$object->fk_doc = 0;
+		$object->fk_docdet = 0;
+		$object->montant = 0;
 
-		$result = $book->createStd($user,0, $mode);
+		$result = $object->createStd($user,0, $mode);
 		if ($result < 0) {
-			setEventMessages($book->error, $book->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			if ($mode != '_tmp')
 			{
-				setEventMessages($langs->trans('Saved'), null, 'mesgs');
+				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			}
 			$action = 'update';
-			$id=$book->id;
-			$piece_num = $book->piece_num;
+			$id=$object->id;
+			$piece_num = $object->piece_num;
 		}
 	}
 }
@@ -260,7 +258,7 @@ if ($action == 'setdate') {
 	} else {
 		if ($mode != '_tmp')
 		{
-			setEventMessages($langs->trans('Saved'), null, 'mesgs');
+			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
 		$action = '';
 	}
@@ -274,7 +272,7 @@ if ($action == 'setjournal') {
 	} else {
 		if ($mode != '_tmp')
 		{
-			setEventMessages($langs->trans('Saved'), null, 'mesgs');
+			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
 		$action = '';
 	}
@@ -288,7 +286,7 @@ if ($action == 'setdocref') {
 	} else {
 		if ($mode != '_tmp')
 		{
-			setEventMessages($langs->trans('Saved'), null, 'mesgs');
+			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
 		$action = '';
 	}
@@ -326,8 +324,8 @@ if ($action == 'create')
 {
 	print load_fiche_titre($langs->trans("CreateMvts"));
 
-	$book = new BookKeeping($db);
-	$next_num_mvt = $book->getNextNumMvt('_tmp');
+	$object = new BookKeeping($db);
+	$next_num_mvt = $object->getNextNumMvt('_tmp');
 
 	if (empty($next_num_mvt))
 	{
@@ -361,7 +359,7 @@ if ($action == 'create')
 	print '</tr>';
 
 	print '<tr>';
-	print '<td>' . $langs->trans("Docref") . '</td>';
+	print '<td>' . $langs->trans("Piece") . '</td>';
 	print '<td><input type="text" class="minwidth200" name="doc_ref" value=""/></td>';
 	print '</tr>';
 
@@ -384,13 +382,13 @@ if ($action == 'create')
 
 	print '</form>';
 } else {
-	$book = new BookKeeping($db);
-	$result = $book->fetchPerMvt($piece_num, $mode);
+	$object = new BookKeeping($db);
+	$result = $object->fetchPerMvt($piece_num, $mode);
 	if ($result < 0) {
-		setEventMessages($book->error, $book->errors, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	if (! empty($book->piece_num))
+	if (! empty($object->piece_num))
 	{
 		$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">' . $langs->trans('BackToList') . '</a>';
 
@@ -398,14 +396,14 @@ if ($action == 'create')
 
 		$head=array();
 		$h=0;
-		$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.$book->piece_num.($mode?'&mode='.$mode:'');
+		$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.$object->piece_num.($mode?'&mode='.$mode:'');
 		$head[$h][1] = $langs->trans("Transaction");
 		$head[$h][2] = 'transaction';
 		$h++;
 
 		dol_fiche_head($head, 'transaction', '', -1);
 
-		//dol_banner_tab($book, '', $backlink);
+		//dol_banner_tab($object, '', $backlink);
 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
@@ -416,7 +414,7 @@ if ($action == 'create')
 		// Account movement
 		print '<tr>';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
-		print '<td>' . $book->piece_num . '</td>';
+		print '<td>' . $object->piece_num . '</td>';
 		print '</tr>';
 
 		// Date
@@ -425,19 +423,19 @@ if ($action == 'create')
 		print $langs->trans('Docdate');
 		print '</td>';
 		if ($action != 'editdate')
-		print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;piece_num='. $book->piece_num .'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('SetDate'),1).'</a></td>';
+		print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;piece_num='. $object->piece_num .'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('SetDate'),1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editdate') {
-			print '<form name="setdate" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+			print '<form name="setdate" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '" method="post">';
 			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="setdate">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			$form->select_date($book->doc_date ? $book->doc_date : - 1, 'doc_date', '', '', '', "setdate");
+			$form->select_date($object->doc_date ? $object->doc_date : - 1, 'doc_date', '', '', '', "setdate");
 			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
 			print '</form>';
 		} else {
-			print $book->doc_date ? dol_print_date($book->doc_date, 'day') : '&nbsp;';
+			print $object->doc_date ? dol_print_date($object->doc_date, 'day') : '&nbsp;';
 		}
 		print '</td>';
 		print '</tr>';
@@ -448,19 +446,19 @@ if ($action == 'create')
 		print $langs->trans('Codejournal');
 		print '</td>';
 		if ($action != 'editjournal')
-		print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editjournal&amp;piece_num='.$book->piece_num.'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+		print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editjournal&amp;piece_num='.$object->piece_num.'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editjournal') {
-			print '<form name="setjournal" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+			print '<form name="setjournal" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '" method="post">';
 			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="setjournal">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print $formaccounting->select_journal($book->code_journal,'code_journal',0,0,array(),1,1);
+			print $formaccounting->select_journal($object->code_journal,'code_journal',0,0,array(),1,1);
 			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
 			print '</form>';
 		} else {
-		print $book->code_journal ;
+		print $object->code_journal ;
 		}
 		print '</td>';
 		print '</tr>';
@@ -468,22 +466,22 @@ if ($action == 'create')
 		// Ref document
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Docref');
+		print $langs->trans('Piece');
 		print '</td>';
 		if ($action != 'editdocref')
-		print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdocref&amp;piece_num='.$book->piece_num.'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+		print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdocref&amp;piece_num='.$object->piece_num.'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editdocref') {
-			print '<form name="setdocref" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+			print '<form name="setdocref" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '" method="post">';
 			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="setdocref">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($book->doc_ref).'">';
+			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
 			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
 			print '</form>';
 		} else {
-			print $book->doc_ref ;
+			print $object->doc_ref ;
 		}
 		print '</td>';
 		print '</tr>';
@@ -498,11 +496,11 @@ if ($action == 'create')
 		print '<table class="border tableforfield" width="100%">';
 
 		// Doc type
-		if(! empty($book->doc_type))
+		if(! empty($object->doc_type))
 		{
 			print '<tr>';
 			print '<td class="titlefield">' . $langs->trans("Doctype") . '</td>';
-			print '<td>' . $book->doc_type . '</td>';
+			print '<td>' . $object->doc_type . '</td>';
 			print '</tr>';
 		}
 
@@ -510,7 +508,7 @@ if ($action == 'create')
 		print '<tr>';
 		print '<td class="titlefield">' . $langs->trans("DateCreation") . '</td>';
 		print '<td>';
-		print $book->date_creation ? dol_print_date($book->date_creation, 'day') : '&nbsp;';
+		print $object->date_creation ? dol_print_date($object->date_creation, 'day') : '&nbsp;';
 		print '</td>';
 		print '</tr>';
 
@@ -519,7 +517,7 @@ if ($action == 'create')
 		print '<tr>';
 		print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
 		print '<td>';
-			if (empty($book->validated)) {
+			if (empty($object->validated)) {
 				print '<a href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->rowid . '&action=enable">';
 				print img_picto($langs->trans("Disabled"), 'switch_off');
 				print '</a>';
@@ -536,11 +534,11 @@ if ($action == 'create')
 		/*
 		print '<tr>';
 		print '<td class="titlefield">' . $langs->trans("Control") . '</td>';
-		if ($book->doc_type == 'customer_invoice')
+		if ($object->doc_type == 'customer_invoice')
 		{
 		 $sqlmid = 'SELECT rowid as ref';
 			$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
-			$sqlmid .= " WHERE fac.rowid=" . $book->fk_doc;
+			$sqlmid .= " WHERE fac.rowid=" . $object->fk_doc;
 			dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
 			$resultmid = $db->query($sqlmid);
 			if ($resultmid) {
@@ -563,24 +561,24 @@ if ($action == 'create')
 
 		print '<br>';
 
-		$result = $book->fetchAllPerMvt($piece_num, $mode);
+		$result = $object->fetchAllPerMvt($piece_num, $mode);
 		if ($result < 0) {
-			setEventMessages($book->error, $book->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 
 			print load_fiche_titre($langs->trans("ListeMvts"), '', '');
 
-			print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
-			print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
-			print '<input type="hidden" name="doc_type" value="' . $book->doc_type . '">' . "\n";
-			print '<input type="hidden" name="doc_ref" value="' . $book->doc_ref . '">' . "\n";
-			print '<input type="hidden" name="code_journal" value="' . $book->code_journal . '">' . "\n";
-			print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
-			print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
+			print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '" method="post">';
+			print '<input type="hidden" name="doc_date" value="' . $object->doc_date . '">' . "\n";
+			print '<input type="hidden" name="doc_type" value="' . $object->doc_type . '">' . "\n";
+			print '<input type="hidden" name="doc_ref" value="' . $object->doc_ref . '">' . "\n";
+			print '<input type="hidden" name="code_journal" value="' . $object->code_journal . '">' . "\n";
+			print '<input type="hidden" name="fk_doc" value="' . $object->fk_doc . '">' . "\n";
+			print '<input type="hidden" name="fk_docdet" value="' . $object->fk_docdet . '">' . "\n";
 			print '<input type="hidden" name="mode" value="' . $mode . '">' . "\n";
 
 			print "<table class=\"noborder\" width=\"100%\">";
-			if (count($book->linesmvt) > 0) {
+			if (count($object->linesmvt) > 0) {
 
 				$total_debit = 0;
 				$total_credit = 0;
@@ -597,7 +595,7 @@ if ($action == 'create')
 
 				print "</tr>\n";
 
-				foreach ($book->linesmvt as $line) {
+				foreach ($object->linesmvt as $line) {
 					print '<tr class="oddeven">';
 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
@@ -619,7 +617,7 @@ if ($action == 'create')
 						}
 						print '</td>';
 						print '<td><input type="text" class="minwidth100" name="label_compte" value="' . $line->label_compte . '"/></td>';
-						print '<td><input type="text" class="minwidth300" name="label_operation" value="' . $line->label_operation. '"/></td>';
+						print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $line->label_operation. '"/></td>';
 						print '<td align="right"><input type="text" size="6" class="right" name="debit" value="' . price($line->debit) . '"/></td>';
 						print '<td align="right"><input type="text" size="6" class="right" name="credit" value="' . price($line->credit) . '"/></td>';
 						print '<td>';
@@ -656,7 +654,7 @@ if ($action == 'create')
 
 				if ($total_debit != $total_credit)
 				{
-					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings');
+					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
 				}
 
 				if ($action == "" || $action == 'add') {
@@ -677,7 +675,7 @@ if ($action == 'create')
 					}
 					print '</td>';
 					print '<td><input type="text" class="minwidth100" name="label_compte" value=""/></td>';
-					print '<td><input type="text" class="minwidth300" name="label_operation" value=""/></td>';
+					print '<td><input type="text" class="minwidth200" name="label_operation" value=""/></td>';
 					print '<td align="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
 					print '<td align="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
@@ -692,11 +690,11 @@ if ($action == 'create')
 					print '<div class="center">';
 					if ($total_debit == $total_credit)
 					{
-						print '<a class="button" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '&action=valid">'.$langs->trans("ValidTransaction").'</a>';
+						print '<a class="button" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '&action=valid">'.$langs->trans("ValidTransaction").'</a>';
 					}
 					else
 					{
-						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $credit, $debit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
+						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 					}
 
 					print ' &nbsp; ';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 9a7ebf9716e..26a4cacf2c9 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -32,8 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-// Langs
-$langs->load("accountancy");
+$langs->loadLangs(array("accountancy"));
 
 $action = GETPOST('action', 'alpha');
 $search_mvt_num = GETPOST('search_mvt_num', 'int');
@@ -272,6 +271,7 @@ if (! empty($search_credit)) {
 	$param .= '&search_credit=' . urlencode($search_credit);
 }
 
+
 if ($action == 'delbookkeeping') {
 
 	$import_key = GETPOST('importkey', 'alpha');
@@ -437,10 +437,12 @@ else $button.= $langs->trans("ExportList");
 $button.= '</a>';
 
 
-$groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param.'">' . $langs->trans("GroupByAccountAccounting") . '</a>';
-$addbutton = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
+$groupby = ' <a class="nohover marginrightonly" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param.'">' . $langs->trans("GroupByAccountAccounting") . '</a>';
+$newcardbutton = '<a class="butActionNew" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt");
+$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+$newcardbutton.= '</a>';
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby.$addbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby.$newcardbutton, '', $limit);
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 04708fe7726..499865233db 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2016       Neil Orley			<neil.orley@oeris.fr>
- * Copyright (C) 2013-2016  Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017  Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
+ * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2018  Alexandre Spangaro  <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,15 +26,14 @@
 
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-// Langs
-$langs->load("accountancy");
+$langs->loadLangs(array("accountancy"));
 
 $page = GETPOST("page");
 $sortorder = GETPOST("sortorder");
@@ -44,17 +43,21 @@ $search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'
 $search_date_end = dol_mktime(0, 0, 0, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 
-
-
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
 	$search_accountancy_code_start = '';
 }
+$search_accountancy_code_end = GETPOST('search_accountancy_code_end', 'alpha');
+if ($search_accountancy_code_end == - 1) {
+	$search_accountancy_code_end = '';
+}
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_debit = GETPOST('search_debit', 'alpha');
+$search_credit = GETPOST('search_credit', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
@@ -96,63 +99,17 @@ if (empty($search_date_start) && empty($search_date_end)) {
 
 $object = new BookKeeping($db);
 
-
-$options = '';
-$filter = array ();
-
-if (! empty($search_date_start)) {
-	$filter['t.doc_date>='] = $search_date_start;
-	$options .= '&search_date_startmonth=' . GETPOST('search_date_startmonth', 'int') . '&search_date_startday=' . GETPOST('search_date_startday', 'int') . '&search_date_startyear=' . GETPOST('search_date_startyear', 'int');
-}
-if (! empty($search_date_end)) {
-	$filter['t.doc_date<='] = $search_date_end;
-	$options .= '&search_date_endmonth=' . GETPOST('search_date_endmonth', 'int') . '&search_date_endday=' . GETPOST('search_date_endday', 'int') . '&search_date_endyear=' . GETPOST('search_date_endyear', 'int');
-}
-if (! empty($search_doc_date)) {
-	$filter['t.doc_date'] = $search_doc_date;
-	$options .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
-}
-
-if (! GETPOST('button_removefilter_x','alpha') && ! GETPOST('button_removefilter.x','alpha') && ! GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
-{
-  if (! empty($search_accountancy_code_start)) {
-  	$filter['t.numero_compte'] = $search_accountancy_code_start;
-  	$options .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
-  }
-  if (! empty($search_label_account)) {
-  	$filter['t.label_compte'] = $search_label_account;
-  	$options .= '&search_label_compte=' . urlencode($search_label_account);
-  }
-  if (! empty($search_doc_ref)) {
-  	$filter['t.doc_ref'] = $search_doc_ref;
-  	$options .= '&search_doc_ref=' . urlencode($search_doc_ref);
-  }
-  if (! empty($search_label_operation)) {
-  	$filter['t.label_operation'] = $search_label_operation;
-  	$options .= '&search_label_operation=' . urlencode($search_label_operation);
-  }
-  if (! empty($search_direction)) {
-  	$filter['t.sens'] = $search_direction;
-  	$options .= '&search_direction=' . urlencode($search_direction);
-  }
-  if (! empty($search_ledger_code)) {
-  	$filter['t.code_journal'] = $search_ledger_code;
-  	$options .= '&search_ledger_code=' . urlencode($search_ledger_code);
-  }
-}
-
-
 /*
  * Action
  */
-
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
 	$search_doc_date = '';
 	$search_accountancy_code = '';
 	$search_accountancy_code_start = '';
-    $search_label_account = '';
-    $search_doc_ref = '';
+	$search_accountancy_code_end = '';
+	$search_label_account = '';
+	$search_doc_ref = '';
 	$search_label_operation = '';
 	$search_direction = '';
 	$search_ledger_code = '';
@@ -164,8 +121,64 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_date_endyear='';
 	$search_date_endmonth='';
 	$search_date_endday='';
+	$search_debit = '';
+	$search_credit = '';
 }
 
+// Must be after the remove filter action, before the export.
+$param = '';
+$filter = array ();
+
+if (! empty($search_date_start)) {
+	$filter['t.doc_date>='] = $search_date_start;
+	$param .= '&search_date_startmonth=' . GETPOST('search_date_startmonth', 'int') . '&search_date_startday=' . GETPOST('search_date_startday', 'int') . '&search_date_startyear=' . GETPOST('search_date_startyear', 'int');
+}
+if (! empty($search_date_end)) {
+	$filter['t.doc_date<='] = $search_date_end;
+	$param .= '&search_date_endmonth=' . GETPOST('search_date_endmonth', 'int') . '&search_date_endday=' . GETPOST('search_date_endday', 'int') . '&search_date_endyear=' . GETPOST('search_date_endyear', 'int');
+}
+if (! empty($search_doc_date)) {
+	$filter['t.doc_date'] = $search_doc_date;
+	$param .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+}
+if (! empty($search_accountancy_code_start)) {
+	$filter['t.numero_compte>='] = $search_accountancy_code_start;
+	$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+}
+if (! empty($search_accountancy_code_end)) {
+	$filter['t.numero_compte<='] = $search_accountancy_code_end;
+	$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+}
+if (! empty($search_label_account)) {
+	$filter['t.label_compte'] = $search_label_account;
+	$param .= '&search_label_compte=' . urlencode($search_label_account);
+}
+if (! empty($search_doc_ref)) {
+	$filter['t.doc_ref'] = $search_doc_ref;
+	$param .= '&search_doc_ref=' . urlencode($search_doc_ref);
+}
+if (! empty($search_label_operation)) {
+	$filter['t.label_operation'] = $search_label_operation;
+	$param .= '&search_label_operation=' . urlencode($search_label_operation);
+}
+if (! empty($search_direction)) {
+	$filter['t.sens'] = $search_direction;
+	$param .= '&search_direction=' . urlencode($search_direction);
+}
+if (! empty($search_ledger_code)) {
+	$filter['t.code_journal'] = $search_ledger_code;
+	$param .= '&search_ledger_code=' . urlencode($search_ledger_code);
+}
+if (! empty($search_debit)) {
+	$filter['t.debit'] = $search_debit;
+	$param .= '&search_debit=' . urlencode($search_debit);
+}
+if (! empty($search_credit)) {
+	$filter['t.credit'] = $search_credit;
+	$param .= '&search_credit=' . urlencode($search_credit);
+}
+
+
 if ($action == 'delmouvconfirm') {
 
 	$mvt_num = GETPOST('mvt_num', 'int');
@@ -189,7 +202,7 @@ $formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
-$title_page = $langs->trans("Bookkeeping") . ' ' . strtolower($langs->trans("By")) . ' ' . $langs->trans("AccountAccounting");
+$title_page = $langs->trans("Bookkeeping") . ' ' . strtolower($langs->trans("By")) . ' ' . strtolower($langs->trans("AccountAccounting"));
 
 llxHeader('', $title_page);
 
@@ -239,28 +252,37 @@ if ($action == 'delbookkeepingyear') {
 }
 
 
-$param=$options;
-
 print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 
-$viewflat = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param.'">' . $langs->trans("ViewFlatList") . '</a>';
-$addbutton = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
+$viewflat = ' <a class="nohover marginrightonly" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param.'">' . $langs->trans("ViewFlatList") . '</a>';
+$newcardbutton = '<a class="butActionNew" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt");
+$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+$newcardbutton.= '</a>';
 
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$addbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit);
 
 // Reverse sort order
 if ( preg_match('/^asc/i', $sortorder) )
-  $sortorder = "asc";
+	$sortorder = "asc";
 else
-  $sortorder = "desc";
+	$sortorder = "desc";
 
 print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
-print '<td class="liste_titre">' . $object->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '') . '</td>';
+print '<td class="liste_titre">';
+print '<div class="nowrap">';
+print $langs->trans('From').' ';
+print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
+print '</div>';
+print '<div class="nowrap">';
+print $langs->trans('to').' ';
+print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
+print '</div>';
+print '</td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre" align="center">';
 print $langs->trans('From') . ': ';
@@ -271,8 +293,8 @@ print $form->select_date($search_date_end, 'search_date_end', 0, 0, 1);
 print '</td>';
 print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="' . dol_escape_htmltag($search_doc_ref) . '"/></td>';
 print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="' . dol_escape_htmltag($search_label_operation) . '"/></td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'"></td>';
+print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
 print '<td class="liste_titre" align="center"><input type="text" name="search_ledger_code" size="3" value="' . dol_escape_htmltag($search_ledger_code) . '"></td>';
 print '<td class="liste_titre" align="right" colspan="2">';
 $searchpicto=$form->showFilterAndCheckAddButtons(0);
@@ -281,14 +303,14 @@ print '</td>';
 
 print '<tr class="liste_titre">';
 print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF']);
-print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre("Piece", $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Piece", $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("Label");
-print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 print "</tr>\n";
 
 print '</tr>';
@@ -308,34 +330,34 @@ while ($i < min($num, $limit))
 	$total_debit += $line->debit;
 	$total_credit += $line->credit;
 
-    $accountg = length_accountg($line->numero_compte);
+	$accountg = length_accountg($line->numero_compte);
 	//if (empty($accountg)) $accountg = '-';
 
 	// Is it a break ?
-    if ($accountg != $displayed_account_number || ! isset($displayed_account_number)) {
+	if ($accountg != $displayed_account_number || ! isset($displayed_account_number)) {
 
-        // Affiche un Sous-Total par compte comptable
-        if (isset($displayed_account_number)) {
-            print '<tr class="liste_total"><td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
-            print "<td>&nbsp;</td>\n";
-            print "<td>&nbsp;</td>\n";
-            print '</tr>';
-        }
+		// Affiche un Sous-Total par compte comptable
+		if (isset($displayed_account_number)) {
+			print '<tr class="liste_total"><td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
+			print "<td>&nbsp;</td>\n";
+			print "<td>&nbsp;</td>\n";
+			print '</tr>';
+		}
 
-        // Show the break account
-        $colspan = 9;
-        print "<tr>";
-        print '<td colspan="'.$colspan.'" style="font-weight:bold; border-bottom: 1pt solid black;">';
-        if (! empty($line->numero_compte) && $line->numero_compte != '-1') print length_accountg($line->numero_compte) . ' : ' . $object->get_compte_desc($line->numero_compte);
-        else print '<span class="error">'.$langs->trans("Unknown").'</span>';
-        print '</td>';
-        print '</tr>';
+		// Show the break account
+		$colspan = 9;
+		print "<tr>";
+		print '<td colspan="'.$colspan.'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		if (! empty($line->numero_compte) && $line->numero_compte != '-1') print length_accountg($line->numero_compte) . ' : ' . $object->get_compte_desc($line->numero_compte);
+		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
+		print '</td>';
+		print '</tr>';
 
-        $displayed_account_number = $accountg;
-        //if (empty($displayed_account_number)) $displayed_account_number='-';
-        $sous_total_debit = 0;
-        $sous_total_credit = 0;
-    }
+		$displayed_account_number = $accountg;
+		//if (empty($displayed_account_number)) $displayed_account_number='-';
+		$sous_total_debit = 0;
+		$sous_total_credit = 0;
+	}
 
 	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td>';
@@ -344,22 +366,27 @@ while ($i < min($num, $limit))
 
 	// TODO Add a link according to doc_type and fk_doc
 	print '<td class="nowrap">';
-    //if ($line->doc_type == 'supplier_invoice')
-    //if ($line->doc_type == 'customer_invoice')
+	//if ($line->doc_type == 'supplier_invoice')
+	//if ($line->doc_type == 'customer_invoice')
 	print $line->doc_ref;
-    print '</td>';
+	print '</td>';
 
-    // Affiche un lien vers la facture client/fournisseur
-    $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
+	// Affiche un lien vers la facture client/fournisseur
+	$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
+	print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
 
 
 	print '<td align="right">' . ($line->debit ? price($line->debit) :''). '</td>';
 	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
-	print '<td align="center">' . $line->code_journal . '</td>';
+
+	$accountingjournal = new AccountingJournal($db);
+	$result = $accountingjournal->fetch('',$line->code_journal);
+	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
+	print '<td align="center">' . $journaltoshow . '</td>';
+
 	print '<td align="center">';
 	print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
-	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>';
+	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
 	print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
index 550ea1d933a..67d89bcda90 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
@@ -33,6 +33,8 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 
+$langs->loadLangs(array("compta"));
+
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
@@ -141,7 +143,6 @@ if ($object->check_codeclient() != 0)
 print '</td>';
 print '</tr>';
 
-$langs->load('compta');
 print '<tr>';
 print '<td>';
 print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer);
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
index 35bdcfa23fe..96317a3a740 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
@@ -35,6 +35,8 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 
+$langs->loadLangs(array("compta"));
+
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
@@ -157,7 +159,6 @@ if ($object->check_codefournisseur() != 0)
 print '</td>';
 print '</tr>';
 
-$langs->load('compta');
 print '<tr>';
 print '<td>';
 print $form->editfieldkey("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 0a538f0a6ae..27254ef31d1 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -360,9 +360,11 @@ class AccountancyCategory 	// extends CommonObject
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function display($id) {
+		global $conf;
 		$sql = "SELECT t.rowid, t.account_number, t.label";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
 		$sql .= " WHERE t.fk_accounting_category = " . $id;
+		$sql .= " AND t.entity = " . $conf->entity;
 
 		$this->lines_display = array();
 
@@ -400,13 +402,14 @@ class AccountancyCategory 	// extends CommonObject
 		$sql .= " WHERE t.numero_compte NOT IN (";
 		$sql .= " SELECT t.account_number";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
-		$sql .= " WHERE t.fk_accounting_category = " . $id . ")";
+		$sql .= " WHERE t.fk_accounting_category = " . $id . " AND t.entity = " . $conf->entity.")";
 		$sql .= " AND t.numero_compte IN (";
 		$sql .= " SELECT DISTINCT aa.account_number";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
 		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-		$sql .= " AND aa.active = 1)";
+		$sql .= " AND aa.active = 1";
+		$sql .= " AND aa.entity = = " . $conf->entity . ")";
 		$sql .= " GROUP BY t.numero_compte, t.label_operation, t.doc_ref";
 		$sql .= " ORDER BY t.numero_compte";
 
@@ -448,6 +451,7 @@ class AccountancyCategory 	// extends CommonObject
 	    $sql .= " WHERE (aa.fk_accounting_category != ".$id." OR aa.fk_accounting_category IS NULL)";
 	    $sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
 	    $sql .= " AND aa.active = 1";
+	    $sql .= " AND aa.entity = " . $conf->entity;
 	    $sql .= " GROUP BY aa.account_number, aa.label";
 	    $sql .= " ORDER BY aa.account_number, aa.label";
 
@@ -492,6 +496,7 @@ class AccountancyCategory 	// extends CommonObject
 		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
 		$sql .= " AND aa.active = 1";
+		$sql .= " AND aa.entity = " . $conf->entity;
 
 		$this->db->begin();
 
@@ -581,7 +586,7 @@ class AccountancyCategory 	// extends CommonObject
 	 */
 	public function getCatsCpts()
 	{
-		global $mysoc;
+		global $mysoc,$conf;
 
 		$sql = "";
 
@@ -595,8 +600,10 @@ class AccountancyCategory 	// extends CommonObject
 		$sql .= " WHERE t.fk_accounting_category IN ( SELECT c.rowid ";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
 		$sql .= " WHERE c.active = 1";
+		$sql .= " AND c.entity = " . $conf->entity;
 		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
 		$sql .= " AND cat.rowid = t.fk_accounting_category";
+		$sql .= " AND t.entity = " . $conf->entity;
 		$sql .= " ORDER BY cat.position ASC";
 
 		$resql = $this->db->query($sql);
@@ -685,7 +692,7 @@ class AccountancyCategory 	// extends CommonObject
 	 */
 	public function getCats($categorytype=-1)
 	{
-		global $db, $langs, $user, $mysoc;
+		global $db, $langs, $user, $mysoc, $conf;
 
 		if (empty($mysoc->country_id)) {
 			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
@@ -695,6 +702,7 @@ class AccountancyCategory 	// extends CommonObject
 		$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
 		$sql .= " WHERE c.active = 1 ";
+		$sql .= " AND c.entity = " . $conf->entity;
 		if ($categorytype >= 0) $sql.=" AND c.category_type = 1";
 		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
 		$sql .= " ORDER BY c.position ASC";
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 3a12d606fdd..52b5f1c411f 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1,14 +1,14 @@
 <?php
 /*
- * Copyright (C) 2007-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2014		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015		Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2015		Raphaël Doursenaud	<rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2016		Pierre-Henry Favre	<phf@atm-consulting.fr>
- * Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2013-2017  Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2017       Elarifr. Ari Elbaz	<github@accedinfo.com>
- * Copyright (C) 2017		Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
+ * Copyright (C) 2016-2018  Alexandre Spangaro  <aspangaro@zendsi.com>
+ * Copyright (C) 2013-2017  Olivier Geffroy     <jeff@jeffinfo.com>
+ * Copyright (C) 2017       Elarifr. Ari Elbaz  <github@accedinfo.com>
+ * Copyright (C) 2017       Frédéric France     <frederic.france@netlogic.fr>
 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -177,7 +177,7 @@ class AccountancyExport
 	 */
 	public static function downloadFile() {
 		global $conf;
-		$journal = 'bookkepping';
+		$filename = 'general_ledger';
 		include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 	}
 
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 0b0d42b0075..d1870fabc38 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -566,7 +566,7 @@ class AccountingAccount extends CommonObject
 	function LibStatut($statut,$mode=0)
 	{
 		global $langs;
-		$langs->load('users');
+		$langs->loadLangs(array("users"));
 
 		if ($mode == 0)
 		{
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 2e48fc8a54a..454de6d7b84 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -256,7 +256,7 @@ class AccountingJournal extends CommonObject
 	{
 		global $langs;
 
-		$langs->load("accountancy");
+		$langs->loadLangs(array("accountancy"));
 
 		if ($mode == 0)
 		{
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a703e025c76..f7fed2e2b5b 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -170,7 +170,7 @@ class BookKeeping extends CommonObject
 		// Check parameters
 		if (empty($this->numero_compte) || $this->numero_compte == '-1' || $this->numero_compte == 'NotDefined')
 		{
-			$langs->load("errors");
+			$langs->loadLangs(array("errors"));
 			if (in_array($this->doc_type, array('bank', 'expense_report')))
 			{
 				$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
@@ -246,9 +246,6 @@ class BookKeeping extends CommonObject
 				}
 
 				$now = dol_now();
-				if (empty($this->date_create)) {
-					$this->date_create = $now;
-				}
 
 				$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
 				$sql .= "doc_date";
@@ -291,7 +288,7 @@ class BookKeeping extends CommonObject
 				$sql .= "," . $this->montant;
 				$sql .= ",'" . $this->db->escape($this->sens) . "'";
 				$sql .= ",'" . $this->db->escape($this->fk_user_author) . "'";
-				$sql .= ",'" . $this->db->idate($this->date_create). "'";
+				$sql .= ",'" . $this->db->idate($now). "'";
 				$sql .= ",'" . $this->db->escape($this->code_journal) . "'";
 				$sql .= ",'" . $this->db->escape($this->journal_label) . "'";
 				$sql .= "," . $this->db->escape($this->piece_num);
@@ -496,9 +493,6 @@ class BookKeeping extends CommonObject
 		$this->credit = price2num($this->credit, 'MT');
 
 		$now = dol_now();
-		if (empty($this->date_create)) {
-		    $this->date_create = $now;
-		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -545,7 +539,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->montant) ? 'NULL' : $this->montant ). ',';
 		$sql .= ' ' . (! isset($this->sens) ? 'NULL' : "'" . $this->db->escape($this->sens) . "'") . ',';
 		$sql .= ' ' . $user->id . ',';
-		$sql .= ' ' . "'" . $this->db->idate($this->date_create) . "',";
+		$sql .= ' ' . "'" . $this->db->idate($now) . "',";
 		$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
 		$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
 		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 92d8f7b1c37..d0e5adc97fd 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -24,13 +24,10 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
-// Langs
-$langs->load("bills");
-$langs->load("accountancy");
+$langs->loadLangs(array("bills","accountancy"));
 
 $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index aedaeda0e5b..8b88d8f396b 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -32,11 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
 // Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","other","main","accountancy"));
 
 // Security check
 if (empty($conf->accounting->enabled)) {
@@ -129,6 +125,7 @@ llxHeader('', $langs->trans("CustomersVentilation"));
 $textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
 $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
 
+
 print load_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear, '', 'title_accountancy');
 
 // Clean database
@@ -160,8 +157,8 @@ $y = $year_current;
 
 $buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
 
-
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
@@ -236,7 +233,8 @@ print '</div>';
 print '<br>';
 
 
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
@@ -315,7 +313,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	print '<br>';
 	print '<br>';
 
-	print_fiche_titre($langs->trans("OtherInfo"), '', '');
+	print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+	//print_fiche_titre($langs->trans("OtherInfo"), '', '');
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index e696b4774d1..7bc929a7e6b 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -27,7 +27,6 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
@@ -35,12 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-// Langs
-$langs->load("bills");
-$langs->load("compta");
-$langs->load("main");
-$langs->load("accountancy");
-$langs->load("productbatch");
+$langs->loadLangs(array("bills","compta","accountancy","productbatch"));
 
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
@@ -116,10 +110,10 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
-	$db->begin();
-
 	if (! $error)
 	{
+		$db->begin();
+
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as l";
 		$sql1 .= " SET l.fk_code_ventilation=" . (GETPOST('account_parent','int') > 0 ? GETPOST('account_parent','int') : '0');
 		$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
@@ -173,20 +167,24 @@ print '<script type="text/javascript">
 /*
  * Customer Invoice lines
  */
-$sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.datef, f.ref_client,";
-$sql .= " fd.rowid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc,";
-$sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
-$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
-$sql .= " fd.situation_percent, co.label as country, s.tva_intra";
-$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
-$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
-$sql .= " WHERE fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
-$sql .= " AND f.fk_statut > 0";
+$sql = "SELECT f.rowid as facid, f.facnumber as ref, f.type, f.datef, f.ref_client,";
+$sql.= " fd.rowid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc,";
+$sql.= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
+$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
+$sql.= " fd.situation_percent,";
+$sql.= " co.label as country, s.tva_intra";
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql.= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
+$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
+$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
+$sql.= " WHERE fd.fk_code_ventilation > 0";
+$sql.= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
+$sql.= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -244,6 +242,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -291,11 +294,11 @@ if ($result) {
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre center">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+   	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
    	$formother->select_year($search_year,'search_year',1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
@@ -303,9 +306,9 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" placeholder="%" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="' . dol_escape_htmltag($search_tvaintra) . '"></td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tavintra" value="' . dol_escape_htmltag($search_tavintra) . '"></td>';
 	print '<td class="liste_titre" align="center">';
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
@@ -320,9 +323,9 @@ if ($result) {
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
 	$clickpicto=$form->showCheckAddButtons();
 	print_liste_field_titre($clickpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
@@ -333,16 +336,18 @@ if ($result) {
 	while ( $objp = $db->fetch_object($result) ) {
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label_compte;
 
-		$facture_static->ref = $objp->facnumber;
+		$facture_static->ref = $objp->ref;
 		$facture_static->id = $objp->facid;
+		$facture_static->type = $objp->ftype;
 
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
-		$product_static->type = $objp->product_type;
+		$product_static->type = $objp->type;
 		$product_static->label = $objp->product_label;
 
 		print '<tr class="oddeven">';
 
+		// Line id
 		print '<td>' . $objp->rowid . '</td>';
 
 		// Ref Invoice
@@ -357,7 +362,7 @@ if ($result) {
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
 
-		print '<td>';
+		print '<td class="tdoverflowonsmartphone">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
@@ -365,16 +370,17 @@ if ($result) {
 
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="right">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
+
+		print '<td>' . $objp->country .'</td>';
+
+		print '<td>' . $objp->tva_intra . '</td>';
+
 		print '<td align="center">';
 		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')).'">';
 		print img_edit();
 		print '</a>';
 		print '</td>';
 
-		print '<td>' . $objp->country .'</td>';
-
-		print '<td>' . $objp->tva_intra . '</td>';
-
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 
 		print "</tr>";
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 4d9d7532d7e..f7485e701b7 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -27,7 +27,6 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
@@ -36,13 +35,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
-$langs->load("productbatch");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("bills","compta","accountancy","other","productbatch"));
 
 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
@@ -55,8 +49,8 @@ $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
 $search_lineid = GETPOST('search_lineid', 'int');
-$search_invoice = GETPOST('search_invoice', 'alpha');
 $search_ref = GETPOST('search_ref', 'alpha');
+$search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
@@ -65,6 +59,8 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $search_day=GETPOST("search_day","int");
 $search_month=GETPOST("search_month","int");
 $search_year=GETPOST("search_year","int");
+$search_country = GETPOST('search_country', 'alpha');
+$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 $btn_ventil = GETPOST('ventil', 'alpha');
 
@@ -103,7 +99,7 @@ $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'acco
 
 
 /*
- * Action
+ * Actions
  */
 
 if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
@@ -129,6 +125,8 @@ if (empty($reshook))
 		$search_day = '';
 		$search_month = '';
 		$search_year = '';
+		$search_country = '';
+		$search_tvaintra = '';
 	}
 
 	// Mass actions
@@ -209,14 +207,17 @@ if (empty($chartaccountcode))
 }
 
 // Customer Invoice lines
-$sql = "SELECT f.rowid as facid, f.facnumber, f.datef, f.type as ftype,";
+$sql = "SELECT f.rowid as facid, f.facnumber as ref, f.datef, f.type as ftype,";
 $sql.= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,";
-$sql.= " aa.rowid as aarowid";
+$sql.= " aa.rowid as aarowid,";
+$sql.= " co.label as country, s.tva_intra";
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM " . MAIN_DB_PREFIX . "facture as f";
+$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
 $sql.= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as l ON f.rowid = l.fk_facture";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '" . $chartaccountcode."'";
@@ -229,25 +230,25 @@ if ($search_lineid) {
     $sql .= natural_search("l.rowid", $search_lineid, 1);
 }
 if (strlen(trim($search_invoice))) {
-    $sql .= natural_search("f.facnumber",$search_invoice);
+    $sql .= natural_search("f.facnumber", $search_invoice);
 }
 if (strlen(trim($search_ref))) {
-    $sql .= natural_search("p.ref",$search_ref);
+    $sql .= natural_search("p.ref", $search_ref);
 }
 if (strlen(trim($search_label))) {
-    $sql .= natural_search("p.label",$search_label);
+    $sql .= natural_search("p.label", $search_label);
 }
 if (strlen(trim($search_desc))) {
-    $sql .= natural_search("l.description",$search_desc);
+    $sql .= natural_search("l.description", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-    $sql .= natural_search("l.total_ht",$search_amount,1);
+    $sql .= natural_search("l.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-    $sql .= natural_search("aa.account_number",$search_account);
+    $sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-    $sql .= natural_search("l.tva_tx",$search_vat,1);
+    $sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
 if ($search_month > 0)
 {
@@ -262,6 +263,12 @@ else if ($search_year > 0)
 {
 	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 }
+if (strlen(trim($search_country))) {
+	$sql .= natural_search("co.label", $search_country);
+}
+if (strlen(trim($search_tvaintra))) {
+	$sql .= natural_search("s.tva_intra", $search_tvaintra);
+}
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -282,6 +289,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -306,6 +318,8 @@ if ($result) {
 	if ($search_desc)        $param.='&search_desc='.urlencode($search_desc);
 	if ($search_amount)      $param.='&search_amount='.urlencode($search_amount);
 	if ($search_vat)         $param.='&search_vat='.urlencode($search_vat);
+	if ($search_country)  	$param .= "&search_country=" . urlencode($search_country);
+	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
 
 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
@@ -344,9 +358,9 @@ if ($result) {
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
-	print '<td class="liste_titre center">';
+	print '<td class="liste_titre center nowraponall">';
    	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
    	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
    	$formother->select_year($search_year,'search_year',1, 20, 5);
@@ -356,6 +370,8 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50 right" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="' . dol_escape_htmltag($search_tvaintra) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td align="center" class="liste_titre">';
@@ -373,6 +389,8 @@ if ($result) {
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', 'align="center"');
 	print_liste_field_titre("IntoAccount", '', '', '', '', 'align="center"');
 	$checkpicto='';
@@ -382,9 +400,7 @@ if ($result) {
 
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
-	$form = new Form($db);
 
-	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 
@@ -397,7 +413,7 @@ if ($result) {
 		$product_static->type = $objp->type;
 		$product_static->label = $objp->product_label;
 
-		$facture_static->ref = $objp->facnumber;
+		$facture_static->ref = $objp->ref;
 		$facture_static->id = $objp->facid;
 		$facture_static->type = $objp->ftype;
 
@@ -461,6 +477,10 @@ if ($result) {
 		print vatrate($objp->tva_tx_line.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''));
 		print '</td>';
 
+		print '<td>' . $objp->country .'</td>';
+
+		print '<td>' . $objp->tva_intra . '</td>';
+
 		// Current account
 		print '<td align="center" style="' . $code_sell_p_notset . '">';
 	    print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : $langs->trans("Unknown"));
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 3b59847d84d..59237fd13b2 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -28,14 +28,10 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
-// Langs
-$langs->load("bills");
-$langs->load("accountancy");
-$langs->load("trips");
+$langs->loadLangs(array("bills","accountancy","trips"));
 
 $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index cec7fbdced4..989024fa853 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -30,11 +30,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 
 // Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","other","main","accountancy"));
 
 // Security check
 if (empty($conf->accounting->enabled)) {
@@ -158,7 +154,8 @@ $y = $year_current;
 $buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
 
 
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
@@ -227,7 +224,9 @@ print '</div>';
 
 print '<br>';
 
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
 
 
 print '<div class="div-table-responsive-no-min">';
@@ -302,7 +301,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     print '<br>';
     print '<br>';
 
-    print_fiche_titre($langs->trans("OtherInfo"), '', '');
+    print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+    //print_fiche_titre($langs->trans("OtherInfo"), '', '');
 
 	print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 28a44d23a5e..93073a62bd4 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -26,7 +26,6 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -34,14 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
-$langs->load("trips");
-$langs->load("productbatch");
+$langs->loadLangs(array("compta","bills","other","accountancy","trips","productbatch"));
 
 $account_parent = GETPOST('account_parent','int');
 $changeaccount = GETPOST('changeaccount');
@@ -216,6 +208,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 2a24aa2f656..2abd3fdc776 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -27,7 +27,6 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
@@ -35,14 +34,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("trips");
-$langs->load("main");
-$langs->load("accountancy");
-$langs->load("productbatch");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("bills","compta","accountancy","other","trips","productbatch"));
 
 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
@@ -244,6 +237,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -345,7 +343,6 @@ if ($result) {
 	$expensereport_static = new ExpenseReport($db);
 	$form = new Form($db);
 
-	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 270a6b1ab09..8de7209ef93 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -26,26 +26,12 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
-// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","other","accountancy","loans","banks","admin","dict"));
 
 // Security check
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$langs->load("admin");
-$langs->load("dict");
-$langs->load("bills");
-$langs->load("accountancy");
-$langs->load("compta");
-$langs->load("banks");
-$langs->load("loans");
-
-
 /*
  * Actions
  */
@@ -63,111 +49,118 @@ print load_fiche_titre($langs->trans("AccountancyArea"), '', 'title_accountancy'
 
 $step = 0;
 
-print $langs->trans("AccountancyAreaDescIntro")."<br>\n";
-print "<br>\n";print "<br>\n";
-
-print_fiche_titre('<span class="fa fa-calendar-check-o"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."<br>\n";
-print '<hr>';
-print "<br>\n";
-
-// STEPS
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>');
-print "<br>\n";
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>');
-print "<br>\n";
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").'</strong>');
-print "<br>\n";
-
-print "<br>\n";
-print $langs->trans("AccountancyAreaDescActionOnceBis");
-print "<br>\n";
-print "<br>\n";
-
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-print "<br>\n";
-
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong>')."\n";
-print "<br>\n";
-
-$step++;
-$textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong>';
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
-print "<br>\n";
-if (! empty($conf->tax->enabled))
+if ($conf->accounting->enabled)
 {
-    $textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong>';
-    $step++;
-    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
-    print "<br>\n";
+	print $langs->trans("AccountancyAreaDescIntro")."<br>\n";
+	print "<br>\n";print "<br>\n";
+
+	print_fiche_titre('<span class="fa fa-calendar-check-o"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."<br>\n";
+	print '<hr>';
+	print "<br>\n";
+
+	// STEPS
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>');
+	print "<br>\n";
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>');
+	print "<br>\n";
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").'</strong>');
+	print "<br>\n";
+
+	print "<br>\n";
+	print $langs->trans("AccountancyAreaDescActionOnceBis");
+	print "<br>\n";
+	print "<br>\n";
+
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	print "<br>\n";
+
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong>')."\n";
+	print "<br>\n";
+
+	$step++;
+	$textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong>';
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
+	print "<br>\n";
+	if (! empty($conf->tax->enabled))
+	{
+	    $textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong>';
+	    $step++;
+	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
+	    print "<br>\n";
+	}
+	/*if (! empty($conf->salaries->enabled))
+	{
+	    $step++;
+	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSal", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	    // htdocs/admin/salaries.php
+	    print "<br>\n";
+	    print "<br>\n";
+	}*/
+	if (! empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
+	{
+	    $step++;
+	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong>');
+	    print "<br>\n";
+	}
+	/*
+	if (! empty($conf->loan->enabled))
+	{
+	    $step++;
+	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescLoan", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuSpecialExpenses").'-'.$langs->transnoentitiesnoconv("Loans").'</strong> '.$langs->transnoentitiesnoconv("or").' <strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	    print "<br>\n";
+	}
+	if (! empty($conf->don->enabled))
+	{
+	    $step++;
+	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDonationAccounts").'</strong>');
+	    print "<br>\n";
+	}*/
+
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>');
+	print "<br>\n";
+
+
+	print '<br>';
+
+
+	print "<br>\n";
+	print_fiche_titre('<span class="fa fa-calendar"></span> '.$langs->trans("AccountancyAreaDescActionFreq"), '', '');
+	print '<hr>';
+	print "<br>\n";
+	$step = 0;
+
+	$langs->loadLangs(array('bills', 'trips'));
+
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."\n";
+	print "<br>\n";
+
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."\n";
+	print "<br>\n";
+
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."\n";
+	print "<br>\n";
+
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
+	print "<br>\n";
+
+	$step++;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64+$step))."<br>\n";
+	print "<br>\n";
 }
-/*if (! empty($conf->salaries->enabled))
+else
 {
-    $step++;
-    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSal", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-    // htdocs/admin/salaries.php
-    print "<br>\n";
-    print "<br>\n";
-}*/
-if (! empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
-{
-    $step++;
-    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong>');
-    print "<br>\n";
+	print $langs->trans("Module10Desc")."<br>\n";
 }
-/*
-if (! empty($conf->loan->enabled))
-{
-    $step++;
-    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescLoan", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuSpecialExpenses").'-'.$langs->transnoentitiesnoconv("Loans").'</strong> '.$langs->transnoentitiesnoconv("or").' <strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-    print "<br>\n";
-}
-if (! empty($conf->don->enabled))
-{
-    $step++;
-    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDonationAccounts").'</strong>');
-    print "<br>\n";
-}*/
-
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>');
-print "<br>\n";
-
-
-print '<br>';
-
-
-print "<br>\n";
-print_fiche_titre('<span class="fa fa-calendar"></span> '.$langs->trans("AccountancyAreaDescActionFreq"), '', '');
-print '<hr>';
-print "<br>\n";
-$step = 0;
-
-$langs->loadLangs(array('bills', 'trips'));
-
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."\n";
-print "<br>\n";
-
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."\n";
-print "<br>\n";
-
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."\n";
-print "<br>\n";
-
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
-print "<br>\n";
-
-$step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64+$step))."<br>\n";
-print "<br>\n";
 
 llxFooter();
 $db->close();
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 030140b7f11..be299471708 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -702,6 +702,7 @@ if (! $error && $action == 'writebookkeeping') {
 if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
+	$filename = 'journal';
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
 	// CSV header line
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 1b140c0bb40..27b627b4b98 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -412,9 +412,10 @@ $form = new Form($db);
 $userstatic = new User($db);
 
 // Export
-/*if ($action == 'exportcsv') {
+/*if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
+	$filename = 'journal';
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
 	// Model Cegid Expert Export
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index ac4a0e89e0b..5eb20c8eecb 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -575,9 +575,10 @@ if ($action == 'writebookkeeping') {
 $form = new Form($db);
 
 // Export
-if ($action == 'exportcsv') {
+if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
+	$filename = 'journal';
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
 	$companystatic = new Fournisseur($db);
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 373bc81c4c6..8882396d5fb 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -171,7 +171,8 @@ if ($result) {
 		$line->fetch($obj->fdid);
 
 		// Situation invoices handling
-		$prev_progress = $line->get_prev_progress($obj->fdid);
+		$prev_progress = $line->get_prev_progress($obj->rowid);
+
 		if ($obj->type == Facture::TYPE_SITUATION) {
 			// Avoid divide by 0
 			if ($obj->situation_percent == 0) {
@@ -527,10 +528,10 @@ if ($action == 'writebookkeeping') {
 $form = new Form($db);
 
 // Export
-if ($action == 'exportcsv') {
-
+if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
+	$filename = 'journal';
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
 	$companystatic = new Client($db);
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index f74165251f3..847181b79cb 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -28,13 +28,10 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
-// Langs
-$langs->load("bills");
-$langs->load("accountancy");
+$langs->loadLangs(array("bills","accountancy"));
 
 $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index e9935fc8d78..1bba9a941e0 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -30,11 +30,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 
 // Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","other","main","accountancy"));
 
 // Security check
 if (empty($conf->accounting->enabled)) {
@@ -158,7 +154,8 @@ $y = $year_current;
 $buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
 
 
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
@@ -228,7 +225,8 @@ print '</div>';
 print '<br>';
 
 
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
@@ -301,7 +299,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     print '<br>';
     print '<br>';
 
-    print_fiche_titre($langs->trans("OtherInfo"), '', '');
+    print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+    //print_fiche_titre($langs->trans("OtherInfo"), '', '');
 
 	print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 6ad8731a415..a3e71cea0af 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -26,22 +26,16 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
-$langs->load("productbatch");
+$langs->loadLangs(array("compta","bills","other","accountancy","productbatch"));
 
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
@@ -117,10 +111,11 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
-	$db->begin();
 
 	if (! $error)
 	{
+		$db->begin();
+
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 		$sql1 .= " SET l.fk_code_ventilation=" . (GETPOST('account_parent','int') > 0 ? GETPOST('account_parent','int') : '0');
 		$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
@@ -173,10 +168,13 @@ print '<script type="text/javascript">
 /*
  * Supplier Invoice lines
  */
-$sql = "SELECT f.rowid as facid, f.ref as facnumber, f.ref_supplier, f.libelle as invoice_label, f.datef, f.fk_soc,";
+$sql = "SELECT f.rowid as facid, f.ref as ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.fk_soc,";
 $sql.= " l.rowid, l.fk_product, l.description, l.total_ht , l.qty, l.tva_tx, l.vat_src_code,";
 $sql.= " aa.label, aa.account_number, ";
 $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, co.label as country, s.tva_intra";
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
@@ -230,6 +228,11 @@ if (strlen(trim($search_tvaintra))) {
 }
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
@@ -238,11 +241,16 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
 
-dol_syslog('accountancy/supplier/lines.php::list');
+dol_syslog('accountancy/supplier/lines.php');
 $result = $db->query($sql);
 
 if ($result) {
@@ -273,7 +281,7 @@ if ($result) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
 
@@ -283,11 +291,12 @@ if ($result) {
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
+	// We add search filter
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre center">';
@@ -300,10 +309,10 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tavintra" value="' . dol_escape_htmltag($search_tavintra) . '"></td>';
-    print '<td class="liste_titre" align="center">';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="' . dol_escape_htmltag($search_tvaintra) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+	print '<td class="liste_titre" align="center">';
     $searchpicto=$form->showFilterButtons();
     print $searchpicto;
     print '</td>';
@@ -319,22 +328,22 @@ if ($result) {
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-    $checkpicto=$form->showCheckAddButtons();
+	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
+	$checkpicto=$form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
 
 	$facturefournisseur_static = new FactureFournisseur($db);
-	$product_static = new Product($db);
+	$product_static = new ProductFournisseur($db);
 
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
 
-		$facturefournisseur_static->ref = $objp->facnumber;
+		$facturefournisseur_static->ref = $objp->ref;
 		$facturefournisseur_static->id = $objp->facid;
 
 		$product_static->ref = $objp->product_ref;
@@ -344,24 +353,26 @@ if ($result) {
 
 		print '<tr class="oddeven">';
 
+		// Line id
 		print '<td>' . $objp->rowid . '</td>';
 
 		// Ref Invoice
 		print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
 
-		print '<td>';
+		print '<td class="tdoverflowonsmartphone">';
 		print $objp->invoice_label;
 		print '</td>';
 
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
 
-		// Ref Product
+		// Ref product
 		print '<td>';
 		if ($product_static->id)
 			print $product_static->getNomUrl(1);
 	    if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
 
+		// Description
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
@@ -370,18 +381,20 @@ if ($result) {
 
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="right">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
+
+		print '<td>' . $objp->country .'</td>';
+		print '<td>' . $objp->tva_intra . '</td>';
+
 		print '<td align="center">';
 		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid  . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')) . '">';
 		print img_edit();
 		print '</a></td>';
-		print '<td>' . $objp->country .'</td>';
-		print '<td>' . $objp->tva_intra . '</td>';
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 
-		print "</tr>";
+		print '</tr>';
 		$i ++;
 	}
-    print "</table>";
+    print '</table>';
     print "</div>";
 
     if ($nbtotalofrecords > $limit) {
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index c19e1d2716c..4a52cb9a0e4 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -27,7 +27,6 @@
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
@@ -36,13 +35,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
-$langs->load("productbatch");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("bills","compta","accountancy","other","productbatch"));
 
 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
@@ -65,6 +59,8 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $search_day=GETPOST("search_day","int");
 $search_month=GETPOST("search_month","int");
 $search_year=GETPOST("search_year","int");
+$search_country = GETPOST('search_country', 'alpha');
+$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 $btn_ventil = GETPOST('ventil', 'alpha');
 
@@ -104,7 +100,7 @@ $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'acco
 
 
 /*
- * Action
+ * Actions
  */
 
 if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
@@ -130,6 +126,8 @@ if (empty($reshook))
 		$search_day = '';
 		$search_month = '';
 		$search_year = '';
+		$search_country = '';
+		$search_tvaintra = '';
 	}
 
 	// Mass actions
@@ -213,11 +211,14 @@ if (empty($chartaccountcode))
 $sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.type as ftype,";
 $sql.= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy, p.tva_tx as tva_tx_prod,";
-$sql.= " aa.rowid as aarowid";
+$sql.= " aa.rowid as aarowid,";
+$sql.= " co.label as country, s.tva_intra";
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
 $sql.= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '" . $chartaccountcode."'";
@@ -228,25 +229,28 @@ if ($search_lineid) {
     $sql .= natural_search("l.rowid", $search_lineid, 1);
 }
 if (strlen(trim($search_invoice))) {
-    $sql .= natural_search("f.ref",$search_invoice);
+    $sql .= natural_search("f.ref", $search_invoice);
 }
 if (strlen(trim($search_ref))) {
-    $sql .= natural_search("p.ref",$search_ref);
+    $sql .= natural_search("p.ref", $search_ref);
 }
 if (strlen(trim($search_label))) {
-    $sql .= natural_search("p.label",$search_label);
+    $sql .= natural_search("p.label", $search_label);
 }
 if (strlen(trim($search_desc))) {
-    $sql .= natural_search("l.description",$search_desc);
+    $sql .= natural_search("l.description", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-    $sql .= natural_search("l.total_ht",$search_amount,1);
+    $sql .= natural_search("l.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-    $sql .= natural_search("aa.account_number",$search_account);
+    $sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-    $sql .= natural_search("l.tva_tx",$search_vat,1);
+    $sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
+}
+if (strlen(trim($search_tvaintra))) {
+	$sql .= natural_search("s.tva_intra", $search_tvaintra);
 }
 if ($search_month > 0)
 {
@@ -261,6 +265,9 @@ else if ($search_year > 0)
 {
 	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 }
+if (strlen(trim($search_country))) {
+	$sql .= natural_search("co.label", $search_country);
+}
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
 } else {
@@ -281,12 +288,18 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog('accountancy/supplier/list.php');
 $result = $db->query($sql);
+
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
@@ -305,6 +318,8 @@ if ($result) {
 	if ($search_desc)        $param.='&search_desc='.urlencode($search_desc);
 	if ($search_amount)      $param.='&search_amount='.urlencode($search_amount);
 	if ($search_vat)         $param.='&search_vat='.urlencode($search_vat);
+	if ($search_country) 	$param .= "&search_country=" . urlencode($search_country);
+	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
 
 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
@@ -343,26 +358,28 @@ if ($result) {
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre center">';
+	print '<td class="liste_titre center nowraponall">';
    	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
    	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
    	$formother->select_year($search_year,'search_year',1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="' . dol_escape_htmltag($search_tvaintra) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td align="center" class="liste_titre">';
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	print '</tr>';
+	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
@@ -374,6 +391,8 @@ if ($result) {
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', 'align="center"');
 	print_liste_field_titre("IntoAccount", '', '', '', '', 'align="center"');
 	$checkpicto='';
@@ -383,10 +402,8 @@ if ($result) {
 
 	$facturefourn_static = new FactureFournisseur($db);
 	$productfourn_static = new ProductFournisseur($db);
-	$form = new Form($db);
 
-	$var = true;
-	while ( $i < min($num_lines, $limit) ) {
+	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
 		// product_type: 0 = service ? 1 = product
@@ -448,9 +465,9 @@ if ($result) {
 		if ($productfourn_static->id)
 			print $productfourn_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
-        print '</td>';
+		print '</td>';
 
-        // Description
+		// Description
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
@@ -468,6 +485,9 @@ if ($result) {
 		print vatrate($objp->tva_tx_line.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''));
 		print '</td>';
 
+		print '<td>' . $objp->country .'</td>';
+		print '<td>' . $objp->tva_intra . '</td>';
+
 		// Current account
 		print '<td align="center" style="' . $code_buy_p_notset . '">';
 		print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : $langs->trans("Unknown"));
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index d9d158607b6..773f7a7ff68 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -23,15 +23,15 @@ if (empty($conf) || ! is_object($conf))
 	exit;
 }
 
-
+$code = $conf->global->MAIN_INFO_ACCOUNTANT_CODE;
 $prefix = $conf->global->ACCOUNTING_EXPORT_PREFIX_SPEC;
 $format = $conf->global->ACCOUNTING_EXPORT_FORMAT;
 $nodateexport = $conf->global->ACCOUNTING_EXPORT_NO_DATE_IN_FILENAME;
 
-$date_export = dol_print_date($now, '%Y%m%d%H%M%S');
+$date_export = "_" . dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
 header('Content-Type: text/csv');
 
-$filename = ($prefix?$prefix . "_":""). "journal_" . $journal . ($nodateexport?"":$date_export) . "." . $format;
+$completefilename = ($code?$code . "_":"") . ($prefix?$prefix . "_":"") . $filename . ($nodateexport?"":$date_export) . "." . $format;
 
-header('Content-Disposition: attachment;filename=' . $filename);
+header('Content-Disposition: attachment;filename=' . $completefilename);
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 0a560c402fd..b35df5f0083 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -241,7 +241,13 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC))
 	} else {
 		$entity_qr='';
 	}
-	print '<a target="_blank" href="'.DOL_URL_ROOT.'/public/members/new.php'.$entity_qr.'">'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.$entity_qr.'</a>';
+
+	// Define $urlwithroot
+	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+	$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
+
+	print '<a target="_blank" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.$urlwithroot.'/public/members/new.php'.$entity_qr.'</a>';
 }
 
 
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 927bd22f7fa..41f45d54ebd 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -148,10 +148,12 @@ if ($object->id > 0)
     //print '</div>';
 
 
-	$createbutton = '';
+	$newcardbutton = '';
     if (! empty($conf->agenda->enabled))
     {
-    	$createbutton.='<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id.'">'.$langs->trans("AddAction").'</a>';
+    	$newcardbutton.='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id.'">'.$langs->trans("AddAction");
+    	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+    	$newcardbutton.= '</a>';
     }
 
     if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
@@ -162,7 +164,7 @@ if ($object->id > 0)
     	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 
-    	print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $createbutton, '', 0, 1, 1);
+    	print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $newcardbutton, '', 0, 1, 1);
 
     	// List of all actions
     	$filters=array();
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 0eaa3efff8f..06eb0b2b40a 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2018 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2012-2016 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2018 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,11 +41,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("members");
-$langs->load("users");
-$langs->load('other');
+// Load traductions files requiredby by page
+$langs->loadLangs(array("companies","bills","members","users","other"));
 
 $action=GETPOST('action','alpha');
 $cancel=GETPOST('cancel','alpha');
@@ -1001,13 +998,7 @@ else
 		}
 
 		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
         print '<tbody>';
 		print "</table>\n";
@@ -1277,13 +1268,7 @@ else
 		print '</td></tr>';
 
 		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit',$parameters);
-		}
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 		print '</table>';
 
@@ -1399,7 +1384,7 @@ else
 			$outputlangs = new Translate('', $conf);
 			$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
 			$outputlangs->loadLangs(array("main", "members"));
-			// Get email content fro mtemplae
+			// Get email content from template
 			$arraydefaultmessage=null;
 			$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION;
 
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 59713e20573..be3a13d8771 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -29,22 +29,22 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/printsheet/modules_labels.php';
 
-$langs->load("members");
-$langs->load("errors");
+$langs->loadLangs(array("members","errors"));
 
 // Choix de l'annee d'impression ou annee courante.
 $now = dol_now();
 $year=dol_print_date($now,'%Y');
 $month=dol_print_date($now,'%m');
 $day=dol_print_date($now,'%d');
-$foruserid=GETPOST('foruserid');
-$foruserlogin=GETPOST('foruserlogin');
-$mode=GETPOST('mode');
-$model=GETPOST("model");			// Doc template to use for business cards
-$modellabel=GETPOST("modellabel");	// Doc template to use for address sheet
+$foruserid=GETPOST('foruserid','alphanohtml');
+$foruserlogin=GETPOST('foruserlogin','alphanohtml');
+$mode=GETPOST('mode','aZ09');
+$model=GETPOST("model",'aZ09');				// Doc template to use for business cards
+$modellabel=GETPOST("modellabel",'aZ09');	// Doc template to use for address sheet
 $mesg='';
 
 $adherentstatic=new Adherent($db);
+$object=new Adherent($db);
 
 $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
@@ -70,11 +70,11 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
     $sql.= " t.libelle as type,";
     $sql.= " c.code as country_code, c.label as country";
     // Add fields from extrafields
-    foreach ($extrafields->attribute_label as $key => $val)
-        $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+    if (! empty($extrafields->attributes[$object->table_element]['label']))
+    	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
     $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
-    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
+    if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
     $sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
     $sql.= " AND d.entity IN (".getEntity('adherent').")";
     if (is_numeric($foruserid)) $sql.=" AND d.rowid=".$foruserid;
@@ -98,10 +98,10 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
     		$adherentstatic->firstname=$objp->firstname;
 
             // format extrafiled so they can be parsed in function complete_substitutions_array
-            if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
             {
                 $adherentstatic->array_options = array();
-                foreach($extrafields->attribute_label as $key => $val)
+                foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
                 {
                     $tmpkey='options_'.$key;
                     if (!empty($objp->$tmpkey))
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 760791027cb..899ba0c9db7 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -463,24 +463,15 @@ class Adherent extends CommonObject
 
 			$action='update';
 
-			// Actions on extra fields (by external module)
-			// TODO le hook fait double emploi avec le trigger !!
-			$hookmanager->initHooks(array('memberdao'));
-			$parameters=array('id'=>$this->id);
-			$action='';
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			if (empty($reshook))
+			// Actions on extra fields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 
 			// Update password
 			if (! $error && $this->pass)
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index f1b44d3f1e7..75f518074b1 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -171,22 +171,15 @@ class AdherentType extends CommonObject
 		{
 			$action='update';
 
-			// Actions on extra fields (by external module or standard code)
-			$hookmanager->initHooks(array('membertypedao'));
-			$parameters=array('membertype'=>$this->id);
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			if (empty($reshook))
+			// Actions on extra fields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 
 			if (! $error && ! $notrigger)
 			{
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 54e975c2f8c..8e12dec056e 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -144,7 +144,7 @@ if ($id > 0)
 		print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 		//Total taille
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 		print '</table>';
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index c92b66e8bc2..13d0cbd30c5 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -43,7 +43,7 @@ $toselect = GETPOST('toselect', 'array');
 $result=restrictedArea($user,'adherent');
 
 $filter=GETPOST("filter",'alpha');
-$statut=GETPOST("statut",'alpha');
+$statut=GETPOST("statut",'intcomma');
 $search=GETPOST("search",'alpha');
 $search_ref=GETPOST("search_ref",'alpha');
 $search_lastname=GETPOST("search_lastname",'alpha');
@@ -262,6 +262,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$resql = $db->query($sql);
 	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
 	else dol_print_error($db);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 // Add limit
 $sql.= $db->plimit($limit+1, $offset);
@@ -348,7 +353,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 $newcardbutton='';
 if ($user->rights->adherent->creer)
 {
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?action=create">'.$langs->trans('NewMember').'</a>';
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/card.php?action=create">'.$langs->trans('NewMember');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 4126fc6e68c..083d81d6db6 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -213,7 +213,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
     print $px1->show();
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 2a6c4fe2d71..bf15230d47e 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -145,6 +145,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -181,7 +186,13 @@ if ($result)
 	if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/list.php?status=-1,1">'.$langs->trans('NewSubscription').'</a>';
+	$newcardbutton='';
+	if ($user->rights->adherent->cotisation->creer)
+	{
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/list.php?status=-1,1">'.$langs->trans('NewSubscription');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
+	}
 
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index f89b8da20f6..a3033ec090d 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -36,13 +36,12 @@ $langs = $GLOBALS['langs'];
 $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 $langs->load("members");
 
-$var=true;
 $total=0;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
 
 ?>
-<tr <?php echo $GLOBALS['bc'][$var]; ?> >
+<tr class="oddeven" >
     <td><?php echo $langs->trans("Subscription"); ?></td>
     <td><?php echo $objectlink->getNomUrl(1); ?></td>
 	<td align="center"></td>
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 929dc706042..b0b5eee67ed 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -231,7 +231,9 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		$newcardbutton='';
 		if ($user->rights->adherent->configurer)
 		{
-			$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type.php?action=create">'.$langs->trans('NewMemberType').'</a>';
+			$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/type.php?action=create">'.$langs->trans('NewMemberType');
+			$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+			$newcardbutton.= '</a>';
 		}
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -338,7 +340,7 @@ if ($action == 'create')
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -485,6 +487,9 @@ if ($rowid > 0)
 		{
 		    $sql.=" AND datefin < '".$db->idate($now)."'";
 		}
+
+		$sql.= " ".$db->order($sortfield,$sortorder);
+
 		// Count total nb of records
 		$nbtotalofrecords = '';
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -492,9 +497,13 @@ if ($rowid > 0)
 			$resql = $db->query($sql);
 		    if ($resql) $nbtotalofrecords = $db->num_rows($result);
 		    else dol_print_error($db);
+		    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		    {
+		    	$page = 0;
+		    	$offset = 0;
+		    }
 		}
-		// Add order and limit
-		$sql.= " ".$db->order($sortfield,$sortorder);
+
 		$sql.= " ".$db->plimit($conf->liste_limit+1, $offset);
 
 		$resql = $db->query($sql);
@@ -736,7 +745,7 @@ if ($rowid > 0)
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook))
 		{
 		    print $object->showOptionals($extrafields,'edit');
 		}
@@ -744,7 +753,7 @@ if ($rowid > 0)
 		print '</table>';
 
 		// Extra field
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook))
 		{
 			print '<br><br><table class="border" width="100%">';
 			foreach($extrafields->attribute_label as $key=>$label)
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 11fa5d68e64..73d6be66ed7 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -61,6 +61,7 @@ if ( ($action == 'update' && ! GETPOST("cancel",'alpha'))
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax",'alpha'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail",'alpha'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web",'alpha'),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note",'none'),'chaine',0,'',$conf->entity);
 
 	if ($action != 'updateedit' && ! $error)
@@ -155,6 +156,10 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_WEB . '"></td></tr>';
 	print '</td></tr>'."\n";
 
+	// Code
+	print '<tr class="oddeven"><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
+	print '<input name="code" id="code" class="minwidth100" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_CODE?$conf->global->MAIN_INFO_ACCOUNTANT_CODE: GETPOST("code",'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
+
 	// Note
 	print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
 	print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note','none') ? GETPOST('note','none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
@@ -224,10 +229,10 @@ else
 
 	print '<tr class="oddeven"><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL,0,0,0,80) . '</td></tr>';
 
-	// Web
-
 	print '<tr class="oddeven"><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB,'_blank',80) . '</td></tr>';
 
+	print '<tr class="oddeven"><td>'.$langs->trans("AccountantFileNumber").'</td><td>' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . '</td></tr>';
+
 	print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . '</td></tr>';
 
 	print '</table>';
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 2c90c0ed99b..748fc7a0309 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -75,6 +75,12 @@ else
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
 	$search_event = '';
+	$action = '';
+}
+
+if (GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') ||GETPOST('button_search','alpha'))	// To avoid the save when we click on search
+{
+	$action = '';
 }
 
 if ($action == "save" && empty($cancel))
@@ -106,34 +112,6 @@ if ($action == "save" && empty($cancel))
     }
 }
 
-if (preg_match('/set_(.*)/',$action,$reg))
-{
-	$code=$reg[1];
-	$value=(GETPOST($code) ? GETPOST($code) : 1);
-	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-if (preg_match('/del_(.*)/',$action,$reg))
-{
-	$code=$reg[1];
-	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
 
 
 /**
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 4c1b49d75e6..f40ab648e42 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -148,7 +148,6 @@ print "<br>\n";
 $selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
 if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
 
-$var=true;
 print "<table class=\"noborder\" width=\"100%\">";
 
 print "<tr class=\"liste_titre\">";
@@ -202,7 +201,6 @@ print '<td align="right">'.$langs->trans("Color").'</td>';
 print "</tr>";
 
 $i=1;
-$var=true;
 while ($i <= $MAXAGENDA)
 {
 	$key=$i;
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 54414e094d3..b6b332a4b99 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -52,10 +52,10 @@ $type = 'action';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if (preg_match('/set_(.*)/',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
 	$code=$reg[1];
-	$value=(GETPOST($code) ? GETPOST($code) : 1);
+	$value=(GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
@@ -67,7 +67,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
 	}
 }
 
-if (preg_match('/del_(.*)/',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
 	$code=$reg[1];
 	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 3e946dd8e60..76b69073f25 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -29,9 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 if (!$user->admin)
     accessforbidden();
 
-$langs->load("admin");
-$langs->load("other");
-$langs->load("agenda");
+$langs->loadLangs(array("admin","other","agenda"));
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
@@ -47,10 +45,10 @@ $type = 'action';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if (preg_match('/set_(.*)/',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
 	$code=$reg[1];
-	$value=(GETPOST($code) ? GETPOST($code) : 1);
+	$value=(GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
@@ -62,7 +60,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
 	}
 }
 
-if (preg_match('/del_(.*)/',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
 	$code=$reg[1];
 	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
@@ -173,8 +171,6 @@ llxHeader();
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
-print "<br>\n";
-
 
 
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index ac19eb24c03..ab0effc2c45 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -32,9 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 if (!$user->admin)
     accessforbidden();
 
-$langs->load("admin");
-$langs->load("other");
-$langs->load("agenda");
+$langs->loadLangs(array("admin","other","agenda"));
 
 $def = array();
 $actionsave=GETPOST('save','alpha');
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 236a494c060..dcecd0c78c1 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -1,9 +1,9 @@
 <?php
 
-/* Copyright (C) 2009       Laurent Destailleur        <eldy@users.sourceforge.net>
+/* Copyright (C) 2009       Laurent Destailleur    <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2016  Juanjo Menent	       <jmenent@2byte.es>
- * Copyright (C) 2013-2014  Philippe Grand             <philippe.grand@atoo-net.com>
- * Copyright (C) 2015       Jean-François Ferry         <jfefe@aternatik.fr>
+ * Copyright (C) 2013-2018  Philippe Grand         <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015       Jean-François Ferry    <jfefe@aternatik.fr>
  *
  * 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
@@ -31,11 +31,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
 
-$langs->load("admin");
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("banks");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","companies","bills","other","banks"));
 
 if (!$user->admin)
     accessforbidden();
@@ -178,10 +175,6 @@ print load_fiche_titre($langs->trans("BankSetupModule"), $linkback,
 $head = bank_admin_prepare_head(null);
 dol_fiche_head($head, 'general', $langs->trans("BankSetupModule"), -1, 'account');
 
-$var = true;
-
-$var = !$var;
-
 //Show bank account order
 print load_fiche_titre($langs->trans("BankOrderShow"), '', '');
 
@@ -201,12 +194,10 @@ $bankorder[1][0] = $langs->trans("BankOrderES");
 $bankorder[1][1] = $langs->trans("BankOrderESDesc");
 $bankorder[1][2] = 'BankCode DeskCode BankAccountNumberKey BankAccountNumber';
 
-$var = true;
 $i = 0;
 
 $nbofbank = count($bankorder);
 while ($i < $nbofbank) {
-    $var = !$var;
 
     print '<tr class="oddeven">';
     print '<td>' . $bankorder[$i][0] . "</td><td>\n";
@@ -238,7 +229,6 @@ while ($i < $nbofbank) {
 
 print '</table>' . "\n";
 
-
 print '<br><br>';
 
 
@@ -430,7 +420,8 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
     print '</a>';
     print '</td>';
 }
-else {
+else 
+{
     print '<td align="center">' . "\n";
     print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setreportlastnumreleve">' . img_picto($langs->trans("Disabled"),
                     'switch_off') . '</a>';
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 313a852e384..db2b85fa986 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -157,7 +157,6 @@ foreach($dirbarcode as $reldir)
 /*
  *  CHOIX ENCODAGE
  */
-$var=true;
 
 print '<br>';
 print load_fiche_titre($langs->trans("BarcodeEncodeModule"),'','');
@@ -185,7 +184,6 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	$var=true;
 
 	while ($i <	$num)
 	{
@@ -277,7 +275,6 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"update\">";
 
-$var=true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 86b38283649..0d2363f60c8 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2009       Laurent Destailleur        <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2016  Juanjo Menent	       <jmenent@2byte.es>
- * Copyright (C) 2013-2014  Philippe Grand             <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2018  Philippe Grand             <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Jean-François Ferry         <jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,11 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 
-$langs->load("admin");
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("banks");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","companies","bills","other","banks"));
 
 if (!$user->admin)
   accessforbidden();
@@ -133,8 +130,6 @@ foreach ($dirmodels as $reldir)
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
-
 			while (($file = readdir($handle))!==false)
 			{
 				if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
@@ -166,7 +161,6 @@ foreach ($dirmodels as $reldir)
 
 						if ($module->isEnabled())
 						{
-							$var = !$var;
 							print '<tr class="oddeven"><td width="100">';
 							print (empty($module->name)?$name:$module->name);
 							print "</td><td>\n";
@@ -254,9 +248,6 @@ print '<td>'.$langs->trans("Parameters").'</td>';
 print '<td align="center" width="60">&nbsp;</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
-$var=true;
-
-$var=! $var;
 
 $substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index e9224ba4688..582131b22f3 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -72,8 +72,6 @@ print '<form method="post" action="clicktodial.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-$var=true;
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 5db56c82aa2..cd4f4ca4ab2 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -286,7 +286,6 @@ foreach ($dirmodels as $reldir)
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
 
 			while (($file = readdir($handle))!==false)
 			{
@@ -406,7 +405,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
@@ -537,7 +535,6 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
-$var=true;
 
 $substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
@@ -545,7 +542,6 @@ $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_ORDER_FREE_TEXT">';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 59fa9eeae2f..dfa4b043978 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011-2017	Philippe Grand			<philippe.grand@atoo-net.com>
@@ -157,6 +157,7 @@ if ( ($action == 'update' && ! GETPOST("cancel",'alpha'))
 	}
 
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS", GETPOST("MAIN_INFO_SOCIETE_MANAGERS",'nohtml'),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_GDPR", GETPOST("MAIN_INFO_GDPR",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_CAPITAL", GETPOST("capital",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE", GETPOST("forme_juridique_code",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SIREN", GETPOST("siren",'nohtml'),'chaine',0,'',$conf->entity);
@@ -424,6 +425,13 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
 	print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="' . $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '"></td></tr>';
 
+	// GDPR contact
+
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
+	print '</td><td>';
+	print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="' . $conf->global->MAIN_INFO_GDPR . '"></td></tr>';
+
 	// Capital
 
 	print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
@@ -815,6 +823,11 @@ else
 	print '<tr class="oddeven"><td>'.$langs->trans("ManagingDirectors").'</td><td>';
 	print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '</td></tr>';
 
+	// GDPR Contact
+
+	print '<tr class="oddeven"><td>'.$langs->trans("GDPRContact").'</td><td>';
+	print $conf->global->MAIN_INFO_GDPR . '</td></tr>';
+
 	// Capital
 
 	print '<tr class="oddeven"><td>'.$langs->trans("Capital").'</td><td>';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 83c3634c35c..82fa51e5ca8 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011-2013      Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2011-2015      Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2018      Philippe Grand	    <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,9 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 
-$langs->load("admin");
-$langs->load("errors");
-$langs->load("contracts");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","errors","contracts"));
 
 if (!$user->admin) accessforbidden();
 
@@ -220,7 +219,6 @@ foreach ($dirmodels as $reldir)
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
 
 			while (($file = readdir($handle))!==false)
 			{
@@ -339,7 +337,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
@@ -377,7 +374,6 @@ foreach ($dirmodels as $reldir)
 
 	                        if ($modulequalified)
 	                        {
-	                            $var = !$var;
 	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
@@ -472,7 +468,6 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
-$var=true;
 
 $substitutionarray=pdf_getSubstitutionArray($langs, array('objectamount'), null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
@@ -480,7 +475,6 @@ $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
-$var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
 print '<br>';
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 5b532a3822f..091c9ff66bf 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -25,41 +25,27 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
 
+$langs->loadLangs(array("admin","other","agenda"));
 
 if (!$user->admin)
     accessforbidden();
 
-$langs->load("admin");
-$langs->load("other");
-$langs->load("agenda");
+// Parameters
+$action = GETPOST('action', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
 
-$def = array();
-$actionsave=GETPOST('save','alpha');
+$arrayofparameters=array('DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200'));
 
-// Sauvegardes parametres
-if ($actionsave)
-{
-    $i=0;
 
-    $db->begin();
+/*
+ * Actions
+ */
 
-    $i+=dolibarr_set_const($db,'XXX',trim(GETPOST('XXX','alpha')),'chaine',0,'',$conf->entity);
-
-    if ($i >= 4)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-        setEventMessages($langs->trans("SaveFailed"), null, 'errors');
-    }
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 
 
-/**
+/*
  * View
  */
 
@@ -77,30 +63,51 @@ $head=dav_admin_prepare_head();
 
 dol_fiche_head($head, 'webdav', '', -1, 'action');
 
-print $langs->trans("WebDAVSetupDesc")."<br>\n";
-print "<br>\n";
 
-/*
-print '<table class="noborder" width="100%">';
+if ($action == 'edit')
+{
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
 
-print '<tr class="liste_titre">';
-print "<td>".$langs->trans("Parameter")."</td>";
-print "<td>".$langs->trans("Value")."</td>";
-//print "<td>".$langs->trans("Examples")."</td>";
-print "<td>&nbsp;</td>";
-print "</tr>";
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-print '<tr class="oddeven">';
-print '<td class="fieldrequired">'.$langs->trans("PasswordTogetVCalExport")."</td>";
-print '<td><input required="required" type="text" class="flat" id="MAIN_AGENDA_XCAL_EXPORTKEY" name="MAIN_AGENDA_XCAL_EXPORTKEY" value="' . (GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha')?GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha'):$conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) . '" size="40">';
-if (! empty($conf->use_javascript_ajax))
-	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
-print '</td>';
-print "<td>&nbsp;</td>";
-print "</tr>";
+	foreach($arrayofparameters as $key => $val)
+	{
+		print '<tr class="oddeven"><td>';
+		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css'])?'minwidth200':$val['css']).'" value="' . $conf->global->$key . '"></td></tr>';
+	}
+
+	print '</table>';
+
+	print '<br><div class="center">';
+	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
+
+	print '</form>';
+	print '<br>';
+}
+else
+{
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+	foreach($arrayofparameters as $key => $val)
+	{
+		print '<tr class="oddeven"><td>';
+		print $form->textwithpicto($langs->trans($key),$langs->trans($key.'Tooltip'));
+		print '</td><td>' . $conf->global->$key . '</td></tr>';
+	}
+
+	print '</table>';
+
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '</div>';
+}
 
-print '</table>';
-*/
 
 dol_fiche_end();
 
@@ -113,7 +120,7 @@ print "</form>\n";
 
 clearstatcache();
 
-//if ($mesg) print "<br>$mesg<br>";
+print $langs->trans("WebDAVSetupDesc")."<br>\n";
 print "<br>";
 
 
@@ -130,34 +137,6 @@ $message.=img_picto('','object_globe.png').' '.$langs->trans("WebDavServer",'Web
 $message.='<br>';
 print $message;
 
-/*$message =$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
-$message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>';
-$message.=$langs->trans("AgendaUrlOptionsNotAdmin",$user->login,$user->login).'<br>';
-$message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
-$message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login).'<br>';
-$message.=$langs->trans("AgendaUrlOptionsNotAutoEvent",'systemauto','systemauto').'<br>';
-
-print info_admin($message);
-*/
-
-/*
-if (! empty($conf->use_javascript_ajax))
-{
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
-            $("#generate_token").click(function() {
-            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-            		action: \'getrandompassword\',
-            		generic: true
-				},
-				function(token) {
-					$("#MAIN_AGENDA_XCAL_EXPORTKEY").val(token);
-				});
-            });
-    });';
-	print '</script>';
-}
-*/
 
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 790445f7032..5c17fd32eb0 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2017	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2017	Regis Houssin		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2017		Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2017-2018	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -212,9 +212,9 @@ print "<br>\n";
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($optioncss != '')  $param.='&optioncss='.$optioncss;
-if (defaulturl)        $param.='&defaulturl='.urlencode(defaulturl);
-if (defaultkey)        $param.='&defaultkey='.urlencode(defaultkey);
-if (defaultvalue)      $param.='&defaultvalue='.urlencode(defaultvalue);
+if ($defaulturl)        $param.='&defaulturl='.urlencode($defaulturl);
+if ($defaultkey)        $param.='&defaultkey='.urlencode($defaultkey);
+if ($defaultvalue)      $param.='&defaultvalue='.urlencode($defaultvalue);
 
 
 print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 37f66427225..4cf423b317f 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -144,7 +144,7 @@ if ($action == 'update')
 	$plus='';
 	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
 	// Update values
-	for($i=0;$i<4;$i++) {
+	for($i=0; $i<4; $i++) {
     	if(isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'),'chaine',0,'',$conf->entity);
     }
 
@@ -172,7 +172,6 @@ if ($action == 'edit')
     print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="update">';
-    $var=true;
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
@@ -215,7 +214,6 @@ else
 
 	print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-    $var=true;
 
     foreach($modules as $module => $delays)
     {
@@ -241,7 +239,6 @@ else
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-	$var=false;
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">' . yn($conf->global->MAIN_DISABLE_METEO) . '</td></tr>';
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d8d2382a59f..74e4dd6bd4e 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -953,14 +953,14 @@ if (empty($id))
 print "<br>\n";
 
 
-$param = '&id='.$id;
-if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
+$param = '&id='.urlencode($id);
+if ($search_country_id > 0) $param.= '&search_country_id='.urlencode($search_country_id);
 if ($search_code != '')     $param.= '&search_code='.urlencode($search_country_id);
 if ($entity != '') $param.= '&entity=' . (int) $entity;
 $paramwithsearch = $param;
-if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
-if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
-if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+if ($sortorder) $paramwithsearch.= '&sortorder='.urlencode($sortorder);
+if ($sortfield) $paramwithsearch.= '&sortfield='.urlencode($sortfield);
+if (GETPOST('from')) $paramwithsearch.= '&from='.urlencode(GETPOST('from','alpha'));
 
 
 // Confirmation de la suppression de la ligne
@@ -987,10 +987,10 @@ if ($id)
     {
         // If sort order is "country", we use country_code instead
     	if ($sortfield == 'country') $sortfield='country_code';
-        $sql.= " ORDER BY ".$sortfield;
+        $sql.= " ORDER BY ".$db->escape($sortfield);
         if ($sortorder)
         {
-            $sql.=" ".strtoupper($sortorder);
+        	$sql.=" ".strtoupper($db->escape($sortorder));
         }
         $sql.=", ";
         // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 10653df9dc0..de3ca683519 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -118,9 +118,9 @@ class PrestaShopWebservice
 	public function executeRequest($url, $curl_params = array())
 	{
 		$defaultParams = array(
-			CURLOPT_HEADER => TRUE,
-			CURLOPT_RETURNTRANSFER => TRUE,
-			CURLINFO_HEADER_OUT => TRUE,
+			CURLOPT_HEADER => true,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLINFO_HEADER_OUT => true,
 			CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
 			CURLOPT_USERPWD => $this->key.':',
 			CURLOPT_HTTPHEADER => array( 'Expect:' )
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index dd9e748de02..cf1992dce5f 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -33,7 +33,7 @@ if (! $user->admin) accessforbidden();
 /*
  * Action
  */
-if (preg_match('/set_(.*)/',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
@@ -47,7 +47,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
     }
 }
 
-if (preg_match('/del_(.*)/',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
@@ -80,7 +80,6 @@ print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>';
 
-$var=true;
 $form = new Form($db);
 
 // Mail required for members
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index b2d9bd97980..6f4dce93e8c 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 if (!$user->admin)
 accessforbidden();
 
-$langs->load("users");
-$langs->load("admin");
-$langs->load("other");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("users","admin","other"));
 
 $action=GETPOST('action','aZ09');
 
@@ -42,7 +41,6 @@ $securityevent=new Events($db);
 $eventstolog=$securityevent->eventstolog;
 
 
-
 /*
  *	Actions
  */
@@ -88,8 +86,6 @@ $head=security_prepare_head();
 
 dol_fiche_head($head, 'audit', $langs->trans("Security"), -1);
 
-
-$var=true;
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
 print "<td colspan=\"2\">".$langs->trans("LogEvents")."</td>";
@@ -98,8 +94,7 @@ print "</tr>\n";
 foreach ($eventstolog as $key => $arr)
 {
 	if ($arr['id'])
-	{
-		
+	{		
 		print '<tr class="oddeven">';
 		print '<td>'.$arr['id'].'</td>';
 		print '<td>';
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 442a85c9c6a..311398a78e1 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2015	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2018	Philippe Grand			<philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,10 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
-$langs->load("admin");
-$langs->load("sendings");
-$langs->load("deliveries");
-$langs->load('other');
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
 
 if (! $user->admin)
 	accessforbidden();
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 28ced963f87..6d164b25282 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2018 Philippe Grand			    <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -233,8 +233,6 @@ foreach ($dirmodels as $reldir)
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
-
 			while (($file = readdir($handle))!==false)
 			{
 				if (substr($file, 0, 18) == 'mod_expensereport_' && substr($file, dol_strlen($file)-3, 3) == 'php')
@@ -351,7 +349,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/expensereport/doc");
@@ -376,7 +373,6 @@ foreach ($dirmodels as $reldir)
 		    		if (file_exists($dir.'/'.$file))
 		    		{
 
-
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
 
@@ -480,7 +476,6 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60"></td>';
 print "</tr>\n";
-$var=true;
 
 $substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
@@ -488,7 +483,6 @@ $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
-$var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='EXPENSEREPORT_FREE_TEXT';
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index adf18433caa..bb68ea2182e 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -30,11 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
 
-$langs->load('admin');
-$langs->load('other');
-$langs->load('trips');
-$langs->load('errors');
-$langs->load('dict');
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","trips","errors","other","dict"));
 
 if (!$user->admin) accessforbidden();
 
@@ -129,7 +126,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 	if ($Tab['active'] == 0) continue;
 
 	$tranche=1;
-	$var = true;
+
 	foreach ($Tab['ranges'] as $k => $range)
 	{
 		if (isset($Tab['ranges'][$k+1])) $label = $langs->trans('expenseReportRangeFromTo', $range->range_ik, ($Tab['ranges'][$k+1]->range_ik-1));
@@ -137,7 +134,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 
 		if ($range->range_active == 0) $label = $form->textwithpicto($label, $langs->trans('expenseReportRangeDisabled'), 1, 'help', '', 0, 3);
 
-		echo '<tr '.$bc[$var].'>';
+		echo '<tr class="oddeven">';
 
 		// Label
 		echo '<td width="20%"><b>['.$langs->trans('RangeNum', $tranche++).']</b> - '.$label.'</td>';
@@ -175,7 +172,6 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 		echo '</td>';
 
 		echo '</tr>';
-		$var=!$var;
 	}
 }
 
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index bf615676f81..ef915e196a2 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -30,11 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
 
-$langs->load('admin');
-$langs->load('other');
-$langs->load('trips');
-$langs->load('errors');
-$langs->load('dict');
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","other","trips","errors","dict"));
 
 if (!$user->admin) accessforbidden();
 
@@ -176,8 +173,7 @@ if ($action != 'edit')
 	echo '<th>&nbsp;</th>';
 	echo '</tr>';
 
-	$var=true;
-	echo '<tr '.$bc[$var].'>';
+	echo '<tr class="oddeven">';
 	echo '<td>';
 	echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, '', 0).'</div>';
 	echo '<div id="user" class="float">'.$form->select_dolusers('', 'fk_user').'</div>';
@@ -220,10 +216,9 @@ echo '<th>'.$langs->trans('ExpenseReportRestrictive').'</th>';
 echo '<th>&nbsp;</th>';
 echo '</tr>';
 
-$var=true;
 foreach ($rules as $rule)
 {
-	echo '<tr '.$bc[$var].'>';
+	echo '<tr class="oddeven">';
 
 	echo '<td>';
 	if ($action == 'edit' && $object->id == $rule->id)
@@ -260,7 +255,6 @@ foreach ($rules as $rule)
 	echo '</td>';
 
 
-
 	echo '<td>';
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
@@ -335,7 +329,6 @@ foreach ($rules as $rule)
 	echo '</td>';
 
 	echo '</tr>';
-	$var=!$var;
 }
 
 
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 4a184aa95a0..a1d542203cf 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -250,8 +250,6 @@ if ($resql)
         $rssparser=new RssParser($db);
 		$result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp);
 
-		$var=true;
-
 		print "<br>";
 		print "<form name=\"externalrssconfig\" action=\"".$_SERVER["PHP_SELF"]."\" method=\"post\">";
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 8ce73fd441f..71fa035ee00 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -310,8 +310,6 @@ foreach ($dirmodels as $reldir)
         $handle = opendir($dir);
         if (is_resource($handle))
         {
-        	$var=true;
-
             while (($file = readdir($handle))!==false)
             {
                 if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
@@ -342,7 +340,6 @@ foreach ($dirmodels as $reldir)
 
                         if ($module->isEnabled())
                         {
-                            $var = !$var;
                             print '<tr class="oddeven"><td width="100">';
                             echo preg_replace('/\-.*$/','',preg_replace('/mod_facture_/','',preg_replace('/\.php$/','',$file)));
                             print "</td><td>\n";
@@ -495,8 +492,9 @@ print '<td align="center" width="32">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";
 
 clearstatcache();
+
 $activatedModels = array();
-$var=true;
+
 foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
@@ -533,7 +531,6 @@ foreach ($dirmodels as $reldir)
 
 	                        if ($modulequalified)
 	                        {
-	                            $var = !$var;
 	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
@@ -614,8 +611,6 @@ foreach ($dirmodels as $reldir)
 print '</table>';
 
 
-
-
 /*
  *  Document templates generators
  */
@@ -666,7 +661,6 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 
 print '<table class="noborder" width="100%">';
-$var=True;
 
 print '<tr class="liste_titre">';
 print '<td>';
@@ -730,7 +724,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 $sql.= " WHERE clos = 0";
 $sql.= " AND courant = 1";
 $sql.= " AND entity IN (".getEntity('bank_account').")";
-$var=True;
+
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -763,10 +757,8 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
-$var=true;
 
 // Force date validation
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="setforcedate" />';
@@ -785,7 +777,6 @@ $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 70b79acb931..53a2f8bf2da 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -139,8 +139,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values
 print load_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'title_setup');
 print '<br>';
 
-$var=true;
-
 if (empty($conf->use_javascript_ajax))
 {
 	setEventMessages(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), null, 'errors');
@@ -158,7 +156,6 @@ else
     {
         // Si condition non remplie, on ne propose pas l'option
         if (! $conditions[$const]) continue;
-
         
         print '<tr class="oddeven">';
         print '<td width="16">'.img_object("",$picto[$const]).'</td>';
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index bf588ca90ae..59ce46921a7 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -30,8 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
 if (!$user->admin)
 accessforbidden();
 
-$langs->load("admin");
-$langs->load("errors");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","errors"));
 
 $action = GETPOST('action','aZ09');
 
@@ -94,7 +94,6 @@ else
 }
 
 // Mode
-$var=true;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set">';
@@ -105,7 +104,6 @@ print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td
 print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
-
 print '<tr class="oddeven"><td width=\"50%\">'.$langs->trans("PathToGeoIPMaxmindCountryDataFile").'</td>';
 print '<td colspan="2">';
 
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 23cc0600705..ed687288a0a 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -108,10 +108,18 @@ if ($action == 'update')
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_VERMENU_BACK1', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_VERMENU_BACK1', $val,'chaine',0,'',$conf->entity);
 
+	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
+	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
+	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val,'chaine',0,'',$conf->entity);
+
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', $val,'chaine',0,'',$conf->entity);
 
+	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLE'),array()))));
+	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLE', $conf->entity);
+	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLE', $val,'chaine',0,'',$conf->entity);
+
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR1', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR1', $val,'chaine',0,'',$conf->entity);
@@ -126,17 +134,13 @@ if ($action == 'update')
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR2', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR2', $val,'chaine',0,'',$conf->entity);
 
-	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
-	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
-	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val,'chaine',0,'',$conf->entity);
-
-	if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity);    // If empty, we set to '0' ('000000' is for black)
-	else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
-
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', $val,'chaine',0,'',$conf->entity);
 
+	if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity);    // If empty, we set to '0' ('000000' is for black)
+	else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
+
 	dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",			$_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT",		$_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT",			$_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
@@ -543,6 +547,8 @@ else	// Show
 	print '<br>';
 
 	// Login page
+	print '<div class="div-table-responsive">';
+
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("LoginPage").'</td><td></td></tr>';
 
@@ -573,6 +579,7 @@ else	// Show
 	print '</td></tr>';
 
 	print '</table>'."\n";
+	print '</div>';
 
 	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 5655c0c2714..141273a8f8c 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -102,7 +102,6 @@ if (! function_exists("ldap_connect"))
 }
 
 
-$var=true;
 $form=new Form($db);
 
 
@@ -180,7 +179,6 @@ print '<td>'.$langs->trans("Example").'</td>';
 print "</tr>\n";
 
 // Type
-
 print '<tr class="oddeven"><td>'.$langs->trans("Type").'</td><td>';
 $arraylist=array();
 $arraylist['activedirectory']='Active Directory';
@@ -190,7 +188,6 @@ print $form->selectarray('type',$arraylist,$conf->global->LDAP_SERVER_TYPE);
 print '</td><td>&nbsp;</td></tr>';
 
 // Version
-
 print '<tr class="oddeven"><td>'.$langs->trans("Version").'</td><td>';
 $arraylist=array();
 $arraylist['3']='Version 3';
@@ -199,21 +196,18 @@ print $form->selectarray('LDAP_SERVER_PROTOCOLVERSION',$arraylist,$conf->global-
 print '</td><td>'.$langs->trans("LDAPServerProtocolVersion").'</td></tr>';
 
 // Serveur primaire
-
 print '<tr class="oddeven"><td>';
 print $langs->trans("LDAPPrimaryServer").'</td><td>';
 print '<input size="25" type="text" name="host" value="'.$conf->global->LDAP_SERVER_HOST.'">';
 print '</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
 
 // Serveur secondaire
-
 print '<tr class="oddeven"><td>';
 print $langs->trans("LDAPSecondaryServer").'</td><td>';
 print '<input size="25" type="text" name="slave" value="'.$conf->global->LDAP_SERVER_HOST_SLAVE.'">';
 print '</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
 
 // Port
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerPort").'</td><td>';
 if (! empty($conf->global->LDAP_SERVER_PORT))
 {
@@ -226,13 +220,11 @@ else
 print '</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
 
 // DNserver
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerDn").'</td><td>';
 print '<input size="25" type="text" name="dn" value="'.$conf->global->LDAP_SERVER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPServerDnExample").'</td></tr>';
 
 // Utiliser TLS
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerUseTLS").'</td><td>';
 $arraylist=array();
 $arraylist['0']=$langs->trans("No");
@@ -245,13 +237,11 @@ print '<td colspan="3">'.$langs->trans("ForANonAnonymousAccess").'</td>';
 print "</tr>\n";
 
 // DNAdmin
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPAdminDn").'</td><td>';
 print '<input size="25" type="text" name="admin" value="'.$conf->global->LDAP_ADMIN_DN.'">';
 print '</td><td>'.$langs->trans("LDAPAdminDnExample").'</td></tr>';
 
 // Pass
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPPassword").'</td><td>';
 if (! empty($conf->global->LDAP_ADMIN_PASS))
 {
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 07910185956..a16f147586a 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -32,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-$langs->load("admin");
-$langs->load("errors");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","errors"));
 
 if (!$user->admin)
   accessforbidden();
@@ -117,15 +117,12 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td colspan="4">'.$langs->trans("LDAPSynchronizeContacts").'</td>';
 print "</tr>\n";
 
-
 // DN Pour les contacts
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactDn").'</span></td><td>';
 print '<input size="48" type="text" name="contactdn" value="'.$conf->global->LDAP_CONTACT_DN.'">';
 print '</td><td>'.$langs->trans("LDAPContactDnExample").'</td>';
@@ -133,7 +130,6 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_CONTACT_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPContactObjectClassListExample").'</td>';
@@ -143,7 +139,6 @@ print '</tr>';
 print '</table>';
 print '<br>';
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
@@ -152,7 +147,6 @@ print '<td align="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
 
 // Common name
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_CONTACT_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
@@ -160,7 +154,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Name
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_CONTACT_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
@@ -168,7 +161,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Firstname
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
@@ -176,7 +168,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Company
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCompany").'</td><td>';
 print '<input size="25" type="text" name="fieldcompany" value="'.$conf->global->LDAP_CONTACT_FIELD_COMPANY.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCompanyExample").'</td>';
@@ -184,7 +175,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Mail
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_CONTACT_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
@@ -192,7 +182,6 @@ print '<td align="right"><input type="radio" name="key" value=">LDAP_CONTACT_FIE
 print '</tr>';
 
 // Phone pro
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_CONTACT_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
@@ -200,7 +189,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Phone home
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldHomePhone").'</td><td>';
 print '<input size="25" type="text" name="fieldhomephone" value="'.$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldHomePhoneExample").'</td>';
@@ -208,7 +196,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Mobile
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_CONTACT_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
@@ -216,7 +203,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Skype
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_CONTACT_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
@@ -224,7 +210,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Fax
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_CONTACT_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
@@ -232,7 +217,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Address
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
 print '<input size="25" type="text" name="fieldaddress" value="'.$conf->global->LDAP_CONTACT_FIELD_ADDRESS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldAddressExample").'</td>';
@@ -240,7 +224,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // ZIP
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
 print '<input size="25" type="text" name="fieldzip" value="'.$conf->global->LDAP_CONTACT_FIELD_ZIP.'">';
 print '</td><td>'.$langs->trans("LDAPFieldZipExample").'</td>';
@@ -248,7 +231,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // TOWN
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
 print '<input size="25" type="text" name="fieldtown" value="'.$conf->global->LDAP_CONTACT_FIELD_TOWN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTownExample").'</td>';
@@ -256,7 +238,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // COUNTRY
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
 print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_CONTACT_FIELD_COUNTRY.'">';
 print '</td><td>&nbsp;</td>';
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 5a4e36b7792..a1d69c7216b 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 
-$langs->load("admin");
-$langs->load("errors");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","errors"));
 
 if (!$user->admin)
   accessforbidden();
@@ -109,14 +109,12 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 $form=new Form($db);
 
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td colspan="4">'.$langs->trans("LDAPSynchronizeGroups").'</td>';
 print "</tr>\n";
 
 // DN pour les groupes
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupDn").'</span></td><td>';
 print '<input size="48" type="text" name="group" value="'.$conf->global->LDAP_GROUP_DN.'">';
 print '</td><td>'.$langs->trans("LDAPGroupDnExample").'</td>';
@@ -124,7 +122,6 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_GROUP_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPGroupObjectClassListExample").'</td>';
@@ -134,7 +131,6 @@ print '</tr>';
 print '</table>';
 print '<br>';
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
@@ -145,7 +141,6 @@ print "</tr>\n";
 // Filtre
 
 // Common name
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_GROUP_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCommonNameExample").'</td>';
@@ -162,7 +157,6 @@ print '</tr>';
 */
 
 // Description
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_GROUP_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
@@ -170,7 +164,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_GROUP_FIELD_
 print '</tr>';
 
 // User group
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldGroupMembers").'</td><td>';
 print '<input size="25" type="text" name="fieldgroupmembers" value="'.$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldGroupMembersExample").'</td>';
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index a6385c9690c..d363d8811e4 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -133,17 +133,13 @@ dol_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1);
 print $langs->trans("LDAPDescMembers").'<br>';
 print '<br>';
 
-
 print '<table class="noborder" width="100%">';
-$var=true;
-
 
 print '<tr class="liste_titre">';
 print '<td colspan="4">'.$langs->trans("LDAPSynchronizeMembers").'</td>';
 print "</tr>\n";
 
 // DN Pour les adherents
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberDn").'</span></td><td>';
 print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_MEMBER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPMemberDnExample").'</td>';
@@ -151,7 +147,6 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_MEMBER_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPMemberObjectClassListExample").'</td>';
@@ -159,7 +154,6 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // Filter, used to filter search
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_MEMBER_FILTER.'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
@@ -169,7 +163,6 @@ print '</tr>';
 print '</table>';
 print '<br>';
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
@@ -180,7 +173,6 @@ print "</tr>\n";
 // Filtre
 
 // Common name
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_MEMBER_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
@@ -188,7 +180,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Name
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_MEMBER_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
@@ -196,7 +187,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Firstname
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
@@ -204,7 +194,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Login unix
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
 print '<input size="25" type="text" name="fieldlogin" value="'.$conf->global->LDAP_MEMBER_FIELD_LOGIN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginExample").'</td>';
@@ -212,7 +201,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Login samba
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
 print '<input size="25" type="text" name="fieldloginsamba" value="'.$conf->global->LDAP_MEMBER_FIELD_LOGIN_SAMBA.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginSambaExample").'</td>';
@@ -220,7 +208,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Password not crypted
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpassword" value="'.$conf->global->LDAP_MEMBER_FIELD_PASSWORD.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
@@ -228,7 +215,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Password crypted
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpasswordcrypted" value="'.$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
@@ -236,7 +222,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Mail
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_MEMBER_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
@@ -244,7 +229,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Phone pro
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_MEMBER_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
@@ -260,7 +244,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Mobile
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_MEMBER_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
@@ -268,7 +251,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Skype
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_MEMBER_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
@@ -276,7 +258,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Fax
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_MEMBER_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
@@ -284,7 +265,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Company
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCompany").'</td><td>';
 print '<input size="25" type="text" name="fieldcompany" value="'.$conf->global->LDAP_MEMBER_FIELD_COMPANY.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCompanyExample").'</td>';
@@ -292,7 +272,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Address
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
 print '<input size="25" type="text" name="fieldaddress" value="'.$conf->global->LDAP_MEMBER_FIELD_ADDRESS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldAddressExample").'</td>';
@@ -300,7 +279,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // ZIP
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
 print '<input size="25" type="text" name="fieldzip" value="'.$conf->global->LDAP_MEMBER_FIELD_ZIP.'">';
 print '</td><td>'.$langs->trans("LDAPFieldZipExample").'</td>';
@@ -308,7 +286,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // TOWN
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
 print '<input size="25" type="text" name="fieldtown" value="'.$conf->global->LDAP_MEMBER_FIELD_TOWN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTownExample").'</td>';
@@ -316,7 +293,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // COUNTRY
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
 print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_MEMBER_FIELD_COUNTRY.'">';
 print '</td><td>&nbsp;</td>';
@@ -324,7 +300,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Description
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
@@ -332,7 +307,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Public Note
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldNotePublic").'</td><td>';
 print '<input size="25" type="text" name="fieldnotepublic" value="'.$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNotePublicExample").'</td>';
@@ -348,7 +322,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Status
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldStatus").'</td><td>';
 print '<input size="25" type="text" name="fieldstatus" value="'.$conf->global->LDAP_FIELD_MEMBER_STATUS.'">';
 print '</td><td>&nbsp;</td>';
@@ -364,7 +337,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // First subscription amount
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstSubscriptionAmount").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstsubscriptionamount" value="'.$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT.'">';
 print '</td><td>&nbsp;</td>';
@@ -372,7 +344,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Last subscription date
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLastSubscriptionDate").'</td><td>';
 print '<input size="25" type="text" name="fieldlastsubscriptiondate" value="'.$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE.'">';
 print '</td><td>&nbsp;</td>';
@@ -380,7 +351,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Last subscription amount
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLastSubscriptionAmount").'</td><td>';
 print '<input size="25" type="text" name="fieldlastsubscriptionamount" value="'.$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT.'">';
 print '</td><td>&nbsp;</td>';
@@ -388,7 +358,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // End last subscriptions
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldEndLastSubscription").'</td><td>';
 print '<input size="25" type="text" name="fieldendlastsubscription" value="'.$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION.'">';
 print '</td><td>&nbsp;</td>';
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 2c08ec9fae8..b5f278a8968 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -108,14 +108,12 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 $form=new Form($db);
 
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td colspan="4">'.$langs->trans("LDAPSynchronizeMembersTypes").'</td>';
 print "</tr>\n";
 
 // DN pour les types de membres
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberTypeDn").'</span></td><td>';
 print '<input size="48" type="text" name="membertype" value="'.$conf->global->LDAP_MEMBER_TYPE_DN.'">';
 print '</td><td>'.$langs->trans("LDAPMemberTypepDnExample").'</td>';
@@ -123,7 +121,6 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberTypeObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_MEMBER_TYPE_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPMemberTypeObjectClassListExample").'</td>';
@@ -133,7 +130,6 @@ print '</tr>';
 print '</table>';
 print '<br>';
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
@@ -144,7 +140,6 @@ print "</tr>\n";
 // Filtre
 
 // Common name
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCommonNameExample").'</td>';
@@ -152,7 +147,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_TYPE_
 print '</tr>';
 
 // Description
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
@@ -160,7 +154,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_TYPE_
 print '</tr>';
 
 // User group
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldGroupMembers").'</td><td>';
 print '<input size="25" type="text" name="fieldmembertypemembers" value="'.$conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldGroupMembersExample").'</td>';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index a2e40abfed2..1181d2860fb 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -124,17 +124,13 @@ print $langs->trans("LDAPDescUsers").'<br>';
 print '<br>';
 
 
-
-
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td colspan="4">'.$langs->trans("LDAPSynchronizeUsers").'</td>';
 print "</tr>\n";
 
 // DN Pour les utilisateurs
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserDn").'</span></td><td>';
 print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_USER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPUserDnExample").'</td>';
@@ -142,7 +138,6 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-
 print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_USER_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPUserObjectClassListExample").'</td>';
@@ -150,7 +145,6 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // Filter, used to filter search
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_FILTER_CONNECTION.'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
@@ -160,7 +154,6 @@ print '</tr>';
 print '</table>';
 print '<br>';
 print '<table class="noborder" width="100%">';
-$var=true;
 
 print '<tr class="liste_titre">';
 print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
@@ -169,7 +162,6 @@ print '<td align="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
 
 // Common name
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
@@ -177,7 +169,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FULLNA
 print '</tr>';
 
 // Name
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
@@ -185,7 +176,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_NAME"'
 print '</tr>';
 
 // Firstname
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
@@ -193,7 +183,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FIRSTN
 print '</tr>';
 
 // Login unix
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
 print '<input size="25" type="text" name="fieldlogin" value="'.$conf->global->LDAP_FIELD_LOGIN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginExample").'</td>';
@@ -201,7 +190,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN"
 print '</tr>';
 
 // Login samba
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
 print '<input size="25" type="text" name="fieldloginsamba" value="'.$conf->global->LDAP_FIELD_LOGIN_SAMBA.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginSambaExample").'</td>';
@@ -209,7 +197,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN_
 print '</tr>';
 
 // Password not crypted
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpassword" value="'.$conf->global->LDAP_FIELD_PASSWORD.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
@@ -217,7 +204,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Password crypted
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpasswordcrypted" value="'.$conf->global->LDAP_FIELD_PASSWORD_CRYPTED.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
@@ -225,7 +211,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Mail
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
@@ -233,7 +218,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_MAIL"'
 print '</tr>';
 
 // Phone
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
@@ -241,7 +225,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_PHONE"
 print '</tr>';
 
 // Mobile
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
@@ -249,7 +232,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_MOBILE
 print '</tr>';
 
 // Skype
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
@@ -257,7 +239,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_SKYPE"
 print '</tr>';
 
 // Fax
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
@@ -265,7 +246,6 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FAX"'.
 print '</tr>';
 
 // Company
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCompany").'</td><td>';
 print '<input size="25" type="text" name="fieldcompany" value="'.$conf->global->LDAP_FIELD_COMPANY.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCompanyExample").'</td>';
@@ -273,7 +253,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Address
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
 print '<input size="25" type="text" name="fieldaddress" value="'.$conf->global->LDAP_FIELD_ADDRESS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldAddressExample").'</td>';
@@ -281,7 +260,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // ZIP
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
 print '<input size="25" type="text" name="fieldzip" value="'.$conf->global->LDAP_FIELD_ZIP.'">';
 print '</td><td>'.$langs->trans("LDAPFieldZipExample").'</td>';
@@ -289,7 +267,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // TOWN
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
 print '<input size="25" type="text" name="fieldtown" value="'.$conf->global->LDAP_FIELD_TOWN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTownExample").'</td>';
@@ -297,7 +274,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // COUNTRY
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
 print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_FIELD_COUNTRY.'">';
 print '</td><td>&nbsp;</td>';
@@ -305,7 +281,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Title
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTitle").'</td><td>';
 print '<input size="25" type="text" name="fieldtitle" value="'.$conf->global->LDAP_FIELD_TITLE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTitleExample").'</td>';
@@ -313,7 +288,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Note
-
 print '<tr class="oddeven"><td>'.$langs->trans("Note").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
@@ -321,7 +295,6 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Sid
-
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSid").'</td><td>';
 print '<input size="25" type="text" name="fieldsid" value="'.$conf->global->LDAP_FIELD_SID.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSidExample").'</td>';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 4c18069b415..0af26a0a2b7 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -6,8 +6,8 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2014 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2015			 Claudio Aschieri			<c.aschieri@19.coop>
+ * Copyright (C) 2011-2018 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015	   Claudio Aschieri		<c.aschieri@19.coop>
  *
  * 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
@@ -34,10 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
 
-$langs->load("admin");
-$langs->load("sendings");
-$langs->load("deliveries");
-$langs->load('other');
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
 
 if (!$user->admin) accessforbidden();
 
@@ -216,7 +214,6 @@ foreach ($dirmodels as $reldir)
         $handle = opendir($dir);
         if (is_resource($handle))
         {
-            $var=true;
             while (($file = readdir($handle))!==false)
             {
                 if (substr($file, 0, 14) == 'mod_livraison_' && substr($file, dol_strlen($file)-3, 3) == 'php')
@@ -337,7 +334,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
     $dir = dol_buildpath($reldir."core/modules/livraison/doc/");
@@ -452,7 +448,6 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
-$var=true;
 
 $substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
@@ -460,7 +455,6 @@ $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 7abb16a0729..3aa3b3364c0 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -27,8 +27,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-$langs->load("admin");
-$langs->load("mails");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin", "mails"));
 
 if (!$user->admin) accessforbidden();
 
@@ -105,29 +105,24 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-$var=true;
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-
 print '<tr class="oddeven"><td>';
 print $langs->trans("MailingEMailFrom").'</td><td>';
 print '<input size="32" type="text" name="MAILING_EMAIL_FROM" value="'.$conf->global->MAILING_EMAIL_FROM.'">';
 if (!empty($conf->global->MAILING_EMAIL_FROM) && ! isValidEmail($conf->global->MAILING_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail"));
 print '</td></tr>';
 
-
 print '<tr class="oddeven"><td>';
 print $langs->trans("MailingEMailError").'</td><td>';
 print '<input size="32" type="text" name="MAILING_EMAIL_ERRORSTO" value="'.$conf->global->MAILING_EMAIL_ERRORSTO.'">';
 if (!empty($conf->global->MAILING_EMAIL_ERRORSTO) && ! isValidEmail($conf->global->MAILING_EMAIL_ERRORSTO)) print ' '.img_warning($langs->trans("BadEMail"));
 print '</td></tr>';
 
-
 print '<tr class="oddeven"><td>';
 print $langs->trans("MailingDelay").'</td><td>';
 print '<input size="32" type="text" name="MAILING_DELAY" value="'.$conf->global->MAILING_DELAY.'">';
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 89416a72e36..bb53349d1b7 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -32,9 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-$langs->load("admin");
-$langs->load("members");
-$langs->load("mailmanspip");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin", "members", "mailmanspip"));
 
 if (! $user->admin) accessforbidden();
 
@@ -49,7 +48,7 @@ $testunsubscribeemail = GETPOST("testunsubscribeemail");
  * Actions
  */
 
-// Action mise a jour ou ajout d'une constante
+// Action updated or added a constant
 if ($action == 'update' || $action == 'add')
 {
 	foreach($_POST['constname'] as $key => $val)
@@ -156,9 +155,6 @@ print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup'
 
 $head = mailmanspip_admin_prepare_head();
 
-
-$var=true;
-
 if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 {
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 28d243a3b13..f4c5a2531ff 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -27,12 +27,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-$langs->load("companies");
-$langs->load("products");
-$langs->load("admin");
-$langs->load("mails");
-$langs->load("other");
-$langs->load("errors");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("companies", "products", "admin", "mails", "other", "errors"));
 
 $action=GETPOST('action','alpha');
 
@@ -71,6 +67,7 @@ if ($action == 'update' && empty($_POST["cancel"]))
 {
 	dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS",     GETPOST("MAIN_DISABLE_ALL_MAILS"),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO",     GETPOST("MAIN_MAIL_FORCE_SENDTO"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT",     GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT"),'chaine',0,'',$conf->entity);
 	// Send mode parameters
 	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE",         GETPOST("MAIN_MAIL_SENDMODE"),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT",        GETPOST("MAIN_MAIL_SMTP_PORT"),'chaine',0,'',$conf->entity);
@@ -259,13 +256,11 @@ if ($action == 'edit')
 
 
 	clearstatcache();
-	$var=true;
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
 	print '</td></tr>';
@@ -275,12 +270,16 @@ if ($action == 'edit')
 	print '<input class="flat" name="MAIN_MAIL_FORCE_SENDTO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_FORCE_SENDTO)?$conf->global->MAIN_MAIL_FORCE_SENDTO:'') . '" />';
 	print '</td></tr>';
 
-	// Separator
 
+	//Add user to select destinaries list
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>';
+	print $form->selectyesno('MAIN_MAIL_ENABLED_USER_DEST_SELECT',$conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT,1);
+	print '</td></tr>';
+
+	// Separator
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 
 	// SuperAdministrator access only
@@ -331,7 +330,6 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Port
-
 	print '<tr class="oddeven"><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
@@ -404,7 +402,6 @@ if ($action == 'edit')
 	}
 
     // TLS
-
     print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
@@ -462,7 +459,6 @@ if ($action == 'edit')
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// From
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . (! empty($conf->global->MAIN_MAIL_EMAIL_FROM)?$conf->global->MAIN_MAIL_EMAIL_FROM:'');
 	print '"></td></tr>';
@@ -490,22 +486,19 @@ if ($action == 'edit')
 	}
 	else dol_print_error($db);*/
 
-	print '<tr '.$bc[$var?1:0].'><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td><td>';
 	print $form->selectarray('MAIN_MAIL_DEFAULT_FROMTYPE', $liste, $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE, 0);
 	print '</td></tr>';
 
 	// Separator
-
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// From
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_ERRORS_TO)?$conf->global->MAIN_MAIL_ERRORS_TO:'');
 	print '"></td></tr>';
 
 	// Autocopy to
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)?$conf->global->MAIN_MAIL_AUTOCOPY_TO:'');
 	print '"></td></tr>';
@@ -528,15 +521,11 @@ else
 
 	print $langs->trans("EMailsDesc")."<br>\n";
 	print "<br>\n";
-
-
-	$var=true;
-
+	
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
 
 	// Force e-mail recipient
@@ -544,12 +533,13 @@ else
 	if (! empty($conf->global->MAIN_MAIL_FORCE_SENDTO) && ! isValidEmail($conf->global->MAIN_MAIL_FORCE_SENDTO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
-	// Separator
+	//Add user to select destinaries list
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>'.yn($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT).'</td></tr>';
 
+	// Separator
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 	if (empty($text)) $text=$langs->trans("Undefined").img_warning();
@@ -557,7 +547,6 @@ else
 	print '</td></tr>';
 
 	// Host server
-
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
@@ -568,7 +557,6 @@ else
 	}
 
 	// Port
-
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
@@ -579,21 +567,18 @@ else
 	}
 
 	// SMTPS ID
-
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
 	}
 
 	// SMTPS PW
-
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
 	}
 
 	// TLS
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
@@ -607,7 +592,6 @@ else
 	print '</td></tr>';
 
 	// STARTTLS
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
@@ -624,7 +608,6 @@ else
 	if ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
 	{
 		// DKIM
-
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_ENABLED").'</td><td>';
 		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer')))
 		{
@@ -654,11 +637,9 @@ else
 	}
 
     // Separator
-
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// From
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
 	if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
@@ -713,18 +694,15 @@ else
 	print '</td></tr>';
 
 	// Separator
-
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Errors To
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
 	if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
 	// Autocopy to
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td>';
 	if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 1202e9817d3..1cb92ae8377 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -228,7 +228,6 @@ if ($action == 'edit')
 
 
 	clearstatcache();
-	$var=true;
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
@@ -341,7 +340,6 @@ if ($action == 'edit')
 	// PW
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))))
 	{
-
 		$mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING)?$conf->global->MAIN_MAIL_SMTPS_PW_EMAILING:'');
 		print '<tr class="drag drop oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
 		// SuperAdministrator access only
@@ -405,14 +403,10 @@ else
     print $langs->trans("EMailsDesc")."<br>\n";
     print "<br>\n";
 
-
-	$var=true;
-
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Method
-
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE_EMAILING];
 	if (empty($text)) $text=$langs->trans("Undefined").img_warning();
@@ -422,7 +416,6 @@ else
 	if (! empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
 	{
 		// Host server
-
 		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail'))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
@@ -433,7 +426,6 @@ else
 		}
 
 		// Port
-
 		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail'))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
@@ -444,21 +436,18 @@ else
 		}
 
 		// SMTPS ID
-
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID_EMAILING.'</td></tr>';
 		}
 
 		// SMTPS PW
-
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW_EMAILING).'</td></tr>';
 		}
 
 		// TLS
-
 		print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))
 		{
@@ -472,7 +461,6 @@ else
 		print '</td></tr>';
 
 		// STARTTLS
-
 		print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))
 		{
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 69d1d8a8cea..5f0288525a0 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018	   Ferran Marcet 		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,21 +22,6 @@
  *		\brief      Page to adminsiter email sender profiles
  */
 
-//if (! defined('NOREQUIREUSER'))          define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))            define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))           define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))          define('NOREQUIRETRAN','1');
-//if (! defined('NOSCANGETFORINJECTION'))  define('NOSCANGETFORINJECTION','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');		// Do not check anti CSRF attack test
-//if (! defined('NOCSRFCHECK'))            define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test done when option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
-//if (! defined('NOSTYLECHECK'))           define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL'))         define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))          define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))          define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))          define('NOREQUIREAJAX','1');         // Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-
 require '../main.inc.php';
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -244,6 +230,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -387,7 +378,7 @@ foreach($object->fields as $key => $val)
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 89f3700c4f7..60db9fae8c4 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2017  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2018  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
  * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
@@ -169,9 +169,6 @@ if ($conf->adherent->enabled)          $elementList['member']=$langs->trans('Mai
 if ($conf->contrat->enabled)           $elementList['contract']=$langs->trans('MailToSendContract');
 if ($conf->projet->enabled)            $elementList['project']=$langs->trans('MailToProject');
 $elementList['user']=$langs->trans('MailToUser');
-$elementList['all'] =$langs->trans('VisibleEverywhere');
-$elementList['none']=$langs->trans('VisibleNowhere');
-
 
 $parameters=array('elementList'=>$elementList);
 $reshook=$hookmanager->executeHooks('emailElementlist',$parameters);    // Note that $action and $object may have been modified by some hooks
@@ -181,6 +178,12 @@ if ($reshook == 0) {
 	}
 }
 
+// Add all and none after the sort
+$elementList['all'] ='-- '.$langs->trans("All").' -- ('.$langs->trans('VisibleEverywhere').')';
+$elementList['none']='-- '.$langs->trans("None").' -- ('.$langs->trans('VisibleNowhere').')';
+
+asort($elementList);
+
 $id = 25;
 
 
@@ -210,7 +213,7 @@ if (empty($reshook))
     }
 
     // Actions add or modify an entry into a dictionary
-    if (GETPOST('actionadd') || GETPOST('actionmodify'))
+    if (GETPOST('actionadd','alpha') || GETPOST('actionmodify','alpha'))
     {
         $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
         $listfieldinsert=explode(',',$tabfieldinsert[$id]);
@@ -226,7 +229,7 @@ if (empty($reshook))
             if ($value == 'content') continue;
             if ($value == 'content_lines') continue;
 
-            if (GETPOST('actionmodify') && $value == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
+            if (GETPOST('actionmodify','alpha') && $value == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
 
             if ((! isset($_POST[$value]) || $_POST[$value]=='' || $_POST[$value]=='-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
             {
@@ -268,8 +271,8 @@ if (empty($reshook))
                 if ($value == 'fk_user' && ! ($_POST[$keycode] > 0)) $_POST[$keycode]='';
                 if ($value == 'private' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='0';
                 if ($value == 'position' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='1';
-                if ($_POST[$keycode] == '' && $keycode != 'langcode') $sql.="null";		// lang must be '' if not defined so the unique key that include lang will work
-                elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') $sql.="null";
+                if ($_POST[$keycode] == '' && $keycode != 'langcode')      $sql.="null";	// lang must be '' if not defined so the unique key that include lang will work
+                elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') $sql.="''";		// lang must be '' if not defined so the unique key that include lang will work
                 else $sql.="'".$db->escape($_POST[$keycode])."'";
                 $i++;
             }
@@ -315,12 +318,16 @@ if (empty($reshook))
                 if ($field == 'entity') $_POST[$keycode] = $conf->entity;
                 if ($i) $sql.=",";
                 $sql.= $field."=";
-                if ($_POST[$keycode] == '' || ($keycode == 'langcode' && empty($_POST[$keycode]))) $sql.="null";  // For vat, we want/accept code = ''
+
+//                print $keycode.' - '.$_POST[$keycode].'<br>';
+                if ($_POST[$keycode] == '' || ($keycode != 'langcode' && $keycode != 'private' && empty($_POST[$keycode]))) $sql.="null";  // lang must be '' if not defined so the unique key that include lang will work
+                elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') $sql.="''";													   // lang must be '' if not defined so the unique key that include lang will work
+                elseif ($keycode == 'private') $sql.=((int) $_POST[$keycode]);													  		   // private must be 0 or 1
                 else $sql.="'".$db->escape($_POST[$keycode])."'";
                 $i++;
             }
             $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
-
+//print $sql;exit;
             dol_syslog("actionmodify", LOG_DEBUG);
             //print $sql;
             $resql = $db->query($sql);
@@ -430,24 +437,9 @@ if ($search_type_template != '' && $search_type_template != '-1') $sql.=natural_
 if ($search_lang) $sql.=natural_search('lang', $search_lang);
 if ($search_fk_user != '' && $search_fk_user != '-1') $sql.=natural_search('fk_user', $search_fk_user, 2);
 if ($search_topic) $sql.=natural_search('topic', $search_topic);
-if ($sortfield)
-{
-    // If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') $sortfield='country_code';
-    $sql.= " ORDER BY ".$sortfield;
-    if ($sortorder)
-    {
-        $sql.=" ".strtoupper($sortorder);
-    }
-    $sql.=", ";
-    // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
-    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
-}
-else {
-    $sql.=" ORDER BY ";
-}
-$sql.=$tabsqlsort[$id];
+// If sort order is "country", we use country_code instead
+if ($sortfield == 'country') $sortfield='country_code';
+$sql.=$db->order($sortfield,$sortorder);
 $sql.=$db->plimit($listlimit+1,$offset);
 //print $sql;
 
@@ -455,7 +447,6 @@ $fieldlist=explode(',',$tabfield[$id]);
 
 // Form to add a new line
 $alabelisused=0;
-$var=false;
 
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -599,9 +590,7 @@ $colspan=count($fieldlist)+1;
 
 print '</table>';
 print '</div>';
-
 print '</form>';
-
 print '<br>';
 
 
@@ -619,7 +608,6 @@ if ($resql)
 {
     $num = $db->num_rows($resql);
     $i = 0;
-    $var=true;
 
     $param = '&id='.$id;
     $paramwithsearch = $param;
@@ -726,10 +714,10 @@ if ($resql)
         {
             $obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-
             if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
             {
+            	print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+
             	$tmpaction='edit';
                 $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                 $reshook=$hookmanager->executeHooks('editEmailTemplateFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
@@ -787,10 +775,23 @@ if ($resql)
                         print '<td></td>';
                     }
                 }
+
+                print "</tr>\n";
             }
             else
             {
-              	$tmpaction = 'view';
+            	$keyforobj='type_template';
+            	if (! in_array($obj->$keyforobj, array_keys($elementList)))
+            	{
+            		$i++;
+            		continue;		// It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
+            	}
+				// TODO Test on 'enabled'
+
+
+            	print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+
+            	$tmpaction = 'view';
                 $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                 $reshook=$hookmanager->executeHooks('viewEmailTemplateFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
 
@@ -876,7 +877,6 @@ if ($resql)
                 }
                 print '</td>';
 
-
                 /*
                 $fieldsforcontent = array('content');
                 if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
@@ -904,8 +904,9 @@ if ($resql)
 
                     }
                 }*/
+
+                print "</tr>\n";
             }
-            print "</tr>\n";
 
 
             $i++;
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 5e0b6fac6f6..a5f2fb2a2ff 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -30,11 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 $action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel','alpha');
 
-$langs->load("companies");
-$langs->load("products");
-$langs->load("admin");
-$langs->load("users");
-$langs->load("other");
+$langs->loadLangs(array("companies","products","admin","users","other"));
 
 // Security check
 if (! $user->admin) accessforbidden();
@@ -167,8 +163,6 @@ if ($action == 'edit')
 	clearstatcache();
 
 	// Gestionnaires de menu
-	$var=true;
-
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
 	print '<td>';
@@ -180,7 +174,6 @@ if ($action == 'edit')
 	print '</tr>';
 
 	// Menu top
-
 	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
 	print '<td>';
 	$formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled');
@@ -191,7 +184,6 @@ if ($action == 'edit')
 	print '</tr>';
 
 	// Menu smartphone
-
 	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
 	print '<td>';
 	$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled');
@@ -206,8 +198,6 @@ if ($action == 'edit')
 else
 {
 	// Gestionnaires de menu
-	$var=true;
-
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
 	print '<td>';
@@ -271,7 +261,6 @@ if ($action == 'edit')
 print '</form>';
 
 
-
 if ($action != 'edit')
 {
 	print '<div class="tabsAction">';
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index dd90774a05b..8d44421186d 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -17,21 +17,11 @@
  */
 
 /**
- *  \file       htdocs/admin/modules.php
+ *  \file       htdocs/admin/modulehelp.php
  *  \brief      Page to activate/disable all modules
  */
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 25feceda0d1..467ffffeb41 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -48,10 +48,11 @@ $action = GETPOST('action', 'alpha');
  */
 
 
-if (preg_match('/set_(.*)/',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
 	$code=$reg[1];
-	if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
+	$value=(GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
+	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -62,7 +63,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
 	}
 }
 
-if (preg_match('/del_(.*)/',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
 	$code=$reg[1];
 	if (dolibarr_del_const($db, $code, 0) > 0)
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 5f57ac99efc..f71bc87fc2d 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -128,8 +128,6 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-$var=true;
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -168,7 +166,6 @@ $listofnotifiedevents=$notificationtrigger->getListOfManagedEvents();
 print '<tr class="oddeven">';
 print '<td>';
 
-$var=true;
 $i=0;
 foreach($listofnotifiedevents as $notifiedevent)
 {
@@ -212,7 +209,6 @@ print "</tr>\n";
 $notificationtrigger=new InterfaceNotification($db);
 $listofnotifiedevents=$notificationtrigger->getListOfManagedEvents();
 
-$var=true;
 foreach($listofnotifiedevents as $notifiedevent)
 {
 
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 339b4fef566..4fe15379629 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -26,10 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
-$langs->load("admin");
-$langs->load("errors");
-$langs->load('other');
-$langs->load('bills');
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin", "other", "errors", "bills"));
 
 if (! $user->admin) accessforbidden();
 
@@ -131,8 +129,6 @@ foreach ($dirmodels as $reldir)
         $handle = opendir($dir);
         if (is_resource($handle))
         {
-            $var=true;
-
             while (($file = readdir($handle))!==false)
             {
                 if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
@@ -249,7 +245,6 @@ print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
 // Allow payments on different thirdparties bills but same parent company
-$var=! $var;
 print '<tr class="oddeven"><td>';
 print $langs->trans("PaymentOnDifferentThirdBills");
 print '</td><td width="60" align="center">';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 2f1ae179948..e0c2d776d7a 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -133,7 +133,7 @@ if ($action == 'edit')	// Edit
 
 
     // Misc options
-    print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
+    print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','');
 
 	print '<div class="div-table-responsive-no-min">';
     print '<table summary="more" class="noborder" width="100%">';
@@ -168,7 +168,7 @@ if ($action == 'edit')	// Edit
 
 
     // Addresses
-    print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'<br>';
+    print load_fiche_titre($langs->trans("PDFAddressForging"),'','');
 
 	print '<div class="div-table-responsive-no-min">';
     print '<table summary="more" class="noborder" width="100%">';
@@ -255,14 +255,15 @@ if ($action == 'edit')	// Edit
 	print '</table>';
 	print '</div>';
 
+
     print '<br>';
 
+
     // Localtaxes
+    $locales ='';
+    $text='';
     if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
     {
-        $locales ='';
-        $text='';
-
         if ($mysoc->useLocalTax(1))
         {
             $locales = $langs->transcountry("LT1",$mysoc->country_code);
@@ -279,31 +280,39 @@ if ($action == 'edit')	// Edit
             $text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_THIRD_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX : 0, 1);
             $text.= '</td></tr>';
         }
-
-        print load_fiche_titre($langs->trans("PDFLocaltax",$locales),'','');
-
-        print '<table summary="more" class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-        print $text;
-
-        print '</table>';
-        print '<br>';
-
     }
 
+    $title = $langs->trans("PDFRulesForSalesTax");
+    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
+    {
+   		$title.=' - '.$langs->trans("PDFLocaltax",$locales);
+    }
+
+    print load_fiche_titre($title,'','');
+
+    print '<table summary="more" class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+    // Hide any information on Sale tax / VAT
+
+    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
+    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1);
+    print '</td></tr>';
+
+    // Locataxes
+    print $text;
+
+    print '</table>';
+    print '<br>';
+
+
     // Other
-    print load_fiche_titre($langs->trans("Other"),'','').'<br>';
+    print load_fiche_titre($langs->trans("Other"),'','');
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table summary="more" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
-    // Hide any PDF informations
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
-	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1);
-    print '</td></tr>';
-
     //Desc
 
     print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
@@ -491,11 +500,10 @@ else	// Show
     print '<br>';
 
     // Localtaxes
+    $locales ='';
+    $text='';
     if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
     {
-        $locales ='';
-        $text='';
-
         if ($mysoc->useLocalTax(1))
         {
             $locales = $langs->transcountry("LT1",$mysoc->country_code);
@@ -513,16 +521,27 @@ else	// Show
             $text.= '</td></tr>';
         }
 
-        print load_fiche_titre($langs->trans("PDFLocaltax",$locales),'','');
-
-        print '<table summary="more" class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-        print $text;
-        print '</table>';
-        print '<br>';
-
     }
 
+    // Sales TAX / VAT information
+    $title=$langs->trans("PDFRulesForSalesTax",$locales);
+    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) $title.=' - '.$langs->trans("PDFLocaltax",$locales);
+
+    print load_fiche_titre($title,'','');
+
+    print '<table summary="more" class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
+    print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1);
+    print '</td></tr>';
+
+    print $text;
+
+    print '</table>';
+    print '<br>';
+
+
     // Other
     print load_fiche_titre($langs->trans("Other"),'','');
 
@@ -558,12 +577,6 @@ else	// Show
 	print "</td>";
 	print '</tr>';
 
-    // Hide any PDF informations
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
-    print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1);
-    print '</td></tr>';
-
 	//Desc
 
 	print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td colspan="2">';
@@ -601,7 +614,7 @@ else	// Show
 	 */
 
 	print '<br>';
-	print load_fiche_titre($langs->trans("Library"));
+	print load_fiche_titre($langs->trans("Library"), '', '');
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">'."\n";
@@ -644,7 +657,6 @@ else	// Show
 		print ' ('.@constant('TCPDI_PATH').')';
 		$i++;
 	}
-	print '<!-- $conf->global->MAIN_USE_FPDF = '.$conf->global->MAIN_USE_FPDF.' -->';
 	print '</td>'."\n";
 	print '</tr>'."\n";
 
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 602b80c3855..203b4ed9bc5 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.p
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$langs->load("admin");
-$langs->load("withdrawals");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","withdrawals"));
 
 // Security check
 if (!$user->admin) accessforbidden();
@@ -274,7 +274,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
@@ -417,7 +416,6 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
     if ($resql)
     {
         $num = $db->num_rows($resql);
-        $var = true;
         $i = 0;
         while ($i < $num)
         {
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index c533ea94795..7ee44a93b52 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -33,10 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-$langs->load("admin");
-$langs->load("errors");
-$langs->load('other');
-$langs->load('propal');
+
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin", "other", "errors", "propal"));
 
 if (! $user->admin) accessforbidden();
 
@@ -266,8 +265,6 @@ foreach ($dirmodels as $reldir)
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
-
 			while (($file = readdir($handle))!==false)
 			{
 				if (substr($file, 0, 12) == 'mod_propale_' && substr($file, dol_strlen($file)-3, 3) == 'php')
@@ -386,7 +383,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
@@ -531,7 +527,6 @@ print '</tr>';
 print '</form>';
 
 /*
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setusecustomercontactasrecipient">';
@@ -631,7 +626,7 @@ print "<tr class=\"liste_titre\">\n";
 print "  <td>".$langs->trans("Name")."</td>\n";
 print "  <td>".$langs->trans("Value")."</td>\n";
 print "</tr>\n";
-print "<tr ".$bc[false].">\n  <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n  <td>".$conf->propal->multidir_output[$conf->entity]."</td>\n</tr>\n";
+print "<tr class=\"oddeven\">\n  <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n  <td>".$conf->propal->multidir_output[$conf->entity]."</td>\n</tr>\n";
 print "</table>\n<br>";
 
 
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index ee22f377200..a9028635991 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -26,10 +26,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
-$langs->load("users");
-$langs->load("admin");
-$langs->load("other");
-
+// Load traductions files requiredby by page
+$langs->loadLangs(array("other", "users", "admin"));
 
 if (!$user->admin) accessforbidden();
 
@@ -124,7 +122,6 @@ if ($conf->use_javascript_ajax)
 
 
 // Timeout
-$var=true;
 
 print '<table width="100%" class="noborder">';
 
@@ -163,7 +160,7 @@ print '</td>';
 print '</tr>';
 
 
-print '<tr '.$bcdd[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_HOST").'</td><td align="right">';
 print '</td>';
 print '<td class="nowrap">';
@@ -172,7 +169,7 @@ print '</td>';
 print '</tr>';
 
 
-print '<tr '.$bcdd[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_PORT").'</td><td align="right">';
 print '</td>';
 print '<td class="nowrap">';
@@ -181,7 +178,7 @@ print '</td>';
 print '</tr>';
 
 
-print '<tr '.$bcdd[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_USER").'</td><td align="right">';
 print '</td>';
 print '<td class="nowrap">';
@@ -190,7 +187,7 @@ print '</td>';
 print '</tr>';
 
 
-print '<tr '.$bcdd[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_PASS").'</td><td align="right">';
 print '</td>';
 print '<td class="nowrap">';
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 9627164f534..38cd2d12c1b 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -127,7 +127,7 @@ if ($action == 'activate_encryptdbpassconf')
 	if ($result > 0)
 	{
 	    sleep(3);  // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
-	    
+
 	    // database value not required
 		//dolibarr_set_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED", "1");
 		header("Location: security.php");
@@ -135,7 +135,7 @@ if ($action == 'activate_encryptdbpassconf')
 	}
 	else
 	{
-		setEventMessages($langs->trans('InstrucToEncodePass',dol_encode($dolibarr_main_db_pass)), null, 'warnings');	
+		setEventMessages($langs->trans('InstrucToEncodePass',dol_encode($dolibarr_main_db_pass)), null, 'warnings');
 	}
 }
 else if ($action == 'disable_encryptdbpassconf')
@@ -144,7 +144,7 @@ else if ($action == 'disable_encryptdbpassconf')
 	if ($result > 0)
 	{
 	    sleep(3);  // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
-	    
+
 		// database value not required
 		//dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED",$conf->entity);
 		header("Location: security.php");
@@ -233,6 +233,7 @@ if (is_resource($handle))
     }
     closedir($handle);
 }
+asort($arrayhandler);
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -299,42 +300,42 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso"){
 	print '<td colspan="3"> '.$langs->trans("PasswordPatternDesc").'</td>';
 	print '</tr>';
 
-	
+
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("MinLength")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[0].'" id="minlenght" min="1"></td>';
 	print '</tr>';
 
-	
+
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NbMajMin")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[1].'" id="NbMajMin" min="0"></td>';
 	print '</tr>';
 
-	
+
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NbNumMin")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[2].'" id="NbNumMin" min="0"></td>';
 	print '</tr>';
 
-	
+
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NbSpeMin")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[3].'" id="NbSpeMin" min="0"></td>';
 	print '</tr>';
 
-	
+
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NbIteConsecutive")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[4].'" id="NbIteConsecutive" min="0"></td>';
 	print '</tr>';
 
-	
+
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NoAmbiCaracAutoGeneration")."</td>";
 	print '<td colspan="2"><input type="checkbox" id="NoAmbiCaracAutoGeneration" '.($tabConf[5] ? "checked" : "").' min="0"> <span id="textcheckbox">'.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).'</span></td>';
 	print '</tr>';
-	
+
 	print '</table>';
 
 	print '<br>';
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 1053658b191..7ce087ead6f 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -51,41 +51,17 @@ if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
     dol_add_file_process($upload_dir, 0, 0, 'userfile');
 }
 
-if (preg_match('/set_(.*)/',$action,$reg))
+if ($action == 'updateform')
 {
-	$code=$reg[1];
-	$value=(GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
-	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
+	$antivircommand = GETPOST('MAIN_ANTIVIRUS_COMMAND','none');			// Use GETPOST none because we must accept ". Example c:\Progra~1\ClamWin\bin\clamscan.exe
+	$antivirparam = GETPOST('MAIN_ANTIVIRUS_PARAM','none');				// Use GETPOST none because we must accept ". Example --database="C:\Program Files (x86)\ClamWin\lib"
+	$antivircommand = dol_string_nospecial($antivircommand, '', array("|", ";", "<", ">", "&"));	// Sanitize command
+	$antivirparam = dol_string_nospecial($antivirparam, '', array("|", ";", "<", ">", "&"));		// Sanitize params
 
-else if (preg_match('/del_(.*)/',$action,$reg))
-{
-	$code=$reg[1];
-	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-else if ($action == 'updateform')
-{
 	$res3=dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',GETPOST('MAIN_UPLOAD_DOC','alpha'),'chaine',0,'',$conf->entity);
 	$res4=dolibarr_set_const($db, "MAIN_UMASK", GETPOST('MAIN_UMASK','alpha'),'chaine',0,'',$conf->entity);
-	$res5=dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", trim(GETPOST('MAIN_ANTIVIRUS_COMMAND','none')),'chaine',0,'',$conf->entity);    // Use GETPOST none because we must accept "
-	$res6=dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", trim(GETPOST('MAIN_ANTIVIRUS_PARAM','none')),'chaine',0,'',$conf->entity);	// Use GETPOST none because we must accept "
+	$res5=dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", trim($antivircommand),'chaine',0,'',$conf->entity);
+	$res6=dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", trim($antivirparam),'chaine',0,'',$conf->entity);
 	if ($res3 && $res4 && $res5 && $res6) setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 }
 
@@ -95,10 +71,10 @@ else if ($action == 'updateform')
 else if ($action == 'delete')
 {
 	$langs->load("other");
-	$file = $conf->admin->dir_temp . '/' . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+	$file = $conf->admin->dir_temp . '/' . GETPOST('urlfile','alpha');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	$ret=dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile','alpha')), null, 'mesgs');
+	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile','alpha')), null, 'errors');
 	Header('Location: '.$_SERVER["PHP_SELF"]);
 	exit;
 }
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index e5c66d9e24b..60d0888ed91 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -43,10 +43,10 @@ $action=GETPOST('action','alpha');
  * Actions
  */
 
-if (preg_match('/set_(.*)/',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
 	$code=$reg[1];
-	$value=(GETPOST($code) ? GETPOST($code) : 1);
+	$value=(GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
@@ -58,7 +58,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
 	}
 }
 
-else if (preg_match('/del_(.*)/',$action,$reg))
+else if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
 	$code=$reg[1];
 	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index e434f669f45..bd2e07ef97d 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -31,8 +31,8 @@ global $conf;
 
 if (!$user->admin) accessforbidden();
 
-$langs->load("admin");
-$langs->load("other");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin","other"));
 
 $error=0;
 $action = GETPOST('action','aZ09');
@@ -50,7 +50,6 @@ foreach ($dirsyslogs as $reldir) {
 		$handle = opendir($newdir);
 
 		if (is_resource($handle)) {
-			$var = true;
 
 			while (($file = readdir($handle)) !== false) {
 				if (substr($file, 0, 11) == 'mod_syslog_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index eee003b0872..82e8481c2dd 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -140,7 +140,7 @@ $configfilelib=array(
 					'Limit nb of email sent by page',
 					'Strict mode is on/off'
 					);
-$var=true;
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td width="280">'.$langs->trans("Label").'</td>';
 print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index d6e05ed2e72..cef493c95f8 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -66,7 +66,6 @@ else
 	if ($resql)
 	{
 		$num = $db->num_rows($resql);
-		$var=True;
 		$i=0;
 		while ($i < $num)
 		{
@@ -109,7 +108,7 @@ else
 
 		//$sql = "DESCRIBE ".$table;
 		$sql = "SHOW FULL COLUMNS IN ".$db->escape($table);
-		
+
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -129,7 +128,7 @@ else
 
 				print "<td>".(isset($link[$row[0]][0])?$link[$row[0]][0]:'').".";
 				print (isset($link[$row[0]][1])?$link[$row[0]][1]:'')."</td>";
-				
+
 				print '<!-- ALTER ALTER TABLE '.$table.' MODIFY '.$row[0].' '.$row[1].' COLLATE utf8_unicode_ci; -->';
 				print '</tr>';
 				$i++;
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 6fd623bf1bb..76202c2df2b 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -86,8 +86,8 @@ if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signa
 
 
 // Test if remote test is ok
-$enableremotecheck = True;
-if (preg_match('/beta|alpha|rc/i', DOL_VERSION) || ! empty($conf->global->MAIN_ALLOW_INTEGRITY_CHECK_ON_UNSTABLE)) $enableremotecheck=False;
+$enableremotecheck = true;
+if (preg_match('/beta|alpha|rc/i', DOL_VERSION) || ! empty($conf->global->MAIN_ALLOW_INTEGRITY_CHECK_ON_UNSTABLE)) $enableremotecheck=false;
 $enableremotecheck = true;
 
 print '<form name="check" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 55584df6445..1e757b72f63 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -50,7 +50,7 @@ llxHeader();
 
 print load_fiche_titre($langs->trans("PerfDolibarr"),'','title_setup');
 
-print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
+print $langs->trans("YouMayFindPerfAdviceHere",'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
 
 // Recupere la version de PHP
 $phpversion=version_php();
diff --git a/htdocs/admin/ticketsup.php b/htdocs/admin/ticketsup.php
index 4f6839d1e59..9b0cc0e2684 100644
--- a/htdocs/admin/ticketsup.php
+++ b/htdocs/admin/ticketsup.php
@@ -23,7 +23,7 @@
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/ticketsup/class/ticketsup.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php";
 
@@ -71,7 +71,7 @@ if ($action == 'updateMask') {
     if (!empty($notification_email)) {
         $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_FROM', $notification_email, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_FROM', '000000', 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_FROM', '', 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
@@ -82,7 +82,7 @@ if ($action == 'updateMask') {
     if (!empty($notification_email_to)) {
         $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_TO', $notification_email_to, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_TO', '000000', 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_TO', '', 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
@@ -172,12 +172,6 @@ if ($action == 'setvarother') {
         $error++;
     }
 
-    $param_extrafields_public = GETPOST('TICKETS_EXTRAFIELDS_PUBLIC', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_EXTRAFIELDS_PUBLIC', $param_extrafields_public, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
-
     $param_disable_email = GETPOST('TICKETS_DISABLE_ALL_MAILS', 'alpha');
     $res = dolibarr_set_const($db, 'TICKETS_DISABLE_ALL_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
     if (!$res > 0) {
@@ -190,16 +184,22 @@ if ($action == 'setvarother') {
         $error++;
     }
 
-    $param_show_module_logo = GETPOST('TICKETS_SHOW_MODULE_LOGO', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_SHOW_MODULE_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
+    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+    {
+    	$param_show_module_logo = GETPOST('TICKETS_SHOW_MODULE_LOGO', 'alpha');
+    	$res = dolibarr_set_const($db, 'TICKETS_SHOW_MODULE_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
+    	if (!$res > 0) {
+        	$error++;
+    	}
     }
 
-    $param_notification_also_main_addressemail = GETPOST('TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
+    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+    {
+    	$param_notification_also_main_addressemail = GETPOST('TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
+	    $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
+	    if (!$res > 0) {
+	        $error++;
+	    }
     }
 
     $param_limit_view = GETPOST('TICKETS_LIMIT_VIEW_ASSIGNED_ONLY', 'alpha');
@@ -241,7 +241,7 @@ dol_fiche_head($head, 'settings', $langs->trans("Module56000Name"), -1, "tickets
 
 print $langs->trans("TicketsupSetupDictionaries") . ' : <a href="' . dol_buildpath('/admin/dict.php', 1) . '" >' . dol_buildpath('/admin/dict.php', 2) . '</a><br>';
 
-print $langs->trans("TicketsupPublicAccess") . ' : <a href="' . dol_buildpath('/ticketsup/public/index.php', 1) . '" target="_blank" >' . dol_buildpath('/ticketsup/public/index.php', 2) . '</a>';
+print $langs->trans("TicketsupPublicAccess") . ' : <a href="' . dol_buildpath('/public/ticketsup/index.php', 1) . '" target="_blank" >' . dol_buildpath('/public/ticketsup/index.php', 2) . '</a>';
 
 dol_fiche_end();
 
@@ -269,7 +269,6 @@ foreach ($dirmodels as $reldir) {
     if (is_dir($dir)) {
         $handle = opendir($dir);
         if (is_resource($handle)) {
-            $var = true;
 
             while (($file = readdir($handle)) !== false) {
                 if (preg_match('/^(mod_.*)\.php$/i', $file, $reg)) {
@@ -290,8 +289,7 @@ foreach ($dirmodels as $reldir) {
                     }
 
                     if ($module->isEnabled()) {
-                        $var = !$var;
-                        print '<tr ' . $bc[$var] . '><td>' . $module->name . "</td><td>\n";
+                        print '<tr class="oddeven"><td>' . $module->name . "</td><td>\n";
                         print $module->info();
                         print '</td>';
 
@@ -386,20 +384,23 @@ print $form->textwithpicto('', $langs->trans("TicketsEmailMustExistHelp"), 1, 'h
 print '</td>';
 print '</tr>';
 
-// Show logo for module
-print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsShowModuleLogo") . '</td>';
-print '<td align="left">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_SHOW_MODULE_LOGO');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_SHOW_MODULE_LOGO", $arrval, $conf->global->TICKETS_SHOW_MODULE_LOGO);
-}
-print '</td>';
-print '<td align="center">';
-print $form->textwithpicto('', $langs->trans("TicketsShowModuleLogoHelp"), 1, 'help');
-print '</td>';
-print '</tr>';
+/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+{
+	// Show logo for module
+	print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsShowModuleLogo") . '</td>';
+	print '<td align="left">';
+	if ($conf->use_javascript_ajax) {
+	    print ajax_constantonoff('TICKETS_SHOW_MODULE_LOGO');
+	} else {
+	    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	    print $form->selectarray("TICKETS_SHOW_MODULE_LOGO", $arrval, $conf->global->TICKETS_SHOW_MODULE_LOGO);
+	}
+	print '</td>';
+	print '<td align="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsShowModuleLogoHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
+}*/
 
 // Show logo for company
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsShowCompanyLogo") . '</td>';
@@ -416,21 +417,6 @@ print $form->textwithpicto('', $langs->trans("TicketsShowCompanyLogoHelp"), 1, '
 print '</td>';
 print '</tr>';
 
-// Display extrafields into public interface
-print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsShowExtrafieldsIntoPublicArea") . '</td>';
-print '<td align="left">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_EXTRAFIELDS_PUBLIC');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_EXTRAFIELDS_PUBLIC", $arrval, $conf->global->TICKETS_EXTRAFIELDS_PUBLIC);
-}
-print '</td>';
-print '<td align="center">';
-print $form->textwithpicto('', $langs->trans("TicketsShowExtrafieldsIntoPublicAreaHelp"), 1, 'help');
-print '</td>';
-print '</tr>';
-
 print '</table><br>';
 
 print_titre($langs->trans("TicketParams"));
@@ -467,19 +453,22 @@ print '</td>';
 print '</tr>';
 
 // Also send to main email address
-print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsEmailAlsoSendToMainAddress") . '</td>';
-print '<td align="left">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS);
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+{
+	print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsEmailAlsoSendToMainAddress") . '</td>';
+	print '<td align="left">';
+	if ($conf->use_javascript_ajax) {
+	    print ajax_constantonoff('TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS');
+	} else {
+	    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	    print $form->selectarray("TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS);
+	}
+	print '</td>';
+	print '<td align="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
 }
-print '</td>';
-print '<td align="center">';
-print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
-print '</td>';
-print '</tr>';
 
 // Limiter la vue des tickets à ceux assignés à l'utilisateur
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsLimitViewAssignedOnly") . '</td>';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 7b2c8805f55..1c985e23090 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2006-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2006-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2006-2018	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2018	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@ $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="date";
-if ($page < 0) { $page = 0; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+if (empty($page) || $page == -1) { $page = 0; }
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 
 if (! $user->admin)
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index 68d56bd2ded..d3253c02514 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -116,8 +116,7 @@ function revcompare($x, $y)
  */
 function create_script_table($list)
 {
-    global $sortby,$bc,$langs;
-    $var=true;
+    global $sortby,$langs;
 
     if (GETPOT('order') == "asc" || GETPOST('order') =="desc") {
         $order = GETPOST('order');
@@ -173,7 +172,6 @@ function create_script_table($list)
     }
 
     foreach($list as $script) {
-        $var = ! $var;
         print '<tr class="oddeven">';
         print '<td>'.dol_trunc($script['file'],80,'left').'</td>';
         print '<td align="center" class="nowrap">'.dol_print_date($script['mtime'],'dayhour').'</td>';
@@ -194,8 +192,7 @@ function create_script_table($list)
  */
 function create_key_table($list)
 {
-    global $bc,$langs;
-    $var=true;
+    global $langs;
 
     print '<table class="noborder">';
     print '<tr class="liste_titre">';
@@ -206,7 +203,6 @@ function create_key_table($list)
     print '</tr>';
 
     foreach($list as $key) {
-        $var = !$var;
         print '<tr class="oddeven">';
         print '<td>'.dol_trunc($key['name'],80,'left').'</td>';
         print '<td align="center" class="nowrap">'.dol_print_date($key['created'],'dayhour').'</td>';
@@ -229,54 +225,49 @@ function create_key_table($list)
 $form=new Form($db);
 print load_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','','title_setup');
 
-$var=true;
-
 print '<br>';
 
-
 print '<table class="noborder">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">Information</td>';
 print '</tr>';
-$var = !$var;
+
 print '<tr class="oddeven">';
 print '<td>Caching enabled</td>';
 print '<td align="right">'.($info['cache']?'yes':'no').'</td>';
 print '</tr>';
-$var = !$var;
+
 print '<tr class="oddeven">';
 print '<td>Optimizer enabled</td>';
 print '<td align="right">'.$info['optimizer']?'yes':'no'.'</td>';
 print '</tr>';
-$var = !$var;
+
 print '<tr class="oddeven">';
 print '<td>Memory usage</td>';
 print '<td align="right">'.number_format(100 * $info['memoryAllocated']/$info['memorySize'], 2).'%('.number_format($info['memoryAllocated'] / (1024*1024), 2).'MB / '.number_format($info['memorySize']/(1024*1024), 2).'MB)</td>';
 print '</tr>';
-$var = ! $var;
+
 print '<tr class="oddeven">';
 print '<td>Free memory in reserved cache</td>';
 print '<td align="right">'.number_format($info['memoryAvailable']/(1024*1024), 2).'MB</td>';
 print '</tr>';
-$var = ! $var;
+
 print '<tr class="oddeven">';
 print '<td>Cached scripts</td>';
 print '<td align="right">'.$info['cachedScripts'].'</td>';
 print '</tr>';
-$var = ! $var;
+
 print '<tr class="oddeven">';
 print '<td>Removed scripts</td>';
 print '<td align="right">'.$info['removedScripts'].'</td>';
 print '</tr>';
-$var = ! $var;
+
 print '<tr class="oddeven">';
 print '<td>Cached keys</td>';
 print '<td align="right">'.(isset($info['cachedKeys'])?$info['cachedKeys']:'').'</td>';
 print '</tr>';
 print '</table>';
 
-$var=true;
-
 $resCached = @eaccelerator_cached_scripts(); // If success return an array
 $resRemoved = @eaccelerator_removed_scripts();
 
@@ -288,12 +279,11 @@ if (is_array($resCached) || is_array($resRemoved)) {
     print '<tr class="liste_titre"><td colspan="2">Actions</td></tr>';
 
     if (is_array($resCached)) {
-        $var = ! $var;
         print '<tr class="oddeven">';
         print "<td>Caching</td>";
         print '<td align="right"><input type="submit" class="butAction" name="caching" value="'. ($info['cache']?'disable':'enable') .'" /></td>';
         print "</tr>";
-        $var = ! $var;
+
         print '<tr class="oddeven">';
         print "<td>Optimizer</td>";
         print '<td align="right"><input type="submit" class="butAction" name="optimizer" value="'. ($info['optimizer']?'disable':'enable') .'" /></td>';
@@ -301,17 +291,16 @@ if (is_array($resCached) || is_array($resRemoved)) {
     }
 
     if (is_array($resRemoved)) {
-        $var = ! $var;
         print '<tr class="oddeven">';
         print "<td>Clear cache</td>";
         print '<td align="right"><input type="submit" class="butAction" name="clear" value="clear" title="remove all unused scripts and data from shared memory and disk cache" /></td>';
         print "</tr>";
-        $var = ! $var;
+
         print '<tr class="oddeven">';
         print "<td>Clean cache</td>";
         print '<td align="right"><input type="submit" class="butAction" name="clean" value="clean" title=" remove all expired scripts and data from shared memory and disk cache" /></td>';
         print "</tr>";
-        $var = ! $var;
+
         print '<tr class="oddeven">';
         print "<td>Purge cache</td>";
         print '<td align="right"><input type="submit" class="butAction" name="purge" value="purge" title="remove all \'removed\' scripts from shared memory" /></td>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 01ab314df73..f3d2057395f 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -41,7 +41,7 @@ $page = GETPOST("page",'int');
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="date";
 if ($page < 0) { $page = 0; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 
 if (! $user->admin) accessforbidden();
@@ -280,7 +280,7 @@ function backup_tables($outputfile, $tables='*')
 
     //cycle through
     $handle = fopen($outputfile, 'w+');
-    if (fwrite($handle, '') === FALSE)
+    if (fwrite($handle, '') === false)
     {
         $langs->load("errors");
         dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index ac520ce22b3..48d3ef57fd5 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -184,6 +184,11 @@ $nbtotalofrecords = '';
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }*/
 
 $sql.= $db->plimit($conf->liste_limit+1, $offset);
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 76f7debf3e7..70b0987732b 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -137,12 +137,8 @@ if ($savehandler == 'files')
 	print_liste_field_titre('');
 	print "</tr>\n";
 
-	$var=True;
-
 	foreach ($listofsessions as $key => $sessionentry)
 	{
-
-
 		print '<tr class="oddeven">';
 
 		// Login
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 58ca4e0eded..ca14869cb2e 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -65,10 +65,8 @@ print getTitleFieldOfList($langs->trans("Active"), 0, $_SERVER["PHP_SELF"], 'act
 print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], 'none', "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder, '', 1)."\n";
 print '</tr>';
 
-$var=True;
 foreach ($triggers as $trigger)
 {
-
 	print '<tr class="oddeven">';
 	print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
 	print '<td class="tdtop">'.$trigger['file'].'</td>';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index ee5faefeaee..a7b1c5b9373 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -86,7 +86,7 @@ elseif ($action == 'setdoc')
 	}
 	$res = true;
 }
-elseif (preg_match('/set_(.*)/',$action,$reg))
+elseif (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
@@ -100,7 +100,7 @@ elseif (preg_match('/set_(.*)/',$action,$reg))
     }
 }
 
-elseif (preg_match('/del_(.*)/',$action,$reg))
+elseif (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 5a1cf94e59f..75497e9d19d 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -83,7 +83,7 @@ elseif ($action == 'setdoc')
 	}
 	$res = true;
 }
-elseif (preg_match('/set_(.*)/',$action,$reg))
+elseif (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
@@ -97,7 +97,7 @@ elseif (preg_match('/set_(.*)/',$action,$reg))
     }
 }
 
-elseif (preg_match('/del_(.*)/',$action,$reg))
+elseif (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index e3854c4eb11..73063c2b036 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -436,24 +436,7 @@ if ($id)
 {
     // Complete requete recherche valeurs avec critere de tri
     $sql=$tabsql[$id];
-
-    if ($sortfield)
-    {
-        // If sort order is "country", we use country_code instead
-        $sql.= " ORDER BY ".$sortfield;
-        if ($sortorder)
-        {
-            $sql.=" ".strtoupper($sortorder);
-        }
-        $sql.=", ";
-        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
-        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
-    }
-    else {
-        $sql.=" ORDER BY ";
-    }
-    $sql.=$tabsqlsort[$id];
+    $sql.=$db->order($sortfield,$sortorder);
     $sql.=$db->plimit($limit+1, $offset);
     //print $sql;
 
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 22c763100d4..ef2b4c8bb6d 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -170,7 +170,7 @@ class Setup extends DolibarrApi
                     // and then apply the filter if there is one.
                     $this->translateLabel($country, $lang);
 
-                    if (empty($filter) || stripos($country->label, $filter) !== FALSE) {
+                    if (empty($filter) || stripos($country->label, $filter) !== false) {
                         $list[] = $this->_cleanObjectDatas($country);
                     }
                 }
@@ -385,7 +385,7 @@ class Setup extends DolibarrApi
      * @param string	$sortorder	Sort order
      * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
-     * @return List of events types
+     * @return List of extra fields
      *
      * @url     GET extrafields
      *
@@ -584,7 +584,7 @@ class Setup extends DolibarrApi
      * Do a test of integrity for files and setup.
      *
      * @param string	$target			Can be 'local' or 'default' or Url of the signatures file to use for the test. Must be reachable by the tested Dolibarr.
-     * @return Result of file and setup integrity check
+     * @return 							Result of file and setup integrity check
      *
      * @url     GET checkintegrity
      *
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 353b945cfda..e66a19c981a 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -24,12 +24,7 @@
  *  \file       htdocs/api/index.php
  */
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');		// Do not check style html tag into posted data
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');		// If there is no need to load and show top and left menu
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't need to load the html.form.class.php
diff --git a/htdocs/assets/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php
similarity index 95%
rename from htdocs/assets/admin/assets_extrafields.php
rename to htdocs/asset/admin/assets_extrafields.php
index 85c596b6e37..52c1f042836 100644
--- a/htdocs/assets/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/assets_extrafields.php
@@ -17,8 +17,8 @@
  */
 
 /**
- *      \file       htdocs/assets/admin/assets_extrafields.php
- *		\ingroup    assets
+ *      \file       htdocs/asset/admin/asset_extrafields.php
+ *		\ingroup    asset
  *		\brief      Page to setup extra fields of assets
  */
 
@@ -65,7 +65,7 @@ print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
 
 $head = AssetsAdminPrepareHead();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Assets"), 0, 'generic');
+dol_fiche_head($head, 'attributes', $langs->trans("Assets"), -1, 'generic');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/assets/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php
similarity index 97%
rename from htdocs/assets/admin/assets_type_extrafields.php
rename to htdocs/asset/admin/assets_type_extrafields.php
index 8d136ed1278..261c7de99b7 100644
--- a/htdocs/assets/admin/assets_type_extrafields.php
+++ b/htdocs/asset/admin/assets_type_extrafields.php
@@ -18,8 +18,8 @@
 
 /**
 /**
- * \file        htdocs/assets/admin/assets_type_extrafields.php
- * \ingroup     assets
+ * \file        htdocs/asset/admin/assets_type_extrafields.php
+ * \ingroup     asset
  * \brief       Page to setup extra fields type of assets
  */
 require '../../main.inc.php';
@@ -66,7 +66,7 @@ print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
 
 $head = AssetsAdminPrepareHead();
 
-dol_fiche_head($head, 'attributes_type', $langs->trans("Assets"), 0, 'generic');
+dol_fiche_head($head, 'attributes_type', $langs->trans("Assets"), -1, 'generic');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/assets/admin/setup.php b/htdocs/asset/admin/setup.php
similarity index 96%
rename from htdocs/assets/admin/setup.php
rename to htdocs/asset/admin/setup.php
index 19de7b3b752..8708396fb7f 100644
--- a/htdocs/assets/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -60,10 +60,7 @@ print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
 
 $head = AssetsAdminPrepareHead();
 
-dol_fiche_head($head, 'settings', $langs->trans("Assets"), 0, 'generic');
-
-// Setup page goes here
-echo $langs->trans("AssetsSetupPage");
+dol_fiche_head($head, 'settings', $langs->trans("Assets"), -1, 'generic');
 
 
 if ($action == 'edit')
diff --git a/htdocs/assets/card.php b/htdocs/asset/card.php
similarity index 85%
rename from htdocs/assets/card.php
rename to htdocs/asset/card.php
index 4424ca0cf93..a76bf3d069e 100644
--- a/htdocs/assets/card.php
+++ b/htdocs/asset/card.php
@@ -18,18 +18,18 @@
 
 /**
  *  \file       card.php
- *  \ingroup    assets
- *  \brief      Page to create/edit/view assets
+ *  \ingroup    asset
+ *  \brief      Page to create/edit/view asset
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/assets/class/assets.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
 
 // Load traductions files requiredby by page
-$langs->loadLangs(array("assets"));
+$langs->loadLangs(array("asset"));
 
 // Get parameters
 $id         = GETPOST('id', 'int');
@@ -39,12 +39,12 @@ $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
-$object=new Assets($db);
+$object=new Asset($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->assets->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('assetscard'));     // Note that conf->hooks_modules contains array
+$diroutputmassaction=$conf->asset->dir_output . '/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetcard'));     // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('assets');
+$extralabels = $extrafields->fetch_name_optionals_label('asset');
 $search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 // Initialize array of search criterias
@@ -60,7 +60,7 @@ if (empty($action) && empty($id) && empty($ref)) $action='view';
 // Security check - Protection if external user
 //if ($user->societe_id > 0) access_forbidden();
 //if ($user->societe_id > 0) $socid = $user->societe_id;
-//$result = restrictedArea($user, 'assets', $id);
+//$result = restrictedArea($user, 'asset', $id);
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
@@ -84,9 +84,9 @@ if (empty($reshook))
 {
 	$error=0;
 
-	$permissiontoadd = $user->rights->assets->create;
-	$permissiontodelete = $user->rights->assets->delete;
-	$backurlforlist = dol_buildpath('/assets/list.php',1);
+	$permissiontoadd = $user->rights->asset->create;
+	$permissiontodelete = $user->rights->asset->delete;
+	$backurlforlist = dol_buildpath('/asset/list.php',1);
 
 	// Actions cancel, add, update or delete
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
@@ -97,7 +97,7 @@ if (empty($reshook))
 	// Actions to send emails
 	$trigger_name='MYOBJECT_SENTBYMAIL';
 	$autocopy='MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
-	$trackid='assets'.$object->id;
+	$trackid='asset'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
@@ -241,13 +241,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' .dol_buildpath('/assets/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' .dol_buildpath('/asset/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 	$morehtmlref='<div class="refidno">';
 	/*
 	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->assets->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->assets->creer, 'string', '', null, null, '', 1);
+	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->asset->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->asset->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	*/
@@ -289,7 +289,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Send
 			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
 
-			if ($user->rights->assets->write)
+			if ($user->rights->asset->write)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
 			}
@@ -298,7 +298,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
-			if ($user->rights->assets->delete)
+			if ($user->rights->asset->delete)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
 			}
@@ -324,15 +324,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Documents
 		/*$objref = dol_sanitizeFileName($object->ref);
 		$relativepath = $comref . '/' . $comref . '.pdf';
-		$filedir = $conf->assets->dir_output . '/' . $objref;
+		$filedir = $conf->asset->dir_output . '/' . $objref;
 		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-		$genallowed = $user->rights->assets->read;	// If you can read, you can build the PDF to read content
-		$delallowed = $user->rights->assets->create;	// If you can create/edit, you can remove a file on card
-		print $formfile->showdocuments('assets', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		$genallowed = $user->rights->asset->read;	// If you can read, you can build the PDF to read content
+		$delallowed = $user->rights->asset->create;	// If you can create/edit, you can remove a file on card
+		print $formfile->showdocuments('asset', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 		*/
 
 		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, array('assets'));
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('asset'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
@@ -340,14 +340,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/assets/assets_info.php', 1).'?id='.$object->id.'">';
+		$morehtmlright = '<a href="'.dol_buildpath('/asset/asset_info.php', 1).'?id='.$object->id.'">';
 		$morehtmlright.= $langs->trans("SeeAll");
 		$morehtmlright.= '</a>';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'assets', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, 'asset', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
 		print '</div></div></div>';
 	}
diff --git a/htdocs/assets/class/asset.class.php b/htdocs/asset/class/asset.class.php
similarity index 95%
rename from htdocs/assets/class/asset.class.php
rename to htdocs/asset/class/asset.class.php
index efacac10822..86da8ae5379 100644
--- a/htdocs/assets/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -17,9 +17,9 @@
  */
 
 /**
- * \file        assets/class/assets.class.php
- * \ingroup     assets
- * \brief       This file is a CRUD class file for assets (Create/Read/Update/Delete)
+ * \file        asset/class/asset.class.php
+ * \ingroup     asset
+ * \brief       This file is a CRUD class file for asset (Create/Read/Update/Delete)
  */
 
 require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
@@ -27,30 +27,30 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
- * Class for Assets
+ * Class for Asset
  */
-class Assets extends CommonObject
+class Asset extends CommonObject
 {
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element = 'assets';
+	public $element = 'asset';
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'assets';
+	public $table_element = 'asset';
 	/**
-	 * @var int  Does assets support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int  Does module support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
 	public $ismultientitymanaged = 0;
 	/**
-	 * @var int  Does assets support extrafields ? 0=No, 1=Yes
+	 * @var int  Does asset support extrafields ? 0=No, 1=Yes
 	 */
 	public $isextrafieldmanaged = 1;
 	/**
-	 * @var string String with name of icon for assets. Must be the part after the 'object_' into object_assets.png
+	 * @var string String with name of icon for asset. Must be the part after the 'object_' into object_asset.png
 	 */
-	public $picto = 'assets';
+	public $picto = 'asset';
 
 
 	/**
@@ -111,21 +111,21 @@ class Assets extends CommonObject
 	/**
 	 * @var int    Name of subtable line
 	 */
-	//public $table_element_line = 'assetsdet';
+	//public $table_element_line = 'assetdet';
 	/**
 	 * @var int    Field with ID of parent key if this field has a parent
 	 */
-	//public $fk_element = 'fk_assets';
+	//public $fk_element = 'fk_asset';
 	/**
 	 * @var int    Name of subtable class that manage subtable lines
 	 */
-	//public $class_element_line = 'Assetsline';
+	//public $class_element_line = 'Assetline';
 	/**
 	 * @var array  Array of child tables (child tables to delete before deleting a record)
 	 */
-	//protected $childtables=array('assetsdet');
+	//protected $childtables=array('assetdet');
 	/**
-	 * @var AssetsLine[]     Array of subtable lines
+	 * @var AssetLine[]     Array of subtable lines
 	 */
 	//public $lines = array();
 
diff --git a/htdocs/assets/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
similarity index 92%
rename from htdocs/assets/class/asset_type.class.php
rename to htdocs/asset/class/asset_type.class.php
index 9889ceeb5d1..9fbcca64d8b 100644
--- a/htdocs/assets/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -16,8 +16,8 @@
  */
 
 /**
- *  \file       htdocs/assets/class/asset_type.class.php
- *  \ingroup    assets
+ *  \file       htdocs/asset/class/asset_type.class.php
+ *  \ingroup    asset
  *  \brief      File of class to manage asset types
  */
 
@@ -155,22 +155,15 @@ class AssetType extends CommonObject
 		{
 			$action='update';
 
-			// Actions on extra fields (by external module or standard code)
-			$hookmanager->initHooks(array('assettypedao'));
-			$parameters=array('assettype'=>$this->id);
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			if (empty($reshook))
+			// Actions on extra fields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 
 			if (! $error && ! $notrigger)
 			{
@@ -382,7 +375,7 @@ class AssetType extends CommonObject
 		$result='';
 		$label=$langs->trans("ShowTypeCard",$this->label);
 
-		$linkstart = '<a href="'.DOL_URL_ROOT.'/assets/type.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/asset/type.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		$result .= $linkstart;
diff --git a/htdocs/assets/document.php b/htdocs/asset/document.php
similarity index 83%
rename from htdocs/assets/document.php
rename to htdocs/asset/document.php
index 490fb8f36a4..fbd2fe6cdb8 100644
--- a/htdocs/assets/document.php
+++ b/htdocs/asset/document.php
@@ -18,13 +18,13 @@
 
 /**
  *  \file       document.php
- *  \ingroup    assets
+ *  \ingroup    asset
  *  \brief      Tab for documents linked to Assets
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/assets/class/assets.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -42,7 +42,7 @@ $ref = GETPOST('ref', 'alpha');
 // Security check - Protection if external user
 //if ($user->societe_id > 0) access_forbidden();
 //if ($user->societe_id > 0) $socid = $user->societe_id;
-//$result = restrictedArea($user, 'assets', $id);
+//$result = restrictedArea($user, 'asset', $id);
 
 // Get parameters
 $sortfield = GETPOST("sortfield",'alpha');
@@ -56,12 +56,12 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="name";
 
 // Initialize technical objects
-$object=new Assets($db);
+$object=new Asset($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction=$conf->assets->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('assetsdocument'));     // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('assetdocument'));     // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('assets');
+$extralabels = $extrafields->fetch_name_optionals_label('asset');
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
@@ -110,7 +110,7 @@ if ($object->id)
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' .dol_buildpath('/assets/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' .dol_buildpath('/asset/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
@@ -131,15 +131,15 @@ if ($object->id)
 
 	dol_fiche_end();
 
-	$modulepart = 'assets';
-	//$permission = $user->rights->assets->create;
+	$modulepart = 'asset';
+	//$permission = $user->rights->asset->create;
 	$permission = 1;
-	//$permtoedit = $user->rights->assets->create;
+	//$permtoedit = $user->rights->asset->create;
 	$permtoedit = 1;
 	$param = '&id=' . $object->id;
 
-	//$relativepathwithnofile='assets/' . dol_sanitizeFileName($object->id).'/';
-	$relativepathwithnofile='assets/' . dol_sanitizeFileName($object->ref).'/';
+	//$relativepathwithnofile='asset/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile='asset/' . dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 }
diff --git a/htdocs/assets/info.php b/htdocs/asset/info.php
similarity index 88%
rename from htdocs/assets/info.php
rename to htdocs/asset/info.php
index 9017a9e6845..c953a09c83b 100644
--- a/htdocs/assets/info.php
+++ b/htdocs/asset/info.php
@@ -17,16 +17,16 @@
 
 /**
  *  \file       info.php
- *  \ingroup    assets
+ *  \ingroup    asset
  *  \brief      Page to show an asset information
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/assets/class/assets.class.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 
-$langs->loadLangs(array("assets"));
+$langs->loadLangs(array("asset"));
 
 $id = GETPOST('id','int');
 $ref=GETPOST('ref','alpha');
@@ -34,9 +34,9 @@ $action=GETPOST('action','alpha');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'assets', $id, '');
+$result = restrictedArea($user, 'asset', $id, '');
 
-$object = new Assets($db);
+$object = new Asset($db);
 $object->fetch($id);
 
 /*
diff --git a/htdocs/assets/list.php b/htdocs/asset/list.php
similarity index 88%
rename from htdocs/assets/list.php
rename to htdocs/asset/list.php
index c8ac1f869f1..d9860dc32a3 100644
--- a/htdocs/assets/list.php
+++ b/htdocs/asset/list.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018      Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2018      Ferran Marcet	   	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,31 +19,16 @@
 
 /**
  *   	\file       list.php
- *		\ingroup    assets
- *		\brief      List page for assets
+ *		\ingroup    asset
+ *		\brief      List page for asset
  */
 
-//if (! defined('NOREQUIREUSER'))          define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))            define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))           define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))          define('NOREQUIRETRAN','1');
-//if (! defined('NOSCANGETFORINJECTION'))  define('NOSCANGETFORINJECTION','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');		// Do not check anti CSRF attack test
-//if (! defined('NOCSRFCHECK'))            define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test done when option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
-//if (! defined('NOSTYLECHECK'))           define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL'))         define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))          define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))          define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))          define('NOREQUIREAJAX','1');         // Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/assets/class/assets.class.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 
 // Load traductions files requiredby by page
 $langs->loadLangs(array("assets"));
@@ -70,12 +56,12 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Initialize technical objects
-$object=new Assets($db);
+$object=new Asset($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->assets->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('assetslist'));     // Note that conf->hooks_modules contains array
+$diroutputmassaction=$conf->asset->dir_output . '/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetlist'));     // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('assets');
+$extralabels = $extrafields->fetch_name_optionals_label('asset');
 $search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
@@ -89,7 +75,7 @@ if ($user->societe_id > 0)
 	//$socid = $user->societe_id;
 	accessforbidden();
 }
-//$result = restrictedArea($user, 'assets', $id,'');
+//$result = restrictedArea($user, 'asset', $id,'');
 
 // Initialize array of search criterias
 $search_all=trim(GETPOST("search_all",'alpha'));
@@ -161,11 +147,11 @@ if (empty($reshook))
 	}
 
 	// Mass actions
-	$objectclass='Assets';
-	$objectlabel='Assets';
-	$permtoread = $user->rights->assets->read;
-	$permtodelete = $user->rights->assets->delete;
-	$uploaddir = $conf->assets->dir_output;
+	$objectclass='Asset';
+	$objectlabel='Asset';
+	$permtoread = $user->rights->asset->read;
+	$permtodelete = $user->rights->asset->delete;
+	$uploaddir = $conf->asset->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -181,7 +167,7 @@ $form=new Form($db);
 
 $now=dol_now();
 
-//$help_url="EN:Module_Assets|FR:Module_Assets_FR|ES:Módulo_Assets";
+//$help_url="EN:Module_Asset|FR:Module_Asset_FR|ES:Módulo_Asset";
 $help_url='';
 $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Assets"));
 
@@ -239,6 +225,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -300,7 +291,7 @@ $arrayofmassactions =  array(
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->assets->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if ($user->rights->asset->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
 if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
@@ -318,8 +309,8 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail="SendAssetsRef";
-$modelmail="assets";
-$objecttmp=new Assets($db);
+$modelmail="asset";
+$objecttmp=new Asset($db);
 $trackid='xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
@@ -394,7 +385,7 @@ foreach($object->fields as $key => $val)
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],'','','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
@@ -524,10 +515,10 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb
 		$urlsource.=str_replace('&amp;','&',$param);
 
 		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->assets->read;
-		$delallowed=$user->rights->assets->create;
+		$genallowed=$user->rights->asset->read;
+		$delallowed=$user->rights->asset->create;
 
-		print $formfile->showdocuments('massfilesarea_assets','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+		print $formfile->showdocuments('massfilesarea_asset','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
 	{
diff --git a/htdocs/assets/note.php b/htdocs/asset/note.php
similarity index 82%
rename from htdocs/assets/note.php
rename to htdocs/asset/note.php
index b0db48e2abe..9ed9053dc5c 100644
--- a/htdocs/assets/note.php
+++ b/htdocs/asset/note.php
@@ -18,16 +18,16 @@
 
 /**
  *  \file       note.php
- *  \ingroup    assets
- *  \brief      Card with notes on Assets
+ *  \ingroup    asset
+ *  \brief      Card with notes on Asset
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/assets/class/assets.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 
 // Load traductions files requiredby by page
-$langs->loadLangs(array("assets","companies"));
+$langs->loadLangs(array("asset","companies"));
 
 // Get parameters
 $id			= GETPOST('id', 'int');
@@ -37,24 +37,24 @@ $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
-$object=new Assets($db);
+$object=new Asset($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->assets->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('assetsnote'));     // Note that conf->hooks_modules contains array
+$diroutputmassaction=$conf->asset->dir_output . '/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetnote'));     // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('assets');
+$extralabels = $extrafields->fetch_name_optionals_label('asset');
 
 // Security check - Protection if external user
 //if ($user->societe_id > 0) access_forbidden();
 //if ($user->societe_id > 0) $socid = $user->societe_id;
-//$result = restrictedArea($user, 'assets', $id);
+//$result = restrictedArea($user, 'asset', $id);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || ! empty($ref)) $upload_dir = $conf->assets->multidir_output[$object->entity] . "/" . $object->id;
+if ($id > 0 || ! empty($ref)) $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
 
 $permissionnote=1;
-//$permissionnote=$user->rights->assets->creer;	// Used by the include of actions_setnotes.inc.php
+//$permissionnote=$user->rights->asset->creer;	// Used by the include of actions_setnotes.inc.php
 
 
 /*
@@ -84,7 +84,7 @@ if ($id > 0 || ! empty($ref))
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' .dol_buildpath('/assets/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' .dol_buildpath('/asset/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 	$morehtmlref='<div class="refidno">';
 	/*
@@ -98,7 +98,7 @@ if ($id > 0 || ! empty($ref))
 	{
 	    $langs->load("projects");
 	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->assets->creer)
+	    if ($user->rights->asset->creer)
 	    {
 	        if ($action != 'classify')
 	            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
diff --git a/htdocs/assets/type.php b/htdocs/asset/type.php
similarity index 95%
rename from htdocs/assets/type.php
rename to htdocs/asset/type.php
index 51445f86254..d26175d168f 100644
--- a/htdocs/assets/type.php
+++ b/htdocs/asset/type.php
@@ -16,15 +16,15 @@
  */
 
 /**
- *  \file       htdocs/assets/type.php
- *  \ingroup    assets
+ *  \file       htdocs/asset/type.php
+ *  \ingroup    asset
  *  \brief      Asset's type setup
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/assets/class/asset.class.php';
-require_once DOL_DOCUMENT_ROOT.'/assets/class/asset_type.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 $langs->load("assets");
@@ -51,7 +51,7 @@ $label=GETPOST("label","alpha");
 $comment=GETPOST("comment");
 
 // Security check
-$result=restrictedArea($user,'assets',$rowid,'asset_type');
+$result=restrictedArea($user,'asset',$rowid,'asset_type');
 
 $object = new AssetType($db);
 
@@ -86,7 +86,7 @@ if ($cancel) {
 	}
 }
 
-if ($action == 'add' && $user->rights->assets->write)
+if ($action == 'add' && $user->rights->asset->write)
 {
 	$object->label									= trim($label);
 	$object->accountancy_code_asset					= trim($accountancy_code_asset);
@@ -135,7 +135,7 @@ if ($action == 'add' && $user->rights->assets->write)
 	}
 }
 
-if ($action == 'update' && $user->rights->assets->write)
+if ($action == 'update' && $user->rights->asset->write)
 {
 	$object->fetch($rowid);
 
@@ -166,7 +166,7 @@ if ($action == 'update' && $user->rights->assets->write)
 	exit;
 }
 
-if ($action == 'confirm_delete' && $user->rights->assets->write)
+if ($action == 'confirm_delete' && $user->rights->asset->write)
 {
 	$object->fetch($rowid);
 	$res=$object->delete();
@@ -255,7 +255,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 			print '<td align="center">'.yn($objp->subscription).'</td>';
 			print '<td align="center">'.yn($objp->vote).'</td>';
-			if ($user->rights->adherent->configurer)
+			if ($user->rights->asset->configurer)
 				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
 			else
 				print '<td align="right">&nbsp;</td>';
@@ -281,7 +281,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 /* ************************************************************************** */
 if ($action == 'create')
 {
-	$object = new AdherentType($db);
+	$object = new AssetType($db);
 
 	print load_fiche_titre($langs->trans("NewMemberType"));
 
@@ -317,7 +317,7 @@ if ($action == 'create')
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -344,7 +344,7 @@ if ($rowid > 0)
 {
 	if ($action != 'edit')
 	{
-		$object = new AdherentType($db);
+		$object = new AssetType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
 
@@ -360,7 +360,7 @@ if ($rowid > 0)
 
 		dol_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/asset/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'rowid', $linkback);
 
@@ -398,7 +398,7 @@ if ($rowid > 0)
 		print '<div class="tabsAction">';
 
 		// Edit
-		if ($user->rights->adherent->configurer)
+		if ($user->rights->asset->configurer)
 		{
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 		}
@@ -407,7 +407,7 @@ if ($rowid > 0)
 		print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
 
 		// Delete
-		if ($user->rights->adherent->configurer)
+		if ($user->rights->asset->configurer)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
 		}
@@ -464,6 +464,9 @@ if ($rowid > 0)
 		{
 			$sql.=" AND datefin < '".$db->idate($now)."'";
 		}
+
+		$sql.= " ".$db->order($sortfield,$sortorder);
+
 		// Count total nb of records
 		$nbtotalofrecords = '';
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -471,9 +474,13 @@ if ($rowid > 0)
 			$resql = $db->query($sql);
 			if ($resql) $nbtotalofrecords = $db->num_rows($result);
 			else dol_print_error($db);
+			if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+			{
+				$page = 0;
+				$offset = 0;
+			}
 		}
-		// Add order and limit
-		$sql.= " ".$db->order($sortfield,$sortorder);
+
 		$sql.= " ".$db->plimit($conf->liste_limit+1, $offset);
 
 		$resql = $db->query($sql);
@@ -568,7 +575,7 @@ if ($rowid > 0)
 
 				$datefin=$db->jdate($objp->datefin);
 
-				$adh=new Adherent($db);
+				$adh=new Asset($db);
 				$adh->lastname=$objp->lastname;
 				$adh->firstname=$objp->firstname;
 
@@ -636,12 +643,12 @@ if ($rowid > 0)
 
 				// Actions
 				print '<td align="center">';
-				if ($user->rights->adherent->creer)
+				if ($user->rights->asset->creer)
 				{
 					print '<a href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
 				}
 				print '&nbsp;';
-				if ($user->rights->adherent->supprimer)
+				if ($user->rights->asset->supprimer)
 				{
 					print '<a href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"),'disable.png').'</a>';
 				}
@@ -675,7 +682,7 @@ if ($rowid > 0)
 
 	if ($action == 'edit')
 	{
-		$object = new AdherentType($db);
+		$object = new AssetType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
 
@@ -715,7 +722,7 @@ if ($rowid > 0)
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
@@ -723,7 +730,7 @@ if ($rowid > 0)
 		print '</table>';
 
 		// Extra field
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook))
 		{
 			print '<br><br><table class="border" width="100%">';
 			foreach($extrafields->attribute_label as $key=>$label)
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 69a9a96f032..8cd5ff979a0 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -28,8 +28,6 @@
  * 				write = system,call,log,verbose,command,agent,user
  */
 
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
 if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN','1');
 if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK','1');
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 5e684b4091d..806a88325fb 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -212,7 +212,8 @@ if ($conf->societe->enabled)
 {
 	$nbno=$nbtotal=0;
 
-	print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','object_company');
+	print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','title_companies');
+
 	print '<br>'."\n";
 	$sql="SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe where barcode IS NULL or barcode = ''";
 	$resql=$db->query($sql);
@@ -253,7 +254,7 @@ if ($conf->product->enabled || $conf->product->service)
 
 	$nbno=$nbtotal=0;
 
-	print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','object_product');
+	print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','title_products');
 	print '<br>'."\n";
 
 	$sql ="SELECT count(rowid) as nb, fk_product_type, datec";
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
index 929fd8401d5..7bde15aa879 100644
--- a/htdocs/blockedlog/ajax/authority.php
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -27,10 +27,8 @@
 // Directory to scan (full path) is inside POST['dir'].
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
 if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 
 $res=require '../../master.inc.php';
 
diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
index 24fd71f0514..873b904e7a2 100644
--- a/htdocs/blockedlog/ajax/block-add.php
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -27,10 +27,8 @@
 // Directory to scan (full path) is inside POST['dir'].
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
 if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 
 $res=require '../../main.inc.php';
 
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index d4d4eef4e07..7a4ebebb2cf 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -27,10 +27,8 @@
 // Directory to scan (full path) is inside POST['dir'].
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
 if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 
 
 require '../../main.inc.php';
diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
index 4b50474b4a9..199f9051e07 100644
--- a/htdocs/blockedlog/ajax/check_signature.php
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -27,10 +27,8 @@
 // Directory to scan (full path) is inside POST['dir'].
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
 if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 
 
 require '../../main.inc.php';
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index b580b947e6b..0210491fba7 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -313,12 +313,15 @@ class BlockedLog
 	 *      @param		Object		$object     object to store
 	 *      @param		string		$action     action
 	 *      @param		string		$amounts    amounts
+	 *      @param		User		$fuser		User object (forced)
 	 *      @return		int						>0 if OK, <0 if KO
 	 */
-	public function setObjectData(&$object, $action, $amounts)
+	public function setObjectData(&$object, $action, $amounts, $fuser = null)
 	{
 		global $langs, $user, $mysoc;
 
+		if (is_object($fuser)) $user = $fuser;
+
 		// Generic fields
 
 		// action
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index b1262b7a554..fa46f683e50 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -81,7 +81,13 @@ $userstatic=new User($db);
 
 llxHeader('', $langs->trans("ListOfBookmarks"));
 
-$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=create">'.$langs->trans('NewBookmark').'</a>';
+$newcardbutton='';
+if ($user->rights->bookmark->creer)
+{
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=create">'.$langs->trans('NewBookmark');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
+}
 
 print_barre_liste($langs->trans("ListOfBookmarks"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', -1, '', 'title_generic.png', 0, $newcardbutton);
 
@@ -119,12 +125,10 @@ if ($resql)
 	print_liste_field_titre('');
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
 
-
 		print '<tr class="oddeven">';
 
 		// Id
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 769a69a23fa..a0e992e9da9 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -292,7 +292,7 @@ class Facturation
         else if ( $aId == 'RESET' )
         {
 
-            $this->id = NULL;
+            $this->id = null;
 
         }
         else
@@ -318,7 +318,7 @@ class Facturation
         }
         else if ( $aRef == 'RESET' )
         {
-            $this->ref = NULL;
+            $this->ref = null;
         }
         else
         {
@@ -342,7 +342,7 @@ class Facturation
         else if ( $aQte == 'RESET' )
         {
 
-            $this->qte = NULL;
+            $this->qte = null;
         }
         else
         {
@@ -366,7 +366,7 @@ class Facturation
         }
         else if ( $aStock == 'RESET' )
         {
-            $this->stock = NULL;
+            $this->stock = null;
         }
         else
         {
@@ -390,7 +390,7 @@ class Facturation
         }
         else if ($aRemisePercent == 'RESET')
         {
-            $this->remise_percent = NULL;
+            $this->remise_percent = null;
         }
         else
         {
@@ -414,7 +414,7 @@ class Facturation
 
         } else if ( $aMontantRemise == 'RESET' ) {
 
-            $this->montant_remise = NULL;
+            $this->montant_remise = null;
 
         } else {
 
@@ -439,7 +439,7 @@ class Facturation
 
         } else if ( $aPrix == 'RESET' ) {
 
-            $this->prix = NULL;
+            $this->prix = null;
 
         } else {
 
@@ -463,7 +463,7 @@ class Facturation
 
         } else if ( $aTva == 'RESET' ) {
 
-            $this->tva = NULL;
+            $this->tva = null;
 
         } else {
 
@@ -487,7 +487,7 @@ class Facturation
 
         } else if ( $aNumFacture == 'RESET' ) {
 
-            $this->num_facture = NULL;
+            $this->num_facture = null;
 
         } else {
 
@@ -511,7 +511,7 @@ class Facturation
 
         } else if ( $aModeReglement == 'RESET' ) {
 
-            $this->mode_reglement = NULL;
+            $this->mode_reglement = null;
 
         } else {
 
@@ -536,7 +536,7 @@ class Facturation
 
         } else if ( $aMontantEncaisse == 'RESET' ) {
 
-            $this->montant_encaisse = NULL;
+            $this->montant_encaisse = null;
 
         } else {
 
@@ -560,7 +560,7 @@ class Facturation
             return $this->montant_rendu;
         } else if ( $aMontantRendu == 'RESET' ) {
 
-            $this->montant_rendu = NULL;
+            $this->montant_rendu = null;
 
         } else {
 
@@ -584,7 +584,7 @@ class Facturation
 
         } else if ( $aPaiementLe == 'RESET' ) {
 
-            $this->paiement_le = NULL;
+            $this->paiement_le = null;
 
         } else {
 
@@ -607,7 +607,7 @@ class Facturation
 
         } else if ( $aTotalHt == 'RESET' ) {
 
-            $this->prix_total_ht = NULL;
+            $this->prix_total_ht = null;
 
         } else {
 
@@ -630,7 +630,7 @@ class Facturation
 
         } else if ( $aMontantTva == 'RESET' ) {
 
-            $this->montant_tva = NULL;
+            $this->montant_tva = null;
 
         } else {
 
@@ -654,7 +654,7 @@ class Facturation
         }
         else if ( $aTotalTtc == 'RESET' )
         {
-            $this->prix_total_ttc = NULL;
+            $this->prix_total_ttc = null;
         }
         else
         {
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 72fbd509535..e1a1dcc6bc8 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -24,16 +24,12 @@
  */
 
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');
 
 // Change this following line to use the correct relative path (../, ../../, etc)
 require '../main.inc.php';
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index c1564e1b892..518d8903edd 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -38,7 +38,7 @@ $action=GETPOST('action','aZ09');
  *	Actions
  */
 
-if (preg_match('/set_(.*)/',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
@@ -52,7 +52,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
     }
 }
 
-if (preg_match('/del_(.*)/',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 9f49e42f060..60689dd37aa 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -268,7 +268,7 @@ if ($user->rights->categorie->creer)
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 46332f9f979..c559d760f0f 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -172,7 +172,7 @@ class Categories extends DolibarrApi
      * @param array $request_data   Request data
      * @return int  ID of category
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->categorie->creer) {
 			throw new RestException(401);
@@ -197,7 +197,7 @@ class Categories extends DolibarrApi
      * @param array $request_data   Datas
      * @return int
      */
-    function put($id, $request_data = NULL)
+    function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->categorie->creer) {
 			throw new RestException(401);
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index d8d5b10a2b5..044f3e68c0f 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -338,28 +338,23 @@ class Categorie extends CommonObject
 
 				$action='create';
 
-				// Actions on extra fields (by external module or standard code)
-				// TODO the hook duplicates the 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
-				if (empty($reshook))
+				// Actions on extra fields
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					$result=$this->insertExtraFields();
+					if ($result < 0)
 					{
-						$result=$this->insertExtraFields();
-						if ($result < 0)
-						{
-							$error++;
-						}
+						$error++;
 					}
 				}
-				else if ($reshook < 0) $error++;
 
-                // Call trigger
-                $result=$this->call_trigger('CATEGORY_CREATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				if (! $error)
+				{
+	                // Call trigger
+    	            $result=$this->call_trigger('CATEGORY_CREATE',$user);
+        	        if ($result < 0) { $error++; }
+            	    // End call triggers
+				}
 
                 if ( ! $error )
                 {
@@ -432,28 +427,23 @@ class Categorie extends CommonObject
 		{
 			$action='update';
 
-			// Actions on extra fields (by external module or standard code)
-			// TODO the hook duplicates the 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
-			if (empty($reshook))
+			// Actions on extra fields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 
-            // Call trigger
-            $result=$this->call_trigger('CATEGORY_MODIFY',$user);
-            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-            // End call triggers
+			if (! $error)
+			{
+	            // Call trigger
+    	        $result=$this->call_trigger('CATEGORY_MODIFY',$user);
+        	    if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            	// End call triggers
+			}
 
 			$this->db->commit();
 
@@ -771,11 +761,9 @@ class Categorie extends CommonObject
 		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			// Save object we want to unlink category off into category instance to provide information to trigger
-			$this->unlinkoff=$obj;
-
             // Call trigger
-            $result=$this->call_trigger('CATEGORY_UNLINK',$user);
+			$this->context=array('unlinkoff'=>$obj);	// Save object we want to link category to into category instance to provide information to trigger
+			$result=$this->call_trigger('CATEGORY_UNLINK',$user);
             if ($result < 0) { $error++; }
             // End call triggers
 
@@ -905,24 +893,22 @@ class Categorie extends CommonObject
 		$sql.= ' AND s.rowid = sub.fk_categorie';
 		$sql.= ' AND sub.'.$subcol_name.' = '.$id;
 
+		$sql.= $this->db->order($sortfield, $sortorder);
+
 		$nbtotalofrecords = '';
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 		{
 			$result = $this->db->query($sql);
 			$nbtotalofrecords = $this->db->num_rows($result);
-		}
-
-		$sql.= $this->db->order($sortfield, $sortorder);
-		if ($limit)	{
-			if ($page < 0)
+			if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
 			{
 				$page = 0;
+				$offset = 0;
 			}
-			$offset = $limit * $page;
-
-			$sql.= $this->db->plimit($limit + 1, $offset);
 		}
 
+		$sql.= $this->db->plimit($limit + 1, $offset);
+
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -1219,30 +1205,6 @@ class Categorie extends CommonObject
 		}
 	}
 
-	/**
-	 * 	Returns total number of categories
-	 *
-	 *	@return		int		Number of categories
-	 *	@deprecated function not used ?
-	 */
-	function get_nb_categories()
-	{
-		$sql = "SELECT count(rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE entity IN (".getEntity('category').")";
-		$res = $this->db->query($sql);
-		if ($res)
-		{
-			$res = $this->db->fetch_array($res);
-			return $res[0];
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
 	/**
 	 * 	Check if no category with same label already exists for this cat's parent or root and for this cat's type
 	 *
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 4ccd9116d74..67190aee2e2 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -176,7 +176,7 @@ print '</td></tr>';
 $parameters=array();
 $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (empty($reshook) && ! empty($extrafields->attribute_label))
+if (empty($reshook))
 {
 	print $object->showOptionals($extrafields,'edit');
 }
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index f6a0417bbda..825abfc5fe5 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -368,13 +368,12 @@ if ($type == Categorie::TYPE_PRODUCT)
 				print '<td class="tdtop">'.$prod->label."</td>\n";
 				// Link to delete from category
 				print '<td align="right">';
-				$typeid=$object->type;
 				$permission=0;
-				if ($typeid == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
-				if ($typeid == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
-				if ($typeid == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
+				if ($type == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
+				if ($type == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
+				if ($type == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
 				if ($permission)
 				{
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$prod->id."'>";
@@ -416,13 +415,12 @@ if ($type == Categorie::TYPE_SUPPLIER)
 				print "</td>\n";
 				// Link to delete from category
 				print '<td align="right">';
-				$typeid=$object->type;
 				$permission=0;
-				if ($typeid == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
-				if ($typeid == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
-				if ($typeid == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
+				if ($type == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
+				if ($type == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
+				if ($type == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
 				if ($permission)
 				{
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
@@ -470,13 +468,12 @@ if($type == Categorie::TYPE_CUSTOMER)
 				print "</td>\n";
 				// Link to delete from category
 				print '<td align="right">';
-				$typeid=$object->type;
 				$permission=0;
-				if ($typeid == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
-				if ($typeid == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
-				if ($typeid == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
+				if ($type == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
+				if ($type == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
+				if ($type == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
 				if ($permission)
 				{
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
@@ -524,13 +521,12 @@ if ($type == Categorie::TYPE_MEMBER)
 				print '<td class="tdtop">'.$member->firstname."</td>\n";
 				// Link to delete from category
 				print '<td align="right">';
-				$typeid=$object->type;
 				$permission=0;
-				if ($typeid == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
-				if ($typeid == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
-				if ($typeid == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
+				if ($type == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
+				if ($type == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
+				if ($type == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
 				if ($permission)
 				{
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$member->id."'>";
@@ -575,14 +571,12 @@ if ($type == Categorie::TYPE_CONTACT)
 				print "</td>\n";
 				// Link to delete from category
 				print '<td align="right">';
-				$typeid=$object->type;
 				$permission=0;
-				if ($typeid == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
-				if ($typeid == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
-				if ($typeid == Categorie::TYPE_CONTACT)     $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
+				if ($type == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
+				if ($type == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
+				if ($type == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
 				if ($permission)
 				{
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$contact->id."'>";
@@ -629,14 +623,12 @@ if ($type == Categorie::TYPE_ACCOUNT)
                 print '<td class="tdtop">'.$account->number."</td>\n";
                 // Link to delete from category
                 print '<td align="right">';
-                $typeid=$object->type;
                 $permission=0;
-                if ($typeid == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
-                if ($typeid == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
-                if ($typeid == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
-                if ($typeid == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
-                if ($typeid == Categorie::TYPE_ACCOUNT)      $permission=$user->rights->banque->configurer;
-                if ($typeid == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
+                if ($type == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
+                if ($type == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
+                if ($type == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
+                if ($type == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
+                if ($type == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
                 if ($permission)
                 {
                     print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$account->id."'>";
@@ -676,20 +668,18 @@ if ($type == Categorie::TYPE_PROJECT)
 			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
-				print $project->getNomUrl(1,0);
+				print $project->getNomUrl(1);
 				print "</td>\n";
 				print '<td class="tdtop">'.$project->ref."</td>\n";
 				print '<td class="tdtop">'.$project->title."</td>\n";
 				// Link to delete from category
 				print '<td align="right">';
-				$typeid=$object->type;
 				$permission=0;
-				if ($typeid == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
-				if ($typeid == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
-				if ($typeid == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
-				if ($typeid == Categorie::TYPE_ACCOUNT)      $permission=$user->rights->banque->configurer;
-				if ($typeid == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
+				if ($type == Categorie::TYPE_PRODUCT)     $permission=($user->rights->produit->creer || $user->rights->service->creer);
+				if ($type == Categorie::TYPE_SUPPLIER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_CUSTOMER)    $permission=$user->rights->societe->creer;
+				if ($type == Categorie::TYPE_MEMBER)      $permission=$user->rights->adherent->creer;
+				if ($type == Categorie::TYPE_PROJECT)     $permission=$user->rights->projet->creer;
 				if ($permission)
 				{
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$project->id."'>";
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index d0d97f83435..fb9c5944baf 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -908,7 +908,7 @@ if ($action == 'create')
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -1260,7 +1260,7 @@ if ($id > 0)
         $parameters=array();
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 7960bbd764d..5234a05db43 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -384,23 +384,15 @@ class ActionComm extends CommonObject
             {
             	$action='create';
 
-	            // Actions on extra fields (by external module or standard code)
-				// 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
-	            if (empty($reshook))
-	            {
-	            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-	            	{
-	            		$result=$this->insertExtraFields();
-	            		if ($result < 0)
-	            		{
-	            			$error++;
-	            		}
-	            	}
+	            // Actions on extra fields
+            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            	{
+            		$result=$this->insertExtraFields();
+            		if ($result < 0)
+            		{
+            			$error++;
+            		}
 	            }
-	            else if ($reshook < 0) $error++;
             }
 
             if (! $error && ! $notrigger)
@@ -865,23 +857,15 @@ class ActionComm extends CommonObject
         {
 			$action='update';
 
-        	// Actions on extra fields (by external module or standard code)
-			// 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
-        	if (empty($reshook))
-        	{
-        		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-        		{
-        			$result=$this->insertExtraFields();
-        			if ($result < 0)
-        			{
-        				$error++;
-        			}
-        		}
+        	// Actions on extra fields
+       		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+       		{
+       			$result=$this->insertExtraFields();
+       			if ($result < 0)
+       			{
+       				$error++;
+       			}
         	}
-        	else if ($reshook < 0) $error++;
 
             // Now insert assignedusers
 			if (! $error)
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index b507d9c72b9..f5d9c7db762 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -187,7 +187,7 @@ class AgendaEvents extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int                     ID of Agenda Event
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
       if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
@@ -226,7 +226,7 @@ class AgendaEvents extends DolibarrApi
      * @return int
      */
     /*
-    function put($id, $request_data = NULL) {
+    function put($id, $request_data = null) {
       if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9fae2dd47a9..d967d94e9e1 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
@@ -44,7 +44,7 @@ if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MA
 if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
 $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 
-$filter = GETPOST("filter",'',3);
+$filter = GETPOST("filter",'alpha',3);
 $filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
@@ -59,7 +59,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page","int");
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="a.datec";
@@ -85,8 +85,8 @@ $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"):0;
 $pid=GETPOST("projectid","int",3);
-$status=GETPOST("status");
-$type=GETPOST("type");
+$status=GETPOST("status",'aZ09');		// status may be 0, 50, 100, 'todo'
+$type=GETPOST("type",'az09');
 $maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('actioncode','array'))
@@ -102,7 +102,10 @@ if ($actioncode == '' && empty($actioncodearray)) $actioncode=(empty($conf->glob
 
 if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
-
+if ($action == 'default')
+{
+	$action = ((! empty($conf->global->AGENDA_DEFAULT_VIEW) && $conf->global->AGENDA_DEFAULT_VIEW!='show_list') ? $conf->global->AGENDA_DEFAULT_VIEW : 'show_month');
+}
 if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week')  {
     $action='show_month'; $day='';
 }                                                   // View by month
@@ -126,7 +129,7 @@ $hookmanager->initHooks(array('agenda'));
  * Actions
  */
 
-if (GETPOST("viewlist") || $action == 'show_list')
+if (GETPOST("viewlist",'alpha') || $action == 'show_list')
 {
     $param='';
     if (is_array($_POST))
@@ -142,7 +145,7 @@ if (GETPOST("viewlist") || $action == 'show_list')
     exit;
 }
 
-if (GETPOST("viewperuser") || $action == 'show_peruser')
+if (GETPOST("viewperuser",'alpha') || $action == 'show_peruser')
 {
     $param='';
     if (is_array($_POST))
@@ -677,7 +680,7 @@ if ($showbirthday)
     $sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
     $sql.= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
     $sql.= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';
-    $sql.= " AND sp.entity IN (".getEntity('societe').")";
+    $sql.= " AND sp.entity IN (".getEntity('socpeople').")";
     if ($action == 'show_day')
     {
         $sql.= ' AND MONTH(birthday) = '.$month;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 9221c7d2ede..cca1f59bf8e 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -25,12 +25,15 @@
  *		\brief      Page to list actions
  */
 
+if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 $langs->loadLangs(array("users","companies","agenda","commercial"));
 
@@ -64,7 +67,7 @@ $dateend=dol_mktime(0, 0, 0, GETPOST('dateendmonth','int'), GETPOST('dateendday'
 if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
 
-$filter = GETPOST("filter",'',3);
+$filter = GETPOST("filter",'alpha',3);
 $filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
@@ -318,6 +321,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit + 1, $offset);
@@ -397,6 +405,7 @@ if ($resql)
     	$s = $hookmanager->resPrint;
     }
 
+    $newcardbutton='';
     if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
     {
         $tmpforcreatebutton=dol_getdate(dol_now(), true);
@@ -405,12 +414,12 @@ if ($resql)
 
         //$param='month='.$monthshown.'&year='.$year;
         $hourminsec='100000';
-        $link = '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d",$tmpforcreatebutton['year'],$tmpforcreatebutton['mon'],$tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'">';
-        $link.= $langs->trans("AddAction");
-        $link.= '</a>';
+        $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d",$tmpforcreatebutton['year'],$tmpforcreatebutton['mon'],$tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'">'.$langs->trans("AddAction");
+        $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        $newcardbutton.= '</a>';
     }
 
-    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav.$link, '', $limit);
+    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav.$newcardbutton, '', $limit);
 
     $moreforfilter='';
 
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 2d72fa4c3f8..93cbae527f1 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -38,7 +38,7 @@ $action=GETPOST('action','alpha');
 $month=GETPOST('month');
 $year=GETPOST('year');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -93,6 +93,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1,$offset);
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 5c160bfab16..fe2e3027dcf 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -34,7 +34,7 @@ $page=GETPOST('page', 'int');
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="p.name";
 if ($page < 0) { $page = 0; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 
 $type=GETPOST('type', 'alpha');
@@ -78,7 +78,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREF
 $sql.= " ".MAIN_DB_PREFIX."socpeople as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND p.entity IN (".getEntity('societe').")";
+$sql.= " AND p.entity IN (".getEntity('socpeople').")";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($type == "c") $sql.= " AND s.client IN (1, 3)";
 if ($type == "p") $sql.= " AND s.client IN (2, 3)";
@@ -144,14 +144,11 @@ if ($resql)
 	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
 	print "</tr>\n";
 
-	$var=True;
 	$i = 0;
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
 
-
-
 		print '<tr class="oddeven">';
 		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"),"contact");
 		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 255bb036c93..eab813653d6 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -228,7 +228,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
     if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     $sql.= " WHERE p.fk_statut = 0";
     $sql.= " AND p.fk_soc = s.rowid";
-    $sql.= " AND p.entity IN (".getEntity('propal').")";
+    $sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
     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;
 
@@ -349,7 +349,12 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
                 $companystatic->canvas=$obj->canvas;
 				print $companystatic->getNomUrl(1,'customer',16);
 				print '</td>';
-				print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
+				if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
+					print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
+				}
+				else {
+					print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
+				}
 				$i++;
 				$total += $obj->total_ttc;
 			}
@@ -432,7 +437,12 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
                 $companystatic->canvas=$obj->canvas;
                 print $companystatic->getNomUrl(1,'supplier',16);
                 print '</td>';
-                print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
+				if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
+					print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
+				}
+				else {
+					print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
+				}
                 $i++;
                 $total += $obj->total_ttc;
             }
@@ -744,7 +754,12 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
                 print '</td>';
 				print '<td align="right">';
 				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
-				print '<td align="right">'.price($obj->total_ttc).'</td>';
+				if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
+					print '<td align="right">'.price($obj->total_ht).'</td>';
+				}
+				else {
+					print '<td align="right">'.price($obj->total_ttc).'</td>';
+				}
 				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
 				print '</tr>'."\n";
 				$i++;
@@ -843,7 +858,12 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
                 print '</td>';
 				print '<td align="right">';
 				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
-				print '<td align="right">'.price($obj->total_ttc).'</td>';
+				if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
+					print '<td align="right">'.price($obj->total_ht).'</td>';
+				}
+				else {
+					print '<td align="right">'.price($obj->total_ttc).'</td>';
+				}
 				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut,$obj->billed,3).'</td>'."\n";
 				print '</tr>'."\n";
 				$i++;
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index a8bbb05fb84..bb68f85ea16 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -244,7 +244,7 @@ if (empty($reshook))
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
 							}
 						}
-						/* For backward compatibility */
+						/* For backward compatibility, deprecated */
 						if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
 						{
 							$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
@@ -754,7 +754,7 @@ if ($action == 'create')
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -1235,7 +1235,7 @@ else
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			if (empty($reshook))
 			{
 				print $object->showOptionals($extrafields,'edit');
 			}
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 48949881659..676c9c3e98e 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -425,7 +425,13 @@ if ($object->fetch($id) >= 0)
 	{
 	    $result = $db->query($sql);
 	    $nbtotalofrecords = $db->num_rows($result);
+	    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	    {
+	    	$page = 0;
+	    	$offset = 0;
+	    }
 	}
+
 	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
 	$sql .= $db->plimit($limit+1, $offset);
 
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 52eacf6c115..4175c4e4446 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -52,7 +52,6 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 //if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 //{
     // Recherche emails
-    $var=false;
     print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
@@ -62,7 +61,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
     print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     print '<tr class="oddeven"><td class="nowrap">';
     print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
-    
+
     print "</table></form><br>\n";
 //}
 
@@ -74,7 +73,6 @@ print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("TargetsStatistic
 $dir=DOL_DOCUMENT_ROOT."/core/modules/mailings";
 $handle=opendir($dir);
 
-$var=True;
 if (is_resource($handle))
 {
     while (($file = readdir($handle))!==false)
@@ -106,8 +104,6 @@ if (is_resource($handle))
                 // Si le module mailing est qualifi�
                 if ($qualified)
                 {
-                    $var = !$var;
-
                     foreach ($mailmodule->getSqlArrayForStats() as $sql)
                     {
                         print '<tr class="oddeven">';
@@ -169,14 +165,12 @@ if ($result)
 
   $num = $db->num_rows($result);
   if ($num > 0)
-    {
-      $var = true;
+  {
       $i = 0;
 
-      while ($i < $num )
+    while ($i < $num )
 	{
 	  $obj = $db->fetch_object($result);
-	  
 
 	  print '<tr class="oddeven">';
 	  print '<td class="nowrap"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index f9fad78a1f0..a85e5e4c01e 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -32,7 +32,7 @@ $result=restrictedArea($user,'mailing');
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -104,7 +104,13 @@ if ($result)
 	$title=$langs->trans("ListOfEMailings");
 	if ($filteremail) $title.=' ('.$langs->trans("SentTo",$filteremail).')';
 
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?action=create">'.$langs->trans('NewMailing').'</a>';
+	$newcardbutton='';
+	if ($user->rights->mailing->creer)
+	{
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?action=create">'.$langs->trans('NewMailing');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
+	}
 
 	$i = 0;
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 8be7fa249b8..004b32a83fc 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1745,11 +1745,12 @@ if ($action == 'create')
 	{
 		//Form to close proposal (signed or not)
 		$formquestion = array(
-				array('type' => 'select','name' => 'statut','label' => $langs->trans("CloseAs"),'values' => array(2=>$object->labelstatut [2],3=>$object->labelstatut [3])),
-				array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"),'value' => '')				// Field to complete private note (not replace)
+			array('type' => 'select','name' => 'statut','label' => $langs->trans("CloseAs"),'values' => array(2=>$object->LibStatut(Propal::STATUS_SIGNED), 3=>$object->LibStatut(Propal::STATUS_NOTSIGNED))),
+			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"),'value' => '')				// Field to complete private note (not replace)
 		);
 
-		if (! empty($conf->notification->enabled)) {
+		if (! empty($conf->notification->enabled))
+		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
 			$formquestion = array_merge($formquestion, array(
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 63b26373f60..d153489dcc8 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -176,7 +176,7 @@ class Proposals extends DolibarrApi
 	 * @param   array   $request_data   Request data
 	 * @return  int     ID of proposal
 	 */
-	function post($request_data = NULL)
+	function post($request_data = null)
 	{
 	  if(! DolibarrApiAccess::$user->rights->propal->creer) {
 			  throw new RestException(401, "Insuffisant rights");
@@ -241,7 +241,7 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 */
-	function postLine($id, $request_data = NULL)
+	function postLine($id, $request_data = null)
 	{
 		if(! DolibarrApiAccess::$user->rights->propal->creer) {
 		  	throw new RestException(401);
@@ -307,7 +307,7 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return object
 	 */
-	function putLine($id, $lineid, $request_data = NULL)
+	function putLine($id, $lineid, $request_data = null)
 	{
 		if(! DolibarrApiAccess::$user->rights->propal->creer) {
 			throw new RestException(401);
@@ -410,7 +410,7 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 */
-	function put($id, $request_data = NULL) {
+	function put($id, $request_data = null) {
 	  if(! DolibarrApiAccess::$user->rights->propal->creer) {
 		  	throw new RestException(401);
 		  }
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 6e98329a4cc..b6e9d1411c5 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -142,9 +142,9 @@ class Propal extends CommonObject
 
 	public $cond_reglement_code;
 	public $mode_reglement_code;
-	public $remise;
-	public $remise_percent;
-	public $remise_absolue;
+	public $remise = 0;
+	public $remise_percent = 0;
+	public $remise_absolue = 0;
 	public $fk_address;
 	public $address_type;
 	public $address;
@@ -198,6 +198,7 @@ class Propal extends CommonObject
 	 */
 	const STATUS_BILLED = 4;   // Todo rename into STATUS_CLOSE ?
 
+
 	/**
 	 *	Constructor
 	 *
@@ -210,26 +211,13 @@ class Propal extends CommonObject
 		global $conf,$langs;
 
 		$this->db = $db;
+
 		$this->socid = $socid;
 		$this->id = $propalid;
+
 		$this->products = array();
-		$this->remise = 0;
-		$this->remise_percent = 0;
-		$this->remise_absolue = 0;
 
 		$this->duree_validite=$conf->global->PROPALE_VALIDITY_DURATION;
-
-		$langs->load("propal");
-		$this->labelstatut[0]=(! empty($conf->global->PROPAL_STATUS_DRAFT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFT_LABEL : $langs->trans("PropalStatusDraft"));
-		$this->labelstatut[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATED_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATED_LABEL : $langs->trans("PropalStatusValidated"));
-		$this->labelstatut[2]=(! empty($conf->global->PROPAL_STATUS_SIGNED_LABEL) ? $conf->global->PROPAL_STATUS_SIGNED_LABEL : $langs->trans("PropalStatusSigned"));
-		$this->labelstatut[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNED_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNED_LABEL : $langs->trans("PropalStatusNotSigned"));
-		$this->labelstatut[4]=(! empty($conf->global->PROPAL_STATUS_BILLED_LABEL) ? $conf->global->PROPAL_STATUS_BILLED_LABEL : $langs->trans("PropalStatusBilled"));
-		$this->labelstatut_short[0]=(! empty($conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL : $langs->trans("PropalStatusDraftShort"));
-		$this->labelstatut_short[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened"));
-		$this->labelstatut_short[2]=(! empty($conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL : $langs->trans("PropalStatusSignedShort"));
-		$this->labelstatut_short[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("PropalStatusNotSignedShort"));
-		$this->labelstatut_short[4]=(! empty($conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL : $langs->trans("PropalStatusBilledShort"));
 	}
 
 
@@ -1114,12 +1102,8 @@ class Propal extends CommonObject
 					{
 						$action='update';
 
-						// Actions on extra fields (by external module or standard code)
-						// 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
-						if (empty($reshook))
+						// Actions on extra fields
+						if (! $error)
 						{
 							if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 							{
@@ -1130,9 +1114,8 @@ class Propal extends CommonObject
 								}
 							}
 						}
-						else if ($reshook < 0) $error++;
 
-						if (! $notrigger)
+						if (! $error && ! $notrigger)
 						{
 							// Call trigger
 							$result=$this->call_trigger('PROPAL_CREATE',$user);
@@ -1658,7 +1641,7 @@ class Propal extends CommonObject
 
 			$this->db->free($result);
 
-			return 1;
+			return $num;
 		}
 		else
 		{
@@ -3096,10 +3079,24 @@ class Propal extends CommonObject
 	 *    	@param      int			$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
 	 *    	@return     string		Label
 	 */
-	 function LibStatut($statut,$mode=1)
+	function LibStatut($statut,$mode=1)
 	{
-		global $langs;
-		$langs->load("propal");
+		// Init/load array of translation of status
+		if (empty($this->labelstatut) || empty($this->labelstatut_short))
+		{
+			global $langs;
+			$langs->load("propal");
+			$this->labelstatut[0]=(! empty($conf->global->PROPAL_STATUS_DRAFT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFT_LABEL : $langs->trans("PropalStatusDraft"));
+			$this->labelstatut[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATED_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATED_LABEL : $langs->trans("PropalStatusValidated"));
+			$this->labelstatut[2]=(! empty($conf->global->PROPAL_STATUS_SIGNED_LABEL) ? $conf->global->PROPAL_STATUS_SIGNED_LABEL : $langs->trans("PropalStatusSigned"));
+			$this->labelstatut[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNED_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNED_LABEL : $langs->trans("PropalStatusNotSigned"));
+			$this->labelstatut[4]=(! empty($conf->global->PROPAL_STATUS_BILLED_LABEL) ? $conf->global->PROPAL_STATUS_BILLED_LABEL : $langs->trans("PropalStatusBilled"));
+			$this->labelstatut_short[0]=(! empty($conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL : $langs->trans("PropalStatusDraftShort"));
+			$this->labelstatut_short[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened"));
+			$this->labelstatut_short[2]=(! empty($conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL : $langs->trans("PropalStatusSignedShort"));
+			$this->labelstatut_short[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("PropalStatusNotSignedShort"));
+			$this->labelstatut_short[4]=(! empty($conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL : $langs->trans("PropalStatusBilledShort"));
+		}
 
 		$statuttrans='';
 		if ($statut==self::STATUS_DRAFT) $statuttrans='statut0';
@@ -3819,6 +3816,8 @@ class PropaleLigne extends CommonObjectLine
 				$this->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
 
+				$this->fetch_optionals();
+
 				$this->db->free($result);
 
 				return 1;
@@ -3953,7 +3952,7 @@ class PropaleLigne extends CommonObjectLine
 				}
 			}
 
-			if (! $notrigger)
+			if (! $error && ! $notrigger)
 			{
 				// Call trigger
 				$result=$this->call_trigger('LINEPROPAL_INSERT',$user);
@@ -4136,7 +4135,7 @@ class PropaleLigne extends CommonObjectLine
 				}
 			}
 
-			if (! $notrigger)
+			if (! $error && ! $notrigger)
 			{
 				// Call trigger
 				$result=$this->call_trigger('LINEPROPAL_UPDATE',$user);
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 8ef875f0a23..aab9cfcb30a 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -160,7 +160,7 @@ if ($object->id > 0)
 
 	// Files infos
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 	print "</table>\n";
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 3259654ebcc..ced465dfdb7 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016      Ferran Marcet	 <fmarcet@2byte.es>
+ * Copyright (C) 2016-2018 Ferran Marcet	 <fmarcet@2byte.es>
  * Copyright (C) 2017      Charlene Benke	 <charlie@patas-monkey.com>
  * Copyright (C) 2018	   Nicolas ZABOURI	 <info@inovea-conseil.com>
  *
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-$langs->loadLangs(array('companies','propal','compta','bills','orders','products'));
+$langs->loadLangs(array('companies','propal','compta','bills','orders','products','deliveries'));
 
 $socid=GETPOST('socid','int');
 
@@ -76,6 +76,14 @@ $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $search_day=GETPOST("search_day","int");
 $search_month=GETPOST("search_month","int");
 $search_year=GETPOST("search_year","int");
+$search_dayfin=GETPOST("search_dayfin","int");
+$search_monthfin=GETPOST("search_monthfin","int");
+$search_yearfin=GETPOST("search_yearfin","int");
+$search_daydelivery=GETPOST("search_daydelivery","int");
+$search_monthdelivery=GETPOST("search_monthdelivery","int");
+$search_yeardelivery=GETPOST("search_yeardelivery","int");
+$search_availability=GETPOST('search_availability','int');
+$search_categ_cus=trim(GETPOST("search_categ_cus",'int'));
 
 $viewstatut=GETPOST('viewstatut','alpha');
 $optioncss = GETPOST('optioncss','alpha');
@@ -85,7 +93,7 @@ $sall=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alp
 $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -144,6 +152,8 @@ $arrayfields=array(
 	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
 	'p.date'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
 	'p.fin_validite'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
+	'p.date_livraison'=>array('label'=>$langs->trans("DeliveryDate"), 'checked'=>0),
+	'ava.rowid'=>array('label'=>$langs->trans("AvailabilityPeriod"), 'checked'=>0),
 	'p.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
 	'p.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
 	'p.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
@@ -201,10 +211,19 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_year='';
 	$search_month='';
 	$search_day='';
+	$search_yearfin='';
+	$search_monthfin='';
+	$search_dayfin='';
+	$search_yeardelivery='';
+	$search_monthdelivery='';
+	$search_daydelivery='';
+	$search_availability='';
 	$viewstatut='';
 	$object_statut='';
 	$toselect='';
 	$search_array_options=array();
+	$search_categ_cus=0;
+
 }
 if ($object_statut != '') $viewstatut=$object_statut;
 
@@ -242,12 +261,15 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
 $sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
 $sql.= " typent.code as typent_code,";
+$sql.= " ava.rowid as availability,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
+$sql.= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
 $sql.= ' p.datec as date_creation, p.tms as date_update,';
 $sql.= " pr.rowid as project_id, pr.ref as project_ref,";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
 $sql.= ' u.login';
+if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -258,12 +280,15 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+if (! empty($search_categ_cus)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+
 $sql.= ', '.MAIN_DB_PREFIX.'propal as p';
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."propal_extrafields as ef on (p.rowid = ef.fk_object)";
 if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
 if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_availability as ava on (ava.rowid = p.fk_availability)";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
@@ -285,6 +310,7 @@ if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search
 if ($search_ref)         $sql .= natural_search('p.ref', $search_ref);
 if ($search_refcustomer) $sql .= natural_search('p.ref_client', $search_refcustomer);
 if ($search_refproject) $sql .= natural_search('pr.ref', $search_refprojet);
+if ($search_availability) $sql .= " AND p.fk_availability IN (".$db->escape($search_availability).')';
 
 if ($search_societe)     $sql .= natural_search('s.nom', $search_societe);
 if ($search_login)       $sql .= natural_search("u.login", $search_login);
@@ -294,6 +320,9 @@ if ($search_montant_ttc != '') $sql.= natural_search("p.total", $search_montant_
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
+if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+if ($search_categ_cus == -2)   $sql.= " AND cc.fk_categorie IS NULL";
+
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$db->escape($search_product_category);
 if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
 if ($viewstatut != '' && $viewstatut != '-1')
@@ -313,6 +342,32 @@ else if ($search_year > 0)
 {
 	$sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 }
+if ($search_monthfin > 0)
+{
+	if ($search_yearfin > 0 && empty($search_dayfin))
+		$sql.= " AND p.fin_validite BETWEEN '".$db->idate(dol_get_first_day($search_yearfin,$search_monthfin,false))."' AND '".$db->idate(dol_get_last_day($search_yearfin,$search_monthfin,false))."'";
+	else if ($search_yearfin > 0 && ! empty($search_dayfin))
+		$sql.= " AND p.fin_validite BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_monthfin, $search_dayfin, $search_yearfin))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_monthfin, $search_dayfin, $search_yearfin))."'";
+	else
+		$sql.= " AND date_format(p.fin_validite, '%m') = '".$db->escape($search_monthfin)."'";
+}
+else if ($search_yearfin > 0)
+{
+	$sql.= " AND p.fin_validite BETWEEN '".$db->idate(dol_get_first_day($search_yearfin,1,false))."' AND '".$db->idate(dol_get_last_day($search_yearfin,12,false))."'";
+}
+if ($search_monthdelivery > 0)
+{
+	if ($search_yeardelivery > 0 && empty($search_daydelivery))
+		$sql.= " AND p.date_livraison BETWEEN '".$db->idate(dol_get_first_day($search_yeardelivery,$search_monthdelivery,false))."' AND '".$db->idate(dol_get_last_day($search_yeardelivery,$search_monthdelivery,false))."'";
+	else if ($search_yeardelivery > 0 && ! empty($search_daydelivery))
+		$sql.= " AND p.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_monthdelivery, $search_daydelivery, $search_yeardelivery))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_monthdelivery, $search_daydelivery, $search_yeardelivery))."'";
+	else
+		$sql.= " AND date_format(p.date_livraison, '%m') = '".$db->escape($search_monthdelivery)."'";
+}
+else if ($search_yeardelivery > 0)
+{
+	$sql.= " AND p.date_livraison BETWEEN '".$db->idate(dol_get_first_day($search_yeardelivery,1,false))."' AND '".$db->idate(dol_get_last_day($search_yeardelivery,12,false))."'";
+}
 if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$db->escape($search_sale);
 if ($search_user > 0)
 {
@@ -335,6 +390,12 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -380,6 +441,8 @@ if ($resql)
 	if ($search_zip)		 $param.='&search_zip='.urlencode($search_zip);
 	if ($socid > 0)          $param.='&socid='.urlencode($socid);
 	if ($optioncss != '')    $param.='&optioncss='.urlencode($optioncss);
+	if ($search_categ_cus > 0) $param.='&search_categ_cus='.urlencode($search_categ_cus);
+
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -397,7 +460,9 @@ if ($resql)
 	$newcardbutton='';
 	if ($user->rights->propal->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create">'.$langs->trans('NewPropal').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create">'.$langs->trans('NewPropal');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	// Lignes des champs de filtre
@@ -456,6 +521,14 @@ if ($resql)
 		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
+	if (! empty($conf->categorie->enabled))
+	{
+		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		$moreforfilter.='<div class="divsearchfield">';
+	 	$moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
+		$moreforfilter.=$formother->select_categories('customer',$search_categ_cus,'search_categ_cus',1);
+	 	$moreforfilter.='</div>';
+	}
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
@@ -479,25 +552,25 @@ if ($resql)
 	if (! empty($arrayfields['p.ref']['checked']))
 	{
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
  		print '</td>';
 	}
 	if (! empty($arrayfields['p.ref_client']['checked']))
 	{
 		print '<td class="liste_titre">';
-	   print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.$search_refcustomer.'">';
+		print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
 	   print '</td>';
 	}
 	if (! empty($arrayfields['pr.ref']['checked']))
 	{
     	print '<td class="liste_titre">';
-	   print '<input class="flat" size="6" type="text" name="search_refproject" value="'.$search_refproject.'">';
+    	print '<input class="flat" size="6" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
 	   print '</td>';
 	}
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" size="10" name="search_societe" value="'.$search_societe.'">';
+		print '<input class="flat" type="text" size="10" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 	   print '</td>';
 	}
 	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
@@ -521,15 +594,16 @@ if ($resql)
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print ajax_combobox('search_type_thirdparty');
 		print '</td>';
 	}
 	// Date
 	if (! empty($arrayfields['p.date']['checked']))
 	{
-		print '<td class="liste_titre" align="center">';
+		print '<td class="liste_titre nowraponall" align="center">';
 		//print $langs->trans('Month').': ';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
 		//print '&nbsp;'.$langs->trans('Year').': ';
 		$formother->select_year($search_year,'search_year',1, 20, 5);
 		print '</td>';
@@ -537,34 +611,59 @@ if ($resql)
 	// Date end
 	if (! empty($arrayfields['p.fin_validite']['checked']))
 	{
-	   print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre nowraponall" align="center">';
+		//print $langs->trans('Month').': ';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25" type="text" maxlength="2" name="search_dayfin" value="'.dol_escape_htmltag($search_dayfin).'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_monthfin" value="'.dol_escape_htmltag($search_monthfin).'">';
+		//print '&nbsp;'.$langs->trans('Year').': ';
+		$formother->select_year($search_yearfin,'search_yearfin',1, 20, 5);
+		print '</td>';
+	}
+	// Date delivery
+	if (! empty($arrayfields['p.date_livraison']['checked']))
+	{
+		print '<td class="liste_titre nowraponall" align="center">';
+		//print $langs->trans('Month').': ';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25" type="text" size="1" maxlength="2" name="search_daydelivery" value="'.dol_escape_htmltag($search_daydelivery).'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_monthdelivery" value="'.dol_escape_htmltag($search_monthdelivery).'">';
+		//print '&nbsp;'.$langs->trans('Year').': ';
+		$formother->select_year($search_yeardelivery,'search_yeardelivery',1, 20, 5);
+		print '</td>';
+	}
+	// Availability
+	if (! empty($arrayfields['ava.rowid']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print $form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
+		print ajax_combobox('search_availability');
+		print '</td>';
 	}
 	if (! empty($arrayfields['p.total_ht']['checked']))
 	{
 		// Amount
 		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['p.total_vat']['checked']))
 	{
 		// Amount
 		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['p.total_ttc']['checked']))
 	{
 		// Amount
 		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['u.login']['checked']))
 	{
 		// Author
 		print '<td class="liste_titre" align="center">';
-		print '<input class="flat" size="4" type="text" name="search_login" value="'.$search_login.'">';
+		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
 		print '</td>';
 	}
 	// Extra fields
@@ -615,6 +714,8 @@ if ($resql)
 	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
 	if (! empty($arrayfields['p.date']['checked']))           print_liste_field_titre($arrayfields['p.date']['label'],$_SERVER["PHP_SELF"],'p.datep','',$param, 'align="center"',$sortfield,$sortorder);
 	if (! empty($arrayfields['p.fin_validite']['checked']))   print_liste_field_titre($arrayfields['p.fin_validite']['label'],$_SERVER["PHP_SELF"],'dfv','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.date_livraison']['checked'])) print_liste_field_titre($arrayfields['p.date_livraison']['label'],$_SERVER["PHP_SELF"],'ddelivery','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['ava.rowid']['checked']))        print_liste_field_titre($arrayfields['ava.rowid']['label'],$_SERVER["PHP_SELF"],'availability','',$param, '',$sortfield,$sortorder);
 	if (! empty($arrayfields['p.total_ht']['checked']))       print_liste_field_titre($arrayfields['p.total_ht']['label'],$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['p.total_vat']['checked']))      print_liste_field_titre($arrayfields['p.total_vat']['label'],$_SERVER["PHP_SELF"],'p.tva','',$param, 'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['p.total_ttc']['checked']))      print_liste_field_titre($arrayfields['p.total_ttc']['label'],$_SERVER["PHP_SELF"],'p.total','',$param, 'align="right"',$sortfield,$sortorder);
@@ -780,6 +881,28 @@ if ($resql)
 			}
 			if (! $i) $totalarray['nbfield']++;
 		}
+		// Date delivery
+		if (! empty($arrayfields['p.date_livraison']['checked']))
+		{
+			if ($obj->ddelivery)
+			{
+				print '<td align="center">'.dol_print_date($db->jdate($obj->ddelivery),'day');
+				print '</td>';
+			}
+			else
+			{
+				print '<td>&nbsp;</td>';
+			}
+			if (! $i) $totalarray['nbfield']++;
+		}
+		// Availability
+		if (! empty($arrayfields['ava.rowid']['checked']))
+		{
+			print '<td align="center">';
+			$form->form_availability('', $obj->availability, 'none', 1);
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
 
 		// Amount HT
 		if (! empty($arrayfields['p.total_ht']['checked']))
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 273862f68bf..50ec740ea4a 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -329,7 +329,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
     print $px1->show();
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 57aa7ce8b04..57b98d1a29a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -28,9 +28,9 @@
  */
 
 /**
- * \file htdocs/commande/card.php
+ * \file 	htdocs/commande/card.php
  * \ingroup commande
- * \brief Page to show customer order
+ * \brief 	Page to show customer order
  */
 
 require '../main.inc.php';
@@ -68,6 +68,7 @@ $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $lineid = GETPOST('lineid', 'int');
+$projectid = GETPOST('projectid', 'int');
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
 
@@ -220,7 +221,7 @@ if (empty($reshook))
 	// Link to a project
 	else if ($action == 'classin' && $user->rights->commande->creer)
 	{
-		$object->setProject(GETPOST('projectid'));
+		$object->setProject(GETPOST('projectid','int'));
 	}
 
 	// Add order
@@ -251,8 +252,8 @@ if (empty($reshook))
 			$object->note_private = GETPOST('note_private','none');
 			$object->note_public = GETPOST('note_public','none');
 			$object->source = GETPOST('source_id');
-			$object->fk_project = GETPOST('projectid');
-			$object->ref_client = GETPOST('ref_client');
+			$object->fk_project = GETPOST('projectid','int');
+			$object->ref_client = GETPOST('ref_client','alpha');
 			$object->modelpdf = GETPOST('model');
 			$object->cond_reglement_id = GETPOST('cond_reglement_id');
 			$object->mode_reglement_id = GETPOST('mode_reglement_id');
@@ -1269,24 +1270,16 @@ if (empty($reshook))
 
 		if (! $error)
 		{
-			// Actions on extra fields (by external module or standard code)
-			$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
-																								  // some hooks
-			if (empty($reshook)) {
-				$result = $object->insertExtraFields('ORDER_MODIFY');
-				if ($result < 0)
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$error++;
-				}
-			} else if ($reshook < 0)
+			// Actions on extra fields
+			$result = $object->insertExtraFields('ORDER_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
+			}
 		}
 
-		if ($error)
-			$action = 'edit_extras';
+		if ($error) $action = 'edit_extras';
 	}
 
 	if ($action == 'set_thirdparty' && $user->rights->commande->creer)
@@ -1383,7 +1376,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 	if ($socid > 0)
 		$res = $soc->fetch($socid);
 
-	$projectid = 0;
 	$remise_absolue = 0;
 
 	$currency_code = $conf->currency;
@@ -1480,7 +1472,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 		$remise_percent     = $soc->remise_percent;
 		$remise_absolue     = 0;
 		$dateorder          = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER)?-1:'';
-		$projectid          = 0;
 
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 
@@ -1488,7 +1479,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 	}
 
-
 	print '<form name="crea_commande" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
@@ -1654,7 +1644,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	$parameters = array('objectsrc' => $objectsrc, 'socid'=>$socid);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
 	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
@@ -2623,9 +2613,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 			// Show online payment link
-			//$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
-			$useonlinepayment = $conf->global->ORDER_SHOW_ONLINE_PAYMENT_ON_ORDER;
-
+			$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
+			if (! empty($conf->global->ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER)) $useonlinepayment = 0;
 			if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment)
 			{
 				print '<br><!-- Link to pay -->';
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index cbd505a41b8..c0e494a1684 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -179,7 +179,7 @@ class Orders extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int     ID of order
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->commande->creer) {
 			  throw new RestException(401, "Insuffisant rights");
@@ -245,7 +245,7 @@ class Orders extends DolibarrApi
      *
      * @return int
      */
-    function postLine($id, $request_data = NULL) {
+    function postLine($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
@@ -308,7 +308,7 @@ class Orders extends DolibarrApi
      *
      * @return object
      */
-    function putLine($id, $lineid, $request_data = NULL) {
+    function putLine($id, $lineid, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
@@ -402,7 +402,7 @@ class Orders extends DolibarrApi
      *
      * @return int
      */
-    function put($id, $request_data = NULL) {
+    function put($id, $request_data = null) {
       if (! DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index dd0e41ee836..a38cc3a442d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -823,7 +823,7 @@ class Commande extends CommonOrder
                 	$line = $this->lines[$i];
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
+				    //if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
                 	if (! is_object($line)) $line = (object) $line;
 
                     // Reset fk_parent_line for no child products and special product
@@ -4208,7 +4208,7 @@ class OrderLine extends CommonOrderLine
 				}
 			}
 
-			if (! $notrigger)
+			if (! $error && ! $notrigger)
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('LINEORDER_UPDATE',$user);
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 205efc3ad91..2d97b06238b 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -102,6 +102,12 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit + 1, $offset);
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 5a3f0c1973f..84cc9977e20 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -164,7 +164,7 @@ if ($id > 0 || ! empty($ref))
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 		print "</table>\n";
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8048d5a618f..f97dbc00617 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -73,6 +73,7 @@ $socid=GETPOST('socid','int');
 $search_user=GETPOST('search_user','int');
 $search_sale=GETPOST('search_sale','int');
 $search_total_ht=GETPOST('search_total_ht','alpha');
+$search_categ_cus=trim(GETPOST("search_categ_cus",'int'));
 $optioncss = GETPOST('optioncss','alpha');
 $billed = GETPOST('billed','int');
 $viewstatut=GETPOST('viewstatut');
@@ -193,6 +194,7 @@ if (empty($reshook))
 		$billed='';
 		$toselect='';
 		$search_array_options=array();
+		$search_categ_cus=0;
 	}
 	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
 	 || GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
@@ -208,6 +210,7 @@ if (empty($reshook))
 	$uploaddir = $conf->commande->dir_output;
 	$trigger_name='ORDER_SENTBYMAIL';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	
 }
 
 
@@ -237,6 +240,8 @@ $sql.= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_clie
 $sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
 $sql.= ' c.date_creation as date_creation, c.tms as date_update,';
 $sql.= " p.rowid as project_id, p.ref as project_ref";
+if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -247,6 +252,7 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+if (! empty($search_categ_cus)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 $sql.= ', '.MAIN_DB_PREFIX.'commande as c';
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
 if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
@@ -327,6 +333,8 @@ if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$sear
 if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
 if ($search_total_ht != '') $sql.= natural_search('c.total_ht', $search_total_ht, 1);
 if ($search_project_ref != '') $sql.= natural_search("p.ref",$search_project_ref);
+if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+if ($search_categ_cus == -2)   $sql.= " AND cc.fk_categorie IS NULL";
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -342,6 +350,12 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
@@ -406,6 +420,8 @@ if ($resql)
 	if ($show_files)            $param.='&show_files=' .urlencode($show_files);
 	if ($optioncss != '')       $param.='&optioncss='.urlencode($optioncss);
 	if ($billed != '')			$param.='&billed='.urlencode($billed);
+	if ($search_categ_cus > 0) $param.='&search_categ_cus='.urlencode($search_categ_cus);
+
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -413,6 +429,8 @@ if ($resql)
 	$arrayofmassactions =  array(
 		'presend'=>$langs->trans("SendByMail"),
 		'builddoc'=>$langs->trans("PDFMerge"),
+		'cancelorders'=>$langs->trans("Cancel"),
+
 	);
 	if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 	if ($user->rights->commande->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
@@ -422,7 +440,9 @@ if ($resql)
 	$newcardbutton='';
 	if ($contextpage == 'orderlist' && $user->rights->commande->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create">'.$langs->trans('NewOrder').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/commande/card.php?action=create">'.$langs->trans('NewOrder');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	// Lines of title fields
@@ -530,6 +550,14 @@ if ($resql)
 		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
+	if (! empty($conf->categorie->enabled))
+	{
+		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		$moreforfilter.='<div class="divsearchfield">';
+	 	$moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
+		$moreforfilter.=$formother->select_categories('customer',$search_categ_cus,'search_categ_cus',1);
+	 	$moreforfilter.='</div>';
+	}
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
@@ -604,17 +632,17 @@ if ($resql)
 	// Date order
 	if (! empty($arrayfields['c.date_commande']['checked']))
 	{
-		print '<td class="liste_titre" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_ordermonth" value="'.$search_ordermonth.'">';
+		print '<td class="liste_titre nowraponall" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_ordermonth" value="'.$search_ordermonth.'">';
 		$formother->select_year($search_orderyear?$search_orderyear:-1,'search_orderyear',1, 20, 5);
 		print '</td>';
 	}
 	if (! empty($arrayfields['c.date_delivery']['checked']))
 	{
-		print '<td class="liste_titre" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_deliverymonth" value="'.$search_deliverymonth.'">';
+		print '<td class="liste_titre nowraponall" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliverymonth" value="'.$search_deliverymonth.'">';
 		$formother->select_year($search_deliveryyear?$search_deliveryyear:-1,'search_deliveryyear',1, 20, 5);
 		print '</td>';
 	}
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index bebcaa93097..c9acc111dc4 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -472,7 +472,7 @@ if ($action == 'create' && !$error)
 	$parameters=array('objectsrc' => $objectsrc, 'idsrc' => $listoforders);
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		$object=new Facture($db);
 		print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index b1baf7332a1..27d177cfbd3 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -354,7 +354,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
     print $px1->show();
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index 27a167bc576..5e83b3032c1 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -20,16 +20,11 @@
  *       \brief      File to return Ajax response on payment breakdown process
  */
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
 
 require '../main.inc.php';
 
@@ -66,7 +61,7 @@ foreach ($remains as $key => $value)
 }
 
 // Treatment
-$result = $amountPayment != '' ? ($amountPayment - array_sum($amounts)) : ($amountPayment + array_sum($amounts));					// Remaining amountPayment
+$result = ($amountPayment != '') ? ($amountPayment - array_sum($amounts)) : array_sum($amounts);					// Remaining amountPayment
 $toJsonArray = 	array();
 $totalRemaining = price2num(array_sum($remains));
 $toJsonArray['label'] = $amountPayment == '' ? '' : $langs->transnoentities('RemainingAmountPayment');
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index c583e9180ff..3179a6486e9 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1,12 +1,13 @@
 <?php
 /* Copyright (C) 2001-2002  Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016  Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2018  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010  Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
  * Copyright (C) 2014       Florian Henry        <florian.henry@open-cooncept.pro>
  * Copyright (C) 2015       Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2016       Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2017       Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2018       Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -91,7 +92,7 @@ $num_releve=GETPOST("num_releve","alpha");
 $cat=GETPOST("cat");
 if (empty($dateop)) $dateop=-1;
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -427,9 +428,9 @@ if ($id > 0 || ! empty($ref))
             if ($user->rights->banque->consolidate) {
             	$newparam = $param;
             	$newparam = preg_replace('/search_conciliated=\d+/i','',$newparam);
-            	$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
+            	$buttonreconcile = '<a class="butActionNew" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
             } else {
-            	$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
+            	$buttonreconcile = '<a class="butActionNewRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
             }
         }
     }
@@ -722,7 +723,7 @@ if ($resql)
 	// Title
 	$bankcateg=new BankCateg($db);
 
-	$addbutton = '';
+	$newcardbutton = '';
 	if ($action != 'addline' && $action != 'reconcile')
 	{
 		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
@@ -730,27 +731,37 @@ if ($resql)
 			if (! empty($conf->global->BANK_USE_VARIOUS_PAYMENT))	// If direct entries is done using miscellaneous payments
 			{
 				if ($user->rights->banque->modifier) {
-					$addbutton = '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$search_account).'">'.$langs->trans("AddBankRecord").'</a>';
+					$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$search_account).'">'.$langs->trans("AddBankRecord");
+					$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+					$newcardbutton.= '</a>';
 				} else {
-					$addbutton = '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+					$newcardbutton = '<a class="butActionNewRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord");
+					$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+					$newcardbutton.= '</a>';
 				}
 			}
 			else													// If direct entries is not done using miscellaneous payments
 			{
 				if ($user->rights->banque->modifier) {
-					$addbutton = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param.'">'.$langs->trans("AddBankRecord").'</a>';
+					$newcardbutton = '<a class="butActionNew" href="'.$_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param.'">'.$langs->trans("AddBankRecord");
+					$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+					$newcardbutton.= '</a>';
 				} else {
-					$addbutton = '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+					$newcardbutton = '<a class="butActionNewRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord");
+					$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+					$newcardbutton.= '</a>';
 				}
 			}
 		}
 		else
 		{
-			$addbutton = '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+			$newcardbutton = '<a class="butActionNewRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord");
+			$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+			$newcardbutton.= '</a>';
 		}
 	}
 
-	$morehtml='<div class="inline-block '.(($buttonreconcile || $addbutton)?'marginrightonly':'').'">';
+	$morehtml='<div class="inline-block '.(($buttonreconcile || $newcardbutton)?'marginrightonly':'').'">';
 	$morehtml.= '<label for="pageplusone">'.$langs->trans("Page")."</label> "; // ' Page ';
 	$morehtml.='<input type="text" name="pageplusone" id="pageplusone" class="flat right width25" value="'.($page+1).'">';
 	$morehtml.='/'.$nbtotalofpages.' ';
@@ -761,7 +772,7 @@ if ($resql)
 		$morehtml.=$buttonreconcile;
 	}
 
-	$morehtml.=$addbutton;
+	$morehtml.=$newcardbutton;
 
 	$picto='title_bank';
 	if ($id > 0 || ! empty($ref)) $picto='';
@@ -901,7 +912,7 @@ if ($resql)
 	if (! empty($arrayfields['b.conciliated']['checked']))
 	{
         print '<td class="liste_titre" align="center">';
-        print $form->selectyesno('search_conciliated', $search_conciliated, 1, False, 1);
+        print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1);
         print '</td>';
 	}
 	print '<td class="liste_titre" align="middle">';
@@ -931,7 +942,7 @@ if ($resql)
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 00db08f9d4d..6a9ce1d2ba1 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -413,7 +413,7 @@ if ($action == 'create')
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields,'edit',$parameters);
 	}
@@ -803,7 +803,7 @@ else
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">'."\n\n";
 
-		dol_fiche_head(array(), 0, '' ,0);
+		dol_fiche_head(array(), 0, '', 0);
 
 		//print '<div class="underbanner clearboth"></div>';
 
@@ -811,11 +811,11 @@ else
 
 		// Ref
 		print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
-		print '<td><input type="text" class="flat maxwidth200" name="ref" value="'.(isset($_POST["ref"])?GETPOST("ref"):$object->ref).'"></td></tr>';
+		print '<td><input type="text" class="flat maxwidth200" name="ref" value="'.dol_escape_htmltag(isset($_POST["ref"])?GETPOST("ref"):$object->ref).'"></td></tr>';
 
 		// Label
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-		print '<td><input type="text" class="flat minwidth300" name="label" value="'.(isset($_POST["label"])?GETPOST("label"):$object->label).'"></td></tr>';
+		print '<td><input type="text" class="flat minwidth300" name="label" value="'.dol_escape_htmltag(isset($_POST["label"])?GETPOST("label"):$object->label).'"></td></tr>';
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
@@ -914,7 +914,7 @@ else
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 83e1f15ef36..fb514120d57 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -101,11 +101,10 @@ if ($result)
 	$num = $db->num_rows($result);
 	$i = 0; $total = 0;
 
-	$var=True;
 	while ($i < $num)
 	{
 		$objp = $db->fetch_object($result);
-		
+
 		print '<tr class="oddeven">';
 		print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>';
 		if (GETPOST('action','aZ09') == 'edit' && GETPOST("categid")== $objp->rowid)
@@ -136,7 +135,7 @@ if ($result)
  */
 if ($action != 'edit')
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td><td><input name="label" type="text" size="45"></td>';
 	print '<td align="center"><input type="submit" name="add" class="button" value="'.$langs->trans("Add").'"></td>';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index c773ef242ad..7228214e51c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -395,9 +395,10 @@ class Account extends CommonObject
 	 *  @param	string		$emetteur		Name of cheque writer
 	 *  @param	string		$banque			Bank of cheque writer
 	 *  @param	string		$accountancycode	When we record a free bank entry, we must provide accounting account if accountancy module is on.
+	 *  @param	int			$datev			Date value
 	 *  @return	int							Rowid of added entry, <0 if KO
 	 */
-	function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur='',$banque='', $accountancycode='')
+	function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur='',$banque='', $accountancycode='', $datev=null)
 	{
 		// Deprecatîon warning
 		if (is_numeric($oper)) {
@@ -447,7 +448,7 @@ class Account extends CommonObject
 
 		$this->db->begin();
 
-		$datev = $date;
+		if (is_null($datev) || empty($datev)) $datev = $date;
 
 		$accline = new AccountLine($this->db);
 		$accline->datec = $now;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 2fca317d1c4..a6e206c4b09 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -127,7 +127,7 @@ if ($id > 0 || !empty($ref)) {
 
         print '<table class="border" width="100%">';
         print '<tr><td class="titlefield">' . $langs->trans("NbOfAttachedFiles") . '</td><td colspan="3">' . count($filearray) . '</td></tr>';
-        print '<tr><td>' . $langs->trans("TotalSizeOfAttachedFiles") . '</td><td colspan="3">' . $totalsize . ' ' . $langs->trans("bytes") . '</td></tr>';
+        print '<tr><td>' . $langs->trans("TotalSizeOfAttachedFiles") . '</td><td colspan="3">' .dol_print_size($totalsize,1,1).'</td></tr>';
         print "</table>\n";
 
         print '</div>';
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index e3c2a5b94a9..9fc8f5028bb 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -5,6 +5,7 @@ use Stripe\BankAccount;
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2018      Ferran Marcet		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -230,7 +231,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 $newcardbutton='';
 if ($user->rights->banque->configurer)
 {
-	$newcardbutton.='<a class="butAction" href="card.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
+	$newcardbutton.='<a class="butActionNew" href="card.php?action=create">'.$langs->trans("NewFinancialAccount");
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 
@@ -389,7 +392,7 @@ if (! empty($arrayfields['toreconcile']['checked']))      print_liste_field_titr
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (! empty($arrayfields['b.datec']['checked']))          print_liste_field_titre($arrayfields['b.datec']['label'],$_SERVER["PHP_SELF"],"b.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 6a6557c5aef..5e9f98be02d 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -72,7 +72,7 @@ if ($user->rights->banque->consolidate && $action == 'dvprev' && ! empty($dvid))
 }
 
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -395,7 +395,6 @@ if (empty($numref))
 	$result = $db->query($sql);
 	if ($result)
 	{
-		$var=True;
 		$numrows = $db->num_rows($result);
 		$i = 0;
 
@@ -572,7 +571,6 @@ else
 	$result = $db->query($sql);
 	if ($result)
 	{
-		$var=False;
 		$numrows = $db->num_rows($result);
 		$i = 0;
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index b6649250e64..2828963d889 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -349,7 +349,7 @@ if ($action == 'create')
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; ';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print '</form>';
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index aa47d714bd9..f92090a0259 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -38,7 +38,7 @@ $result = restrictedArea($user, 'banque', '', '', '');
 
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $search_ref = GETPOST('search_ref','int');
 $search_user = GETPOST('search_user','alpha');
 $search_label = GETPOST('search_label','alpha');
@@ -153,7 +153,13 @@ if ($result)
 
 	if ($optioncss != '') $param.='&amp;optioncss='.urlencode($optioncss);
 
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create">'.$langs->trans('MenuNewVariousPayment').'</a>';
+	$newcardbutton='';
+	if ($user->rights->banque->modifier)
+	{
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create">'.$langs->trans('MenuNewVariousPayment');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
+	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 321fad5baf6..7a11a709128 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -48,7 +48,7 @@ if (! $year && $mode != 'sconly') { $year=date("Y", time()); }
 
 $search_account = GETPOST('search_account','int');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 1f3974ce041..76481c4c8c0 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -115,7 +115,7 @@ if ($object->id)
 	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
 
     print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 2cd3823bacd..64c5442299f 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -45,7 +45,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="d.dated";
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 
 
 /*
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 807ddfee700..fad8d93b244 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -46,7 +46,7 @@ $search_company=GETPOST('search_company','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 36bc107d672..d503d5e4c07 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -294,7 +294,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
     print $px1->show();
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6d0c6fffc1a..ecd9ad09bbf 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -983,15 +983,13 @@ if (empty($reshook))
 				// Add link between credit note and origin
 				if(! empty($object->fk_facture_source)) {
 					$facture_source->fetch($object->fk_facture_source);
-				}
-				$facture_source->fetchObjectLinked();
+					$facture_source->fetchObjectLinked();
 
-				if(! empty($facture_source->linkedObjectsIds)) {
-					$linkedObjectIds = $facture_source->linkedObjectsIds;
-					$sourcetype = key($linkedObjectIds);
-					$fk_origin = current($facture_source->linkedObjectsIds[$sourcetype]);
-
-					$object->add_object_linked($sourcetype, $fk_origin);
+					if(! empty($facture_source->linkedObjectsIds)) {
+						foreach($facture_source->linkedObjectsIds as $sourcetype => $TIds) {
+							$object->add_object_linked($sourcetype, current($TIds));
+						}
+					}
 				}
 			}
 		}
@@ -2117,7 +2115,7 @@ if (empty($reshook))
 	    $fromElement = GETPOST('fromelement');
 	    $fromElementid = GETPOST('fromelementid');
 	    $importLines = GETPOST('line_checkbox');
-	    
+
 	    if(!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
 	    {
 	        if($fromElement == 'commande')
@@ -2164,7 +2162,7 @@ if (empty($reshook))
                     $fk_prev_id = '';
                     $fk_unit = $originLine->fk_unit;
                     $pu_ht_devise = $originLine->multicurrency_subprice;
-                    
+
                     $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $ventil, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $type, $rang, $special_code, $origin, $origin_id, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $situation_percent, $fk_prev_id, $fk_unit,$pu_ht_devise);
                     if($res > 0){
                         $importCount++;
@@ -2172,18 +2170,18 @@ if (empty($reshook))
                         $error++;
                     }
                 }
-                else{ 
-                    $error++; 
+                else{
+                    $error++;
                 }
 	        }
-	        
+
 	        if($error)
 	        {
 	            setEventMessage($langs->trans('ErrorsOnXLines',$error), 'errors');
 	        }
 	    }
 	}
-	
+
 	// Actions when printing a doc from card
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
@@ -2209,22 +2207,15 @@ if (empty($reshook))
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
 		if ($ret < 0) $error++;
 
-		if (! $error) {
-			// Actions on extra fields (by external module or standard code)
-			// 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
-			// some hooks
-			if (empty($reshook)) {
-				$result = $object->insertExtraFields('BILL_MODIFY');
-				if ($result < 0)
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$error++;
-				}
-			} else if ($reshook < 0)
-				$error ++;
+		if (! $error)
+		{
+			// Actions on extra fields
+			$result = $object->insertExtraFields('BILL_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
 		}
 
 		if ($error)
@@ -2902,7 +2893,7 @@ if ($action == 'create')
 	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="2"', 'cols'=>2);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
@@ -4577,16 +4568,16 @@ else if ($id > 0 || ! empty($ref))
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
-		
+
 		$compatibleImportElementsList = false;
-		if($user->rights->facture->creer 
-		    && $object->statut == Facture::STATUS_DRAFT 
+		if($user->rights->facture->creer
+		    && $object->statut == Facture::STATUS_DRAFT
 		    && ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION) )
 		{
 		    $compatibleImportElementsList = array('commande'); // import from linked elements
 		}
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem,$compatibleImportElementsList);
-		
+
 
 		// Show online payment link
 		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index a114829d43c..8547be8cb2c 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -196,7 +196,7 @@ class Invoices extends DolibarrApi
      * @param array $request_data   Request datas
      * @return int                  ID of invoice
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->facture->creer) {
 			throw new RestException(401, "Insuffisant rights");
@@ -313,7 +313,7 @@ class Invoices extends DolibarrApi
      * @throws 401
      * @throws 404
      */
-    function putLine($id, $lineid, $request_data = NULL) {
+    function putLine($id, $lineid, $request_data = null) {
     	if(! DolibarrApiAccess::$user->rights->facture->creer) {
     		throw new RestException(401);
     	}
@@ -414,7 +414,7 @@ class Invoices extends DolibarrApi
      * @param array $request_data   Datas
      * @return int
      */
-    function put($id, $request_data = NULL)
+    function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->facture->creer) {
 			throw new RestException(401);
@@ -499,7 +499,7 @@ class Invoices extends DolibarrApi
      * @throws 404
      * @throws 400
      */
-    function postLine($id, $request_data = NULL) {
+    function postLine($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->facture->creer) {
                         throw new RestException(401);
                   }
@@ -562,6 +562,59 @@ class Invoices extends DolibarrApi
       return $updateRes;
     }
 
+    /**
+     * Adds a contact to an invoice
+     *
+     * @param   int 	$id             	Order ID
+     * @param   int 	$fk_socpeople       	Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
+     * @param   string 	$type_contact           Type of contact (code). Must a code found into table llx_c_type_contact. For example: BILLING
+     * @param   string  $source             	external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+     * @param   int     $notrigger              Disable all triggers
+     *
+     * @url POST    {id}/contacts
+     *
+     * @return  array
+     *
+     * @throws 200
+     * @throws 304
+     * @throws 401
+     * @throws 404
+     * @throws 500
+     *
+     */
+    function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger=0)
+    {
+        if(! DolibarrApiAccess::$user->rights->facture->creer) {
+                throw new RestException(401);
+        }
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+                throw new RestException(404, 'Invoice not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+                throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->invoice->add_contact($fk_socpeople,$type_contact,$source,$notrigger);
+        if ($result < 0) {
+                throw new RestException(500, 'Error : '.$this->invoice->error);
+        }
+
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Invoice not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        return $this->_cleanObjectDatas($this->invoice);
+    }
+
+
+
     /**
      * Sets an invoice as draft
      *
@@ -899,14 +952,13 @@ class Invoices extends DolibarrApi
         return $result;
     }
 
-     /**
-     * Add payment line to a specific invoice
-     *
-     * The model schema is defined by the PaymentData class.
+
+    /**
+     * Add payment line to a specific invoice with the remain to pay as amount.
      *
      * @param int     $id                               Id of invoice
-     * @param string  $datepaye 	  {@from body}  Payment date        {@type timestamp}
-     * @param int     $paiementid 	  {@from body}  Payment mode Id {@min 1}
+     * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
+     * @param int     $paiementid         {@from body}  Payment mode Id {@min 1}
      * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
      * @param int     $accountid          {@from body}  Account Id {@min 1}
      * @param string  $num_paiement       {@from body}  Payment number (optional)
@@ -922,63 +974,194 @@ class Invoices extends DolibarrApi
      * @throws 404
      */
     function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='') {
+    	global $conf;
+
+    	require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+
+    	if(! DolibarrApiAccess::$user->rights->facture->creer) {
+    		throw new RestException(403);
+    	}
+    	if(empty($id)) {
+    		throw new RestException(400, 'Invoice ID is mandatory');
+    	}
+
+    	if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
+    		throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+    	}
+
+    	if (! empty($conf->banque->enabled)) {
+    		if(empty($accountid)) {
+    			throw new RestException(400, 'Account ID is mandatory');
+    		}
+    	}
+
+    	if(empty($paiementid)) {
+    		throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
+    	}
+
+
+    	$result = $this->invoice->fetch($id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'Invoice not found');
+    	}
+
+    	// Calculate amount to pay
+    	$totalpaye = $this->invoice->getSommePaiement();
+    	$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
+    	$totaldeposits = $this->invoice->getSumDepositsUsed();
+    	$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+
+    	$this->db->begin();
+
+    	$amounts = array();
+    	$multicurrency_amounts = array();
+
+    	// Clean parameters amount if payment is for a credit note
+    	if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+    		$resteapayer = price2num($resteapayer,'MT');
+    		$amounts[$id] = -$resteapayer;
+    		// Multicurrency
+    		$newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+    		$multicurrency_amounts[$id] = -$newvalue;
+    	} else {
+    		$resteapayer = price2num($resteapayer,'MT');
+    		$amounts[$id] = $resteapayer;
+    		// Multicurrency
+    		$newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+    		$multicurrency_amounts[$id] = $newvalue;
+    	}
+
+
+    	// Creation of payment line
+    	$paiement = new Paiement($this->db);
+    	$paiement->datepaye     = $datepaye;
+    	$paiement->amounts      = $amounts;                           // Array with all payments dispatching with invoice id
+    	$paiement->multicurrency_amounts = $multicurrency_amounts;    // Array with all payments dispatching
+    	$paiement->paiementid   = $paiementid;
+    	$paiement->paiementcode = dol_getIdFromCode($this->db,$paiementid,'c_paiement','id','code',1);
+    	$paiement->num_paiement = $num_paiement;
+    	$paiement->note         = $comment;
+
+    	$paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices=='yes'?1:0));    // This include closing invoices
+    	if ($paiement_id < 0)
+    	{
+    		$this->db->rollback();
+    		throw new RestException(400, 'Payment error : '.$paiement->error);
+    	}
+
+    	if (! empty($conf->banque->enabled)) {
+    		$label='(CustomerInvoicePayment)';
+
+    		if($paiement->paiementcode == 'CHQ' && empty($chqemetteur)) {
+    			throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paiement->paiementcode);
+    		}
+    		if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label='(CustomerInvoicePaymentBack)';  // Refund of a credit note
+    		$result=$paiement->addPaymentToBank(DolibarrApiAccess::$user,'payment',$label,$accountid,$chqemetteur,$chqbank);
+    		if ($result < 0)
+    		{
+    			$this->db->rollback();
+    			throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
+    		}
+    	}
+
+    	$this->db->commit();
+
+    	return $paiement_id;
+    }
+
+    /**
+     * Add a payment to pay partially or completely one or several invoices.
+     * Warning: Take care that all invoices are owned by the same customer.
+     * Example of value for parameter arrayofamounts: {"1": "99.99", "2": "10"}
+     *
+     * @param string  $arrayofamounts     {@from body}  Array with id of invoices with amount to pay for each invoice
+     * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
+     * @param int     $paiementid         {@from body}  Payment mode Id {@min 1}
+     * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
+     * @param int     $accountid          {@from body}  Account Id {@min 1}
+     * @param string  $num_paiement       {@from body}  Payment number (optional)
+     * @param string  $comment            {@from body}  Note (optional)
+     * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
+     * @param string  $chqbank            {@from body}  Issuer bank name (optional)
+     *
+     * @url     POST /paymentsdistributed
+     *
+     * @return int  Payment ID
+     * @throws 400
+     * @throws 401
+     * @throws 403
+     * @throws 404
+     */
+    function addPaymentDistributed($arrayofamounts, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='')
+    {
         global $conf;
 
         require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
 
         if(! DolibarrApiAccess::$user->rights->facture->creer) {
-                throw new RestException(401);
+                throw new RestException(403);
         }
-        if(empty($id)) {
-                throw new RestException(400, 'Invoice ID is mandatory');
-        }
-
-        if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
-                throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        foreach($arrayofamounts as $id => $amount) {
+        	if(empty($id)) {
+        		throw new RestException(400, 'Invoice ID is mandatory. Fill the invoice id and amount into arrayofamounts parameter. For example: {"1": "99.99", "2": "10"}');
+        	}
+        	if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
+        		throw new RestException(403, 'Access not allowed on invoice ID '.$id.' for login '.DolibarrApiAccess::$user->login);
+        	}
         }
 
         if (! empty($conf->banque->enabled)) {
-            if(empty($accountid)) {
-                throw new RestException(400, 'Account ID is mandatory');
-            }
+        	if(empty($accountid)) {
+        		throw new RestException(400, 'Account ID is mandatory');
+        	}
         }
-
         if(empty($paiementid)) {
-            throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
+        	throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
         }
 
-
-        $result = $this->invoice->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        // Calculate amount to pay
-        $totalpaye = $this->invoice->getSommePaiement();
-        $totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
-        $totaldeposits = $this->invoice->getSumDepositsUsed();
-        $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-
         $this->db->begin();
 
         $amounts = array();
         $multicurrency_amounts = array();
 
-        // Clean parameters amount if payment is for a credit note
-        if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
-            $resteapayer = price2num($resteapayer,'MT');
-            $amounts[$id] = -$resteapayer;
-            // Multicurrency
-            $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
-            $multicurrency_amounts[$id] = -$newvalue;
-        } else {
-            $resteapayer = price2num($resteapayer,'MT');
-            $amounts[$id] = $resteapayer;
-            // Multicurrency
-            $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
-            $multicurrency_amounts[$id] = $newvalue;
-        }
+        // Loop on each invoice to pay
+        foreach($arrayofamounts as $id => $amount)
+        {
+        	$result = $this->invoice->fetch($id);
+        	if( ! $result ) {
+        		$this->db->rollback();
+        		throw new RestException(404, 'Invoice ID '.$id.' not found');
+        	}
 
+        	// Calculate amount to pay
+        	$totalpaye = $this->invoice->getSommePaiement();
+        	$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
+        	$totaldeposits = $this->invoice->getSumDepositsUsed();
+        	$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+        	if ($amount != 'remain')
+        	{
+        		if ($amount > $resteapayer)
+        		{
+        			$this->db->rollback();
+        			throw new RestException(400, 'Payment amount on invoice ID '.$id.' ('.$amount.') is higher than remain to pay ('.$resteapayer.')');
+        		}
+        		$resteapayer = $amount;
+        	}
+            // Clean parameters amount if payment is for a credit note
+            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+                $resteapayer = price2num($resteapayer,'MT');
+                $amounts[$id] = -$resteapayer;
+                // Multicurrency
+                $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+                $multicurrency_amounts[$id] = -$newvalue;
+            } else {
+                $resteapayer = price2num($resteapayer,'MT');
+                $amounts[$id] = $resteapayer;
+                // Multicurrency
+                $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+                $multicurrency_amounts[$id] = $newvalue;
+            }
+        }
 
         // Creation of payment line
         $paiement = new Paiement($this->db);
@@ -989,17 +1172,14 @@ class Invoices extends DolibarrApi
         $paiement->paiementcode = dol_getIdFromCode($this->db,$paiementid,'c_paiement','id','code',1);
         $paiement->num_paiement = $num_paiement;
         $paiement->note         = $comment;
-
         $paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices=='yes'?1:0));    // This include closing invoices
         if ($paiement_id < 0)
         {
             $this->db->rollback();
             throw new RestException(400, 'Payment error : '.$paiement->error);
         }
-
         if (! empty($conf->banque->enabled)) {
             $label='(CustomerInvoicePayment)';
-
             if($paiement->paiementcode == 'CHQ' && empty($chqemetteur)) {
                   throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paiement->paiementcode);
             }
@@ -1011,7 +1191,9 @@ class Invoices extends DolibarrApi
                 throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
             }
         }
+
         $this->db->commit();
+
         return $paiement_id;
     }
 
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 8759f2eebf3..e52658d38e8 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -108,7 +108,7 @@ class FactureRec extends CommonInvoice
 		if (empty($this->frequency))
 		{
 			$this->frequency=0;
-			$this->date_when=NULL;
+			$this->date_when=null;
 		}
 
 
@@ -475,7 +475,6 @@ class FactureRec extends CommonInvoice
 
 				$line->id	            = $objp->rowid;
 				$line->rowid	        = $objp->rowid;
-				$line->label            = $objp->custom_label;		// Label line
 				$line->desc             = $objp->description;		// Description line
 				$line->description      = $objp->description;		// Description line
 				$line->product_type     = $objp->product_type;		// Type of line
@@ -488,6 +487,8 @@ class FactureRec extends CommonInvoice
 				$line->qty              = $objp->qty;
 				$line->subprice         = $objp->subprice;
 
+				$line->label            = $objp->custom_label;		// @deprecated
+
 				$line->vat_src_code     = $objp->vat_src_code;
 				$line->tva_tx           = $objp->tva_tx;
 				$line->localtax1_tx     = $objp->localtax1_tx;
@@ -992,6 +993,7 @@ class FactureRec extends CommonInvoice
 		$sql.= " AND (date_when IS NULL OR date_when <= '".$db->idate($today)."')";
 		$sql.= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
 		$sql.= ' AND suspended = 0';
+		$sql.= ' AND entity = '.$conf->entity;	// MUST STAY = $conf->entity here
 		$sql.= $db->order('entity', 'ASC');
 		//print $sql;exit;
 
@@ -1006,7 +1008,7 @@ class FactureRec extends CommonInvoice
 
 		    $saventity = $conf->entity;
 
-		    while ($i < $num)     // Loop on each template invoice
+		    while ($i < $num)     // Loop on each template invoice. If $num = 0, test is false at first pass.
 			{
 			    $line = $db->fetch_object($resql);
 
@@ -1015,49 +1017,59 @@ class FactureRec extends CommonInvoice
 				$facturerec = new FactureRec($db);
 				$facturerec->fetch($line->rowid);
 
-				// Set entity context
-				$conf->entity = $facturerec->entity;
+				if ($facturerec->id > 0)
+				{
+					// Set entity context
+					$conf->entity = $facturerec->entity;
 
-				dol_syslog("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref.", entity=".$facturerec->entity);
+					dol_syslog("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref.", entity=".$facturerec->entity);
 
-			    $error=0;
+				    $error=0;
 
-			    $facture = new Facture($db);
-				$facture->fac_rec = $facturerec->id;    // We will create $facture from this recurring invoice
-				$facture->fk_fac_rec_source = $facturerec->id;    // We will create $facture from this recurring invoice
+				    $facture = new Facture($db);
+					$facture->fac_rec = $facturerec->id;    // We will create $facture from this recurring invoice
+					$facture->fk_fac_rec_source = $facturerec->id;    // We will create $facture from this recurring invoice
 
-			    $facture->type = self::TYPE_STANDARD;
-			    $facture->brouillon = 1;
-			    $facture->date = (empty($facturerec->date_when)?$now:$facturerec->date_when);	// We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
-			    $facture->socid = $facturerec->socid;
+				    $facture->type = self::TYPE_STANDARD;
+				    $facture->brouillon = 1;
+				    $facture->date = (empty($facturerec->date_when)?$now:$facturerec->date_when);	// We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
+				    $facture->socid = $facturerec->socid;
 
-			    $invoiceidgenerated = $facture->create($user);
-			    if ($invoiceidgenerated <= 0)
-			    {
-			        $this->errors = $facture->errors;
-			        $this->error = $facture->error;
-			        $error++;
-			    }
-			    if (! $error && $facturerec->auto_validate)
-			    {
-			        $result = $facture->validate($user);
-			        if ($result <= 0)
-			        {
-    			        $this->errors = $facture->errors;
-    			        $this->error = $facture->error;
-			            $error++;
-                    }
-			    }
-                if (! $error && $facturerec->generate_pdf)
-                {
-                    $result = $facture->generateDocument($facturerec->modelpdf, $langs);
-                    if ($result <= 0)
-                    {
-                        $this->errors = $facture->errors;
-                        $this->error = $facture->error;
-                        $error++;
-                    }
-                }
+				    $invoiceidgenerated = $facture->create($user);
+				    if ($invoiceidgenerated <= 0)
+				    {
+				        $this->errors = $facture->errors;
+				        $this->error = $facture->error;
+				        $error++;
+				    }
+				    if (! $error && $facturerec->auto_validate)
+				    {
+				        $result = $facture->validate($user);
+				        if ($result <= 0)
+				        {
+	    			        $this->errors = $facture->errors;
+	    			        $this->error = $facture->error;
+				            $error++;
+	                    }
+				    }
+	                if (! $error && $facturerec->generate_pdf)
+	                {
+	                    $result = $facture->generateDocument($facturerec->modelpdf, $langs);
+	                    if ($result <= 0)
+	                    {
+	                        $this->errors = $facture->errors;
+	                        $this->error = $facture->error;
+	                        $error++;
+	                    }
+	                }
+				}
+				else
+				{
+					$error++;
+					$this->error="Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n";
+					$this->errors[]="Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity;
+					dol_syslog("createRecurringInvoices Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity);
+				}
 
 				if (! $error && $invoiceidgenerated >= 0)
 				{
@@ -1503,7 +1515,7 @@ class FactureRec extends CommonInvoice
     }
 
 	/**
-     *	Update the auto validate invoice
+     *	Update the auto validate flag of invoice
      *
      *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
      *	@return		int						<0 if KO, >0 if OK
@@ -1791,7 +1803,7 @@ class FactureLigneRec extends CommonInvoiceLine
     			}
     		}
 
-    		if (! $notrigger)
+    		if (! $error && ! $notrigger)
     		{
     			// Call trigger
     			$result=$this->call_trigger('LINEBILL_REC_UPDATE',$user);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index c0285a65fdf..468ac928f07 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -613,7 +613,7 @@ class Facture extends CommonInvoice
                 	$line = $this->lines[$i];
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
+				    //if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
                 	if (! is_object($line)) $line = (object) $line;
 
 				    if ($result >= 0)
@@ -750,35 +750,20 @@ class Facture extends CommonInvoice
 				{
 					$action='create';
 
-					// Actions on extra fields (by external module or standard code)
-					// 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
-					if (empty($reshook))
-					{
-						if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-						{*/
+					// Actions on extra fields
 					if (! $error)
 					{
 					    $result=$this->insertExtraFields();
 					    if ($result < 0) $error++;
 					}
-						/*}
-					}
-					else if ($reshook < 0) $error++;*/
 
-          if (! $error)
-          {
-            if (! $notrigger)
-            {
-              // Call trigger
-              $result=$this->call_trigger('BILL_CREATE',$user);
-              if ($result < 0) $error++;
-              // End call triggers
-            }
-          }
+			        if (! $error && ! $notrigger)
+			        {
+			           // Call trigger
+			           $result=$this->call_trigger('BILL_CREATE',$user);
+			           if ($result < 0) $error++;
+			           // End call triggers
+			        }
 
 					if (! $error)
 					{
@@ -1999,6 +1984,7 @@ class Facture extends CommonInvoice
 			$this->db->begin();
 
 			dol_syslog(get_class($this)."::set_paid rowid=".$this->id, LOG_DEBUG);
+
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
 			$sql.= ' fk_statut='.self::STATUS_CLOSED;
 			if (! $close_code) $sql.= ', paye=1';
@@ -2006,7 +1992,6 @@ class Facture extends CommonInvoice
 			if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
 			$sql.= ' WHERE rowid = '.$this->id;
 
-			dol_syslog(get_class($this)."::set_paid", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
@@ -2378,7 +2363,7 @@ class Facture extends CommonInvoice
 
                 if (!empty($conf->global->INVOICE_USE_SITUATION))
                 {
-    				$final = True;
+                	$final = true;
     				$nboflines = count($this->lines);
     				while (($i < $nboflines) && $final) {
     					$final = ($this->lines[$i]->situation_percent == 100);
@@ -2580,6 +2565,7 @@ class Facture extends CommonInvoice
 		// Deprecation warning
 		if ($label) {
 			dol_syslog(__METHOD__ . ": using line label is deprecated", LOG_WARNING);
+			//var_dump(debug_backtrace(false));exit;
 		}
 
 		global $mysoc, $conf, $langs;
@@ -2745,14 +2731,15 @@ class Facture extends CommonInvoice
 
 				// Mise a jour informations denormalisees au niveau de la facture meme
 				$result=$this->update_price(1,'auto',0,$mysoc);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
+
 				if ($result > 0)
 				{
 					$this->db->commit();
-					return $this->line->rowid;
+					return $this->line->id;
 				}
 				else
 				{
-					$this->error=$this->db->error();
+					$this->error=$this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
@@ -4500,11 +4487,11 @@ class FactureLigne extends CommonInvoiceLine
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
+			$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
+			$this->rowid=$this->id;	// For backward compatibility
 
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-            	$this->id=$this->rowid;
             	$result=$this->insertExtraFields();
             	if ($result < 0)
             	{
@@ -4576,12 +4563,12 @@ class FactureLigne extends CommonInvoiceLine
 			}
 
 			$this->db->commit();
-			return $this->rowid;
+			return $this->id;
 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -2;
 		}
@@ -4700,7 +4687,7 @@ class FactureLigne extends CommonInvoiceLine
         		}
         	}
 
-			if (! $notrigger)
+			if (! $error && ! $notrigger)
 			{
                 // Call trigger
                 $result=$this->call_trigger('LINEBILL_UPDATE',$user);
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index a9396e445c9..70dcfebaacb 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -171,7 +171,7 @@ if ($id > 0 || ! empty($ref))
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
 		print "</table>\n";
 
 		print "</div>\n";
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 6f96e74d345..1fc7fa1fb96 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -69,7 +69,7 @@ $projectid = GETPOST('projectid','int');
 $year_date_when=GETPOST('year_date_when');
 $month_date_when=GETPOST('month_date_when');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -417,7 +417,8 @@ if (empty($reshook))
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
 		if ($ret < 0) $error++;
 
-		if (! $error) {
+		if (! $error)
+		{
 			$result = $object->insertExtraFields('BILLREC_MODIFY');
 			if ($result < 0)
 			{
@@ -1496,7 +1497,7 @@ else
 		}
 		print '</td></tr>';
 
-		// Date when
+		// Date when (next invoice generation)
 		print '<tr><td>';
 		if ($action == 'date_when' || $object->frequency > 0)
 		{
@@ -1512,7 +1513,14 @@ else
 			print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
 		}
 		//var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
-		if ($action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
+		if (! $object->isMaxNbGenReached())
+		{
+			if ($action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
+		}
+		else
+		{
+			print img_info($langs->trans("MaxNumberOfGenerationReached"));
+		}
 		print '</td>';
 		print '</tr>';
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 0a2b9f72d60..3e077e8a749 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -83,7 +83,7 @@ $search_frequency=GETPOST('search_frequency','alpha');
 $search_unit_frequency=GETPOST('search_unit_frequency','alpha');
 $search_status=GETPOST('search_status','int');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -273,14 +273,20 @@ else if ($search_year_date_when > 0)
 	$sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($search_year_date_when,1,false))."' AND '".$db->idate(dol_get_last_day($search_year_date_when,12,false))."'";
 }
 
+$sql.= $db->order($sortfield, $sortorder);
+
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
-$sql.= $db->order($sortfield, $sortorder);
 $sql.= $db->plimit($limit+1,$offset);
 
 $resql = $db->query($sql);
@@ -598,13 +604,20 @@ if ($resql)
 			// Date next generation
 			if (! empty($arrayfields['f.date_when']['checked']))
 			{
-			   print '<td align="center">';
-			   print '<div class="nowraponall">';
-			   print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-			   if ($objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
-			   print '</div>';
-			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
+				print '<td align="center">';
+				print '<div class="nowraponall">';
+				print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+				if (! $invoicerectmp->isMaxNbGenReached())
+				{
+					if ($objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
+				}
+				else
+				{
+					print img_info($langs->trans("MaxNumberOfGenerationReached"));
+				}
+				print '</div>';
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
 			}
 			if (! empty($arrayfields['f.datec']['checked']))
 			{
@@ -631,7 +644,11 @@ if ($resql)
 			print '<td align="center">';
 			if ($user->rights->facture->creer && empty($invoicerectmp->suspended))
 			{
-				if (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
+				if ($invoicerectmp->isMaxNbGenReached())
+				{
+					print $langs->trans("MaxNumberOfGenerationReached");
+				}
+				elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
 					print $langs->trans("CreateBill").'</a>';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8845d0bc8d7..b6bde6605ad 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -96,6 +96,7 @@ $search_year	= GETPOST('search_year','int');
 $search_day_lim	= GETPOST('search_day_lim','int');
 $search_month_lim	= GETPOST('search_month_lim','int');
 $search_year_lim	= GETPOST('search_year_lim','int');
+$search_categ_cus=trim(GETPOST("search_categ_cus",'int'));
 
 $option = GETPOST('search_option');
 if ($option == 'late') {
@@ -103,7 +104,7 @@ if ($option == 'late') {
 }
 $filtre	= GETPOST('filtre','alpha');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -228,6 +229,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','a
 	$search_month_lim='';
 	$toselect='';
 	$search_array_options=array();
+	$search_categ_cus=0;
+
 }
 
 if (empty($reshook))
@@ -369,6 +372,8 @@ $sql.= " p.rowid as project_id, p.ref as project_ref, p.title as project_label";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
 if (! $sall) $sql.= ', SUM(pf.amount) as dynamount_payed';
+if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -379,6 +384,8 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+if (! empty($search_categ_cus)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+
 $sql.= ', '.MAIN_DB_PREFIX.'facture as f';
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_extrafields as ef on (f.rowid = ef.fk_object)";
 if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
@@ -435,6 +442,8 @@ if ($search_montant_vat != '') $sql.= natural_search('f.tva', $search_montant_va
 if ($search_montant_localtax1 != '') $sql.= natural_search('f.localtax1', $search_montant_localtax1, 1);
 if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1);
 if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
+if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+if ($search_categ_cus == -2)   $sql.= " AND cc.fk_categorie IS NULL";
 if ($search_status != '' && $search_status >= 0)
 {
 	if ($search_status == '0') $sql.=" AND f.fk_statut = 0";  // draft
@@ -515,6 +524,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1,$offset);
@@ -535,8 +549,8 @@ if ($resql)
 	}
 
 	$param='&socid='.$socid;
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 	if ($sall)				 $param.='&sall='.urlencode($sall);
 	if ($search_day)         $param.='&search_day='.urlencode($search_day);
 	if ($search_month)       $param.='&search_month='.urlencode($search_month);
@@ -561,6 +575,8 @@ if ($resql)
 	if ($show_files)         $param.='&show_files='.urlencode($show_files);
 	if ($option)             $param.="&search_option=".urlencode($option);
 	if ($optioncss != '')    $param.='&optioncss='.urlencode($optioncss);
+	if ($search_categ_cus > 0) $param.='&search_categ_cus='.urlencode($search_categ_cus);
+
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -569,30 +585,27 @@ if ($resql)
 		'presend'=>$langs->trans("SendByMail"),
 		'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	if ($conf->prelevement->enabled)
-	{
-	   $langs->load("withdrawals");
-	   $arrayofmassactions['withdrawrequest']=$langs->trans("MakeWithdrawRequest");
+	if ($conf->prelevement->enabled) {
+        	$langs->load("withdrawals");
+        	$arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
 	}
-	if ($user->rights->facture->supprimer)
-	{
-		//if (! empty($conf->global->STOCK_CALCULATE_ON_BILL) || empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
-		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
-		{
-			// mass deletion never possible on invoices on such situation
+	if ($user->rights->facture->supprimer) {
+		if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
+        		$arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
 		}
-		else
-		{
-		   $arrayofmassactions['predelete']=$langs->trans("Delete");
-		}
-	}
-	if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+        	elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
+            		$arrayofmassactions['predelete'] = $langs->trans("Delete");
+        	}
+    	}
+	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 	$newcardbutton='';
 	if($user->rights->facture->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create">'.$langs->trans('NewBill').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create">'.$langs->trans('NewBill');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	$i = 0;
@@ -650,6 +663,14 @@ if ($resql)
 		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
+	if (! empty($conf->categorie->enabled))
+	{
+		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		$moreforfilter.='<div class="divsearchfield">';
+	 	$moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
+		$moreforfilter.=$formother->select_categories('customer',$search_categ_cus,'search_categ_cus',1);
+	 	$moreforfilter.='</div>';
+	}
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index d85255fbf4e..2f2692055e9 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -331,7 +331,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
 	print $px1->show();
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index ad409145478..438427fa491 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -25,6 +25,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 
 $langs->load("compta");
 $langs->load("banks");
@@ -38,11 +39,11 @@ if (empty($refund)) $refund=0;
 $lttype=GETPOST('localTaxType', 'int');
 
 // Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+$socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
-$localtax = new Localtax($db);
+$object = new Localtax($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('localtaxvatcard','globalcard'));
@@ -52,8 +53,8 @@ $hookmanager->initHooks(array('localtaxvatcard','globalcard'));
  * Actions
  */
 
-//add payment of localtax
-if($_POST["cancel"] == $langs->trans("Cancel")){
+if ($_POST["cancel"] == $langs->trans("Cancel") && ! $id)
+{
 	header("Location: list.php?localTaxType=".$lttype);
 	exit;
 }
@@ -66,15 +67,15 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
     $datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
     $datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
 
-    $localtax->accountid=GETPOST("accountid");
-    $localtax->paymenttype=GETPOST("paiementtype");
-    $localtax->datev=$datev;
-    $localtax->datep=$datep;
-    $localtax->amount=price2num(GETPOST("amount"));
-	$localtax->label=GETPOST("label");
-	$localtax->ltt=$lttype;
+    $object->accountid=GETPOST("accountid");
+    $object->paymenttype=GETPOST("paiementtype");
+    $object->datev=$datev;
+    $object->datep=$datep;
+    $object->amount=price2num(GETPOST("amount"));
+	$object->label=GETPOST("label");
+	$object->ltt=$lttype;
 
-    $ret=$localtax->addPayment($user);
+    $ret=$object->addPayment($user);
     if ($ret > 0)
     {
         $db->commit();
@@ -84,7 +85,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
     else
     {
         $db->rollback();
-        setEventMessages($localtax->error, $localtax->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
         $_GET["action"]="create";
     }
 }
@@ -92,39 +93,39 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 //delete payment of localtax
 if ($action == 'delete')
 {
-    $result=$localtax->fetch($id);
+    $result=$object->fetch($id);
 
-	if ($localtax->rappro == 0)
+	if ($object->rappro == 0)
 	{
 	    $db->begin();
 
-	    $ret=$localtax->delete($user);
+	    $ret=$object->delete($user);
 	    if ($ret > 0)
 	    {
-			if ($localtax->fk_bank)
+			if ($object->fk_bank)
 			{
 				$accountline=new AccountLine($db);
-				$result=$accountline->fetch($localtax->fk_bank);
+				$result=$accountline->fetch($object->fk_bank);
 				if ($result > 0) $result=$accountline->delete($user);	// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
 			}
 
 			if ($result >= 0)
 			{
 				$db->commit();
-				header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$localtax->ltt);
+				header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$object->ltt);
 				exit;
 			}
 			else
 			{
-				$localtax->error=$accountline->error;
+				$object->error=$accountline->error;
 				$db->rollback();
-				setEventMessages($localtax->error, $localtax->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 	    }
 	    else
 	    {
 	        $db->rollback();
-	        setEventMessages($localtax->error, $localtax->errors, 'errors');
+	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
 	else
@@ -136,17 +137,12 @@ if ($action == 'delete')
 
 
 /*
-*	View
-*/
-
-llxHeader();
-
-$form = new Form($db);
+ *	View
+ */
 
 if ($id)
 {
-    $vatpayment = new Localtax($db);
-	$result = $vatpayment->fetch($id);
+	$result = $object->fetch($id);
 	if ($result <= 0)
 	{
 		dol_print_error($db);
@@ -154,6 +150,13 @@ if ($id)
 	}
 }
 
+$form = new Form($db);
+
+$title=$langs->trans("LT".$object->ltt) . " - " . $langs->trans("Card");
+$help_url='';
+llxHeader("",$title,$helpurl);
+
+
 
 if ($action == 'create')
 {
@@ -173,7 +176,7 @@ if ($action == 'create')
     print $form->select_date($datep,"datep",'','','','add',1,1);
     print '</td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
+    print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
     print $form->select_date($datev,"datev",'','','','add',1,1);
     print '</td></tr>';
 
@@ -218,47 +221,48 @@ if ($action == 'create')
 }
 
 
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
+// View mode
 if ($id)
 {
 	$h = 0;
-	$head[$h][0] = DOL_URL_ROOT.'/compta/localtax/card.php?id='.$vatpayment->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/localtax/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Card');
 	$head[$h][2] = 'card';
 	$h++;
 
-	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
+	dol_fiche_head($head, 'card', $langs->transcountry("LT".$object->ltt, $mysoc->country_code), -1, 'payment');
 
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/localtax/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border" width="100%">';
 
 	print "<tr>";
-	print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
-	print $vatpayment->ref;
+	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+	print $object->ref;
 	print '</td></tr>';
 
 	print "<tr>";
 	print '<td>'.$langs->trans("DatePayment").'</td><td>';
-	print dol_print_date($vatpayment->datep,'day');
+	print dol_print_date($object->datep,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
-	print dol_print_date($vatpayment->datev,'day');
+	print '<tr><td>'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
+	print dol_print_date($object->datev,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($vatpayment->amount).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
 	if (! empty($conf->banque->enabled))
 	{
-		if ($vatpayment->fk_account > 0)
+		if ($object->fk_account > 0)
 		{
  		   	$bankline=new AccountLine($db);
-    		$bankline->fetch($vatpayment->fk_bank);
+    		$bankline->fetch($object->fk_bank);
 
 	    	print '<tr>';
 	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
@@ -271,22 +275,28 @@ if ($id)
 
     // Other attributes
     $parameters=array();
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action);    // Note that $action and $object may have been modified by hook
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 
     print '</table>';
 
-	dol_fiche_end();
+    print '</div>';
+
+    dol_fiche_end();
 
 
 	/*
-	* Boutons d'actions
-	*/
+	 * Action buttons
+	 */
 	print "<div class=\"tabsAction\">\n";
-	if ($vatpayment->rappro == 0)
-		print '<a class="butActionDelete" href="card.php?id='.$vatpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+	if ($object->rappro == 0)
+	{
+		print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+	}
 	else
+	{
 		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
+	}
 	print "</div>";
 }
 
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 79a88d11c4d..a75de537724 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -29,7 +29,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
  */
 class Localtax extends CommonObject
 {
-    var $ltt;
+	public $element='localtax';			//!< Id that identify managed objects
+	public $table_element='localtax';	//!< Name of table without prefix where object is stored
+	public $picto='payment';
+
+	var $ltt;
 	var $tms;
 	var $datep;
 	var $datev;
@@ -607,4 +611,29 @@ class Localtax extends CommonObject
 		return $result;
 	}
 
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->statut,$mode);
+	}
+
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	function LibStatut($status,$mode=0)
+	{
+		global $langs;	// TODO Renvoyer le libelle anglais et faire traduction a affichage
+
+		return '';
+	}
+
 }
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 3dc3e2777c2..3c8a2a9aef6 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -26,6 +26,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 
 $langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
@@ -163,7 +164,7 @@ if($calc ==0 || $calc == 2)
 	print "<td align=\"right\">".$vatcust."</td>";
 	print "</tr>\n";
 
-	$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
+	$coll_list = tax_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
 
 	$action = "tvaclient";
 	$object = &$coll_list;
@@ -247,7 +248,7 @@ if($calc ==0 || $calc == 1){
 
 	$company_static=new Societe($db);
 
-	$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
+	$coll_list = tax_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
 	$parameters["direction"] = 'buy';
 	$parameters["type"] = 'localtax'.$local;
 
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 39d8a1dfa6a..4e825469b14 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 
 $langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
 
@@ -44,13 +45,12 @@ if (empty($year))
 }
 $date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
 $date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
-// Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$q=GETPOST("q");
+	$q=GETPOST("q","int");
 	if (empty($q))
 	{
-		if (GETPOST("month")) { $date_start=dol_get_first_day($year_start,GETPOST("month"),false); $date_end=dol_get_last_day($year_start,GETPOST("month"),false); }
+		if (GETPOST("month","int")) { $date_start=dol_get_first_day($year_start,GETPOST("month","int"),false); $date_end=dol_get_last_day($year_start,GETPOST("month","int"),false); }
 		else
 		{
 			$date_start=dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START,false);
@@ -81,10 +81,10 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
 /**
  * print function
  *
- * @param   DoliDB $db          Database handler
- * @param   string $sql     	SQL Request
- * @param   string $date    	Date
- * @return  void
+ * @param		DoliDB	$db		Database handler
+ * @param		string	$sql	SQL Request
+ * @param		string	$date	Date
+ * @return		void
  */
 function pt ($db, $sql, $date)
 {
@@ -96,25 +96,78 @@ function pt ($db, $sql, $date)
         $i = 0;
         $total = 0;
         print '<table class="noborder" width="100%">';
+
         print '<tr class="liste_titre">';
-        print '<td class="nowrap" width="60%">'.$date.'</td>';
-        print '<td align="right">'.$langs->trans("Amount").'</td>';
-        print '<td>&nbsp;</td>'."\n";
+        print '<td class="nowrap">'.$date.'</td>';
+        print '<td align="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+        print '<td align="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
         print "</tr>\n";
 
+        $amountclaimed = 0;
+        $amountpaid = 0;
+        $previousmode = '';
         while ($i < $num) {
             $obj = $db->fetch_object($result);
 
-            print '<tr class="oddeven">';
-            print '<td class="nowrap">'.$obj->dm."</td>\n";
-            $total = $total + $obj->mm;
+            if ($obj->mode == 'claimed' && ! empty($previousmode))
+            {
+            	print '<tr class="oddeven">';
+            	print '<td class="nowrap">'.$obj->dm."</td>\n";
+            	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+            	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+            	print "</tr>\n";
 
-            print '<td class="nowrap" align="right">'.price($obj->mm)."</td><td >&nbsp;</td>\n";
-            print "</tr>\n";
+            	$amountclaimed = 0;
+            	$amountpaid = 0;
+            }
+
+            if ($obj->mode == 'claimed')
+            {
+            	$amountclaimed = $obj->mm;
+            	$totalclaimed = $totalclaimed + $amountclaimed;
+            }
+            if ($obj->mode == 'paid')
+            {
+            	$amountpaid = $obj->mm;
+            	$totalpaid = $totalpaid + $amountpaied;
+            }
+
+            if ($obj->mode == 'paid')
+            {
+            	print '<tr class="oddeven">';
+            	print '<td class="nowrap">'.$obj->dm."</td>\n";
+            	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+            	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+            	print "</tr>\n";
+            	$amountclaimed = 0;
+            	$amountpaid = 0;
+            	$previousmode = '';
+            }
+            else
+            {
+            	$previousmode = $obj->mode;
+            }
 
             $i++;
         }
-        print '<tr class="liste_total"><td align="right">'.$langs->trans("Total")." :</td><td class=\"nowrap\" align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>";
+        
+        if ($obj->mode == 'claimed' && ! empty($previousmode))
+        {
+        	print '<tr class="oddeven">';
+        	print '<td class="nowrap">'.$obj->dm."</td>\n";
+        	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+        	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+        	print "</tr>\n";
+        	
+        	$amountclaimed = 0;
+        	$amountpaid = 0;
+        }
+        
+        print '<tr class="liste_total">';
+        print '<td align="right">'.$langs->trans("Total").'</td>';
+        print '<td class="nowrap" align="right">'.price($totalclaimed).'</td>';
+        print '<td class="nowrap" align="right">'.price($totalpaid).'</td>';
+        print "</tr>";
 
         print "</table>";
         $db->free($result);
@@ -149,11 +202,12 @@ if($localTaxType==1) {
 	$CalcLT= $conf->global->MAIN_INFO_LOCALTAX_CALC2;
 }
 
-$description = '';
+$fsearch.='  <input type="hidden" name="localTaxType" value="'.$localTaxType.'">';
+$description = $fsearch;
 
 // Show report header
 $name = $langs->trans("ReportByMonth");
-$description = $langs->trans($LT);
+$description .= $langs->trans($LT);
 $calcmode = $langs->trans("LTReportBuildWithOptionDefinedInModule").' ';
 $calcmode.= '('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')<br>';
 
@@ -173,6 +227,7 @@ llxHeader('', $name);
 report_header($name,'',$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
 //report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
 
+
 print '<br>';
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -207,16 +262,141 @@ $total=0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
 $i=0; $mcursor=0;
 while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000)	// $mcursor is to avoid too large loop
 {
-	$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
+	//$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
 	if ($m == 13) $y++;
 	if ($m > 12) $m -= 12;
 	$mcursor++;
 
-	$coll_listsell = tax_by_date('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
-	$coll_listbuy = tax_by_date('vat', $db, $y, 0, 0, 0, $modetax, 'buy', $m);
+	// Get array with details of each line
+	$x_coll = tax_by_rate(($localTaxType==1?'localtax1':'localtax2'), $db, $y, 0, 0, 0, $modetax, 'sell', $m);
+	$x_paye = tax_by_rate(($localTaxType==1?'localtax1':'localtax2'), $db, $y, 0, 0, 0, $modetax, 'buy', $m);
+
+	$x_both = array();
+	//now, from these two arrays, get another array with one rate per line
+	foreach(array_keys($x_coll) as $my_coll_rate)
+	{
+		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
+		$x_both[$my_coll_rate]['coll']['vat']	 = $x_coll[$my_coll_rate]['vat'];
+		$x_both[$my_coll_rate]['coll']['localtax1']	 = $x_coll[$my_coll_rate]['localtax1'];
+		$x_both[$my_coll_rate]['coll']['localtax2']	 = $x_coll[$my_coll_rate]['localtax2'];
+		$x_both[$my_coll_rate]['paye']['totalht'] = 0;
+		$x_both[$my_coll_rate]['paye']['vat'] = 0;
+		$x_both[$my_coll_rate]['paye']['localtax1'] = 0;
+		$x_both[$my_coll_rate]['paye']['localtax2'] = 0;
+		$x_both[$my_coll_rate]['coll']['links'] = '';
+		$x_both[$my_coll_rate]['coll']['detail'] = array();
+		foreach($x_coll[$my_coll_rate]['facid'] as $id=>$dummy) {
+			//$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
+			//$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
+			//$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
+			//$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
+			$x_both[$my_coll_rate]['coll']['detail'][] = array(
+			'id'        =>$x_coll[$my_coll_rate]['facid'][$id],
+			'descr'     =>$x_coll[$my_coll_rate]['descr'][$id],
+			'pid'       =>$x_coll[$my_coll_rate]['pid'][$id],
+			'pref'      =>$x_coll[$my_coll_rate]['pref'][$id],
+			'ptype'     =>$x_coll[$my_coll_rate]['ptype'][$id],
+			'payment_id'=>$x_coll[$my_coll_rate]['payment_id'][$id],
+			'payment_amount'=>$x_coll[$my_coll_rate]['payment_amount'][$id],
+			'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
+			'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
+			'dtype'     =>$x_coll[$my_coll_rate]['dtype'][$id],
+			'datef'     =>$x_coll[$my_coll_rate]['datef'][$id],
+			'datep'     =>$x_coll[$my_coll_rate]['datep'][$id],
+			//'company_link'=>$company_static->getNomUrl(1,'',20),
+			'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
+			'ddate_end'  =>$x_coll[$my_coll_rate]['ddate_end'][$id],
+
+			'totalht'   =>$x_coll[$my_coll_rate]['totalht_list'][$id],
+			'vat'       =>$x_coll[$my_coll_rate]['vat_list'][$id],
+			'localtax1' =>$x_coll[$my_coll_rate]['localtax1_list'][$id],
+			'localtax2' =>$x_coll[$my_coll_rate]['localtax2_list'][$id],
+			//'link'      =>$invoice_customer->getNomUrl(1,'',12)
+			);
+		}
+	}
+
+	// tva paid
+	foreach (array_keys($x_paye) as $my_paye_rate) {
+		$x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
+		$x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
+		$x_both[$my_paye_rate]['paye']['localtax1'] = $x_paye[$my_paye_rate]['localtax1'];
+		$x_both[$my_paye_rate]['paye']['localtax2'] = $x_paye[$my_paye_rate]['localtax2'];
+		if (!isset($x_both[$my_paye_rate]['coll']['totalht'])) {
+			$x_both[$my_paye_rate]['coll']['totalht'] = 0;
+			$x_both[$my_paye_rate]['coll']['vat'] = 0;
+			$x_both[$my_paye_rate]['coll']['localtax1'] = 0;
+			$x_both[$my_paye_rate]['coll']['localtax2'] = 0;
+		}
+		$x_both[$my_paye_rate]['paye']['links'] = '';
+		$x_both[$my_paye_rate]['paye']['detail'] = array();
+
+		foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
+		{
+			// ExpenseReport
+			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment')
+			{
+				//$expensereport->id=$x_paye[$my_paye_rate]['facid'][$id];
+				//$expensereport->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+				//$expensereport->type=$x_paye[$my_paye_rate]['type'][$id];
+
+				$x_both[$my_paye_rate]['paye']['detail'][] = array(
+				'id'				=>$x_paye[$my_paye_rate]['facid'][$id],
+				'descr'				=>$x_paye[$my_paye_rate]['descr'][$id],
+				'pid'				=>$x_paye[$my_paye_rate]['pid'][$id],
+				'pref'				=>$x_paye[$my_paye_rate]['pref'][$id],
+				'ptype'				=>$x_paye[$my_paye_rate]['ptype'][$id],
+				'payment_id'		=>$x_paye[$my_paye_rate]['payment_id'][$id],
+				'payment_amount'	=>$x_paye[$my_paye_rate]['payment_amount'][$id],
+				'ftotal_ttc'		=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+				'dtotal_ttc'		=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+				'dtype'				=>$x_paye[$my_paye_rate]['dtype'][$id],
+				'ddate_start'		=>$x_paye[$my_paye_rate]['ddate_start'][$id],
+				'ddate_end'			=>$x_paye[$my_paye_rate]['ddate_end'][$id],
+
+				'totalht'			=>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
+				'localtax1'			=>$x_paye[$my_paye_rate]['localtax1_list'][$id],
+				'localtax2'			=>$x_paye[$my_paye_rate]['localtax2_list'][$id],
+				//'link'				=>$expensereport->getNomUrl(1)
+				);
+			}
+			else
+			{
+				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
+				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
+				//$company_static->fetch($x_paye[$my_paye_rate]['company_id'][$id]);
+				$x_both[$my_paye_rate]['paye']['detail'][] = array(
+				'id'        =>$x_paye[$my_paye_rate]['facid'][$id],
+				'descr'     =>$x_paye[$my_paye_rate]['descr'][$id],
+				'pid'       =>$x_paye[$my_paye_rate]['pid'][$id],
+				'pref'      =>$x_paye[$my_paye_rate]['pref'][$id],
+				'ptype'     =>$x_paye[$my_paye_rate]['ptype'][$id],
+				'payment_id'=>$x_paye[$my_paye_rate]['payment_id'][$id],
+				'payment_amount'=>$x_paye[$my_paye_rate]['payment_amount'][$id],
+				'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+				'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+				'dtype'     =>$x_paye[$my_paye_rate]['dtype'][$id],
+				'datef'     =>$x_paye[$my_paye_rate]['datef'][$id],
+				'datep'     =>$x_paye[$my_paye_rate]['datep'][$id],
+				//'company_link'=>$company_static->getNomUrl(1,'',20),
+				'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
+				'ddate_end'  =>$x_paye[$my_paye_rate]['ddate_end'][$id],
+
+				'totalht'   =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+				'vat'       =>$x_paye[$my_paye_rate]['vat_list'][$id],
+				'localtax1' =>$x_paye[$my_paye_rate]['localtax1_list'][$id],
+				'localtax2' =>$x_paye[$my_paye_rate]['localtax2_list'][$id],
+				//'link'      =>$invoice_supplier->getNomUrl(1,'',12)
+				);
+			}
+		}
+	}
+	//now we have an array (x_both) indexed by rates for coll and paye
 
     $action = "tva";
-    $object = array(&$coll_listsell, &$coll_listbuy);
+    $object = array(&$x_coll, &$x_paye, &$x_both);
     $parameters["mode"] = $modetax;
     $parameters["year"] = $y;
     $parameters["month"] = $m;
@@ -226,13 +406,13 @@ while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000)	// $mcu
     $hookmanager->initHooks(array('externalbalance'));
     $reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-    if (! is_array($coll_listbuy) && $coll_listbuy == -1)
+    if (! is_array($x_coll) && $coll_listbuy == -1)
     {
         $langs->load("errors");
         print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
         break;
     }
-    if (! is_array($coll_listbuy) && $coll_listbuy == -2)
+    if (! is_array($x_paye) && $coll_listbuy == -2)
     {
         print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
         break;
@@ -240,76 +420,121 @@ while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000)	// $mcu
 
 
     print '<tr class="oddeven">';
-    print '<td class="nowrap"><a href="quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</a></td>';
-    
-    if ($CalcLT==0) {
-        $x_coll = 0;
-        foreach($coll_listsell as $vatrate=>$val) {
-	        $x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
-	    }
-	    $subtotalcoll = $subtotalcoll + $x_coll;
-	    print "<td class=\"nowrap\" align=\"right\">".price($x_coll)."</td>";
+    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/localtax/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</a></td>';
 
-	    $x_paye = 0;
-	    foreach($coll_listbuy as $vatrate=>$val) {
-	        $x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
-	    }
-	    $subtotalpaye = $subtotalpaye + $x_paye;
-	    print "<td class=\"nowrap\" align=\"right\">".price($x_paye)."</td>";
-    } elseif($CalcLT==1) {
-    	$x_paye = 0;
-    	foreach($coll_listbuy as $vatrate=>$val) {
-    		$x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
+    $x_coll_sum = 0;
+    foreach (array_keys($x_coll) as $rate)
+    {
+    	$subtot_coll_total_ht = 0;
+    	$subtot_coll_vat = 0;
+
+    	foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+    	{
+    		// Payment
+    		$ratiopaymentinvoice=1;
+    		if ($modetax != 1)
+    		{
+    			// Define type
+    			// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+    			$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+    			// Try to enhance type detection using date_start and date_end for free lines where type
+    			// was not saved.
+    			if (!empty($fields['ddate_start'])) {
+    				$type=1;
+    			}
+    			if (!empty($fields['ddate_end'])) {
+    				$type=1;
+    			}
+
+    			if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+    				|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+    			{
+    				//print $langs->trans("NA");
+    			} else {
+    				if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+    					$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+    				}
+    			}
+    		}
+    		//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+    		$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+    		$temp_vat=$fields['localtax'.$localTaxType]*$ratiopaymentinvoice;
+    		$subtot_coll_total_ht += $temp_ht;
+    		$subtot_coll_vat      += $temp_vat;
+    		$x_coll_sum           += $temp_vat;
     	}
-    	$subtotalpaye = $subtotalpaye + $x_paye;
-    	print "<td class=\"nowrap\" align=\"right\">".price($x_paye)."</td><td></td>";
-    } elseif($CalcLT==2) {
-    	$x_coll = 0;
-    	foreach($coll_listsell as $vatrate=>$val) {
-    		$x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
+    }
+    print "<td class=\"nowrap\" align=\"right\">".price(price2num($x_coll_sum,'MT'))."</td>";
+
+    $x_paye_sum = 0;
+    foreach (array_keys($x_paye) as $rate)
+    {
+    	$subtot_paye_total_ht = 0;
+    	$subtot_paye_vat = 0;
+
+    	foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+    	{
+    		// Payment
+    		$ratiopaymentinvoice=1;
+    		if ($modetax != 1)
+    		{
+    			// Define type
+    			// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+    			$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+    			// Try to enhance type detection using date_start and date_end for free lines where type
+    			// was not saved.
+    			if (!empty($fields['ddate_start'])) {
+    				$type=1;
+    			}
+    			if (!empty($fields['ddate_end'])) {
+    				$type=1;
+    			}
+
+    			if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+    				|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+    			{
+    				//print $langs->trans("NA");
+    			} else {
+    				if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+    					$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+    				}
+    			}
+    		}
+    		//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+    		$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+    		$temp_vat=$fields['localtax'.$localTaxType]*$ratiopaymentinvoice;
+    		$subtot_paye_total_ht += $temp_ht;
+    		$subtot_paye_vat      += $temp_vat;
+    		$x_paye_sum           += $temp_vat;
     	}
-    	$subtotalcoll = $subtotalcoll + $x_coll;
-    	print "<td class=\"nowrap\" align=\"right\">".price($x_coll)."</td><td></td>";
-
     }
+    print "<td class=\"nowrap\" align=\"right\">".price(price2num($x_paye_sum,'MT'))."</td>";
 
-    if($CalcLT==0) {
-        $diff= $x_coll - $x_paye;
-    } elseif($CalcLT==1) {
-        $diff= $x_paye;
-    } elseif($CalcLT==2) {
-        $diff= $x_coll;
-    }
+    $subtotalcoll = $subtotalcoll + $x_coll_sum;
+    $subtotalpaye = $subtotalpaye + $x_paye_sum;
 
+    $diff = $x_coll_sum - $x_paye_sum;
     $total = $total + $diff;
-    $subtotal = $subtotal + $diff;
+    $subtotal = price2num($subtotal + $diff, 'MT');
 
-    print "<td class=\"nowrap\" align=\"right\">".price($diff)."</td>\n";
+    print "<td class=\"nowrap\" align=\"right\">".price(price2num($diff,'MT'))."</td>\n";
     print "<td>&nbsp;</td>\n";
     print "</tr>\n";
 
-    $i++;
+    $i++; $m++;
     if ($i > 2)
     {
-        print '<tr class="liste_total">';
-        print '<td align="right">'.$langs->trans("SubTotal").':</td>';
-        if($CalcLT==0) {
-        	print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td>';
-        	print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td>';
-        	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
-        } elseif($CalcLT==1) {
-        	print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td><td></td>';
-        	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
-        } elseif($CalcLT==2) {
-        	print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td><td></td>';
-        	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
-        }
-        print '<td>&nbsp;</td></tr>';
-        $i = 0;
-        $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
+    	print '<tr class="liste_total">';
+    	print '<td align="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.($m/3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+    	print '<td class="nowrap" align="right">'.price(price2num($subtotalcoll,'MT')).'</td>';
+    	print '<td class="nowrap" align="right">'.price(price2num($subtotalpaye,'MT')).'</td>';
+    	print '<td class="nowrap" align="right">'.price(price2num($subtotal,'MT')).'</td>';
+    	print '<td>&nbsp;</td></tr>';
+    	$i = 0;
+    	$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
     }
 }
-print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap" align="right">'.price($total).'</td>';
+print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap" align="right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
 print '</tr>';
 
@@ -318,27 +543,39 @@ print '</table>';
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
-print load_fiche_titre($langs->transcountry($LTPaid,$mysoc->country_code), '', '');
+
 
 /*
  * Payed
  */
 
-$sql = "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm";
+print load_fiche_titre($langs->transcountry($LTPaid,$mysoc->country_code), '', '');
+
+$sql='';
+
+$sql.= "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm, 'claimed' as mode";
 $sql.= " FROM ".MAIN_DB_PREFIX."localtax as f";
 $sql.= " WHERE f.entity = ".$conf->entity;
-$sql.= " AND f.datev >= '".$db->idate($date_start)."'";
-$sql.= " AND f.datev <= '".$db->idate($date_end)."'";
+$sql.= " AND (f.datev >= '".$db->idate($date_start)."' AND f.datev <= '".$db->idate($date_end)."')";
 $sql.= " AND localtaxtype=".$localTaxType;
 $sql.= " GROUP BY dm";
-$sql.= " ORDER BY dm ASC";
 
-pt($db, $sql,$langs->trans("Year")." $y");
+$sql.= " UNION ";
+
+$sql.= "SELECT SUM(amount) as mm, date_format(f.datep,'%Y-%m') as dm, 'paid' as mode";
+$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f";
+$sql.= " WHERE f.entity = ".$conf->entity;
+$sql.= " AND (f.datep >= '".$db->idate($date_start)."' AND f.datep <= '".$db->idate($date_end)."')";
+$sql.= " AND localtaxtype=".$localTaxType;
+$sql.= " GROUP BY dm";
+
+$sql.= " ORDER BY dm ASC, mode ASC";
+//print $sql;
+
+pt($db, $sql, $langs->trans("Month"));
 
-print '<br>';
 
 print '</div></div>';
 
-
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 50bc87d4d27..6668e3d61db 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -44,15 +44,17 @@ $localtax_static = new Localtax($db);
 $newcardbutton='';
 if ($user->rights->tax->charges->creer)
 {
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt.'">'.$langs->trans('NewVATPayment').'</a>';
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt.'">'.$langs->trans('NewVATPayment');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code), $newcardbutton);
 
-$sql = "SELECT rowid, amount, label, f.datev as dm";
+$sql = "SELECT rowid, amount, label, f.datev, f.datep";
 $sql.= " FROM ".MAIN_DB_PREFIX."localtax as f ";
 $sql.= " WHERE f.entity = ".$conf->entity." AND localtaxtype=".$db->escape($ltt);
-$sql.= " ORDER BY dm DESC";
+$sql.= " ORDER BY datev DESC";
 
 $result = $db->query($sql);
 if ($result)
@@ -65,6 +67,7 @@ if ($result)
     print '<tr class="liste_titre">';
     print '<td class="nowrap" align="left">'.$langs->trans("Ref").'</td>';
     print "<td>".$langs->trans("Label")."</td>";
+    print "<td>".$langs->trans("PeriodEndDate")."</td>";
     print '<td class="nowrap" align="left">'.$langs->trans("DatePayment").'</td>';
     print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
     print "</tr>\n";
@@ -79,7 +82,8 @@ if ($result)
 		$localtax_static->ref=$obj->rowid;
 		print "<td>".$localtax_static->getNomUrl(1)."</td>\n";
         print "<td>".dol_trunc($obj->label,40)."</td>\n";
-        print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
+        print '<td align="left">'.dol_print_date($db->jdate($obj->datev),'day')."</td>\n";
+        print '<td align="left">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
         $total = $total + $obj->amount;
 
         print "<td align=\"right\">".price($obj->amount)."</td>";
@@ -87,8 +91,8 @@ if ($result)
 
         $i++;
     }
-    print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total").'</td>';
-    print "<td align=\"right\"><b>".price($total)."</b></td></tr>";
+    print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
+    print '<td align="right">'.price($total).'</td></tr>';
 
     print "</table>";
     $db->free($result);
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index db316a1d6dc..8d7843b5cea 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -22,8 +22,7 @@
 /**
  *	    \file       htdocs/compta/tva/quadri_detail.php
  *      \ingroup    tax
- *		\brief      Trimestrial page - detailed version
- *		TODO 		Deal with recurrent invoices as well
+ *		\brief      Local tax by rate
  */
 global $mysoc;
 
@@ -31,18 +30,21 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 
 $langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
 
 $local=GETPOST('localTaxType', 'int');
 // Date range
-$year=GETPOST("year");
+$year=GETPOST("year","int");
 if (empty($year))
 {
 	$year_current = strftime("%Y",dol_now());
@@ -51,16 +53,15 @@ if (empty($year))
 	$year_current = $year;
 	$year_start = $year;
 }
-
-$date_start = dol_mktime( 0, 0, 0, GETPOST( "date_startmonth" ), GETPOST( "date_startday" ), GETPOST( "date_startyear" ) );
-$date_end   = dol_mktime( 23, 59, 59, GETPOST( "date_endmonth" ), GETPOST( "date_endday" ), GETPOST( "date_endyear" ) );
+$date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
+$date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
 // Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$q=GETPOST("q");
+	$q=GETPOST("q","int");
 	if (empty($q))
 	{
-		if (GETPOST("month")) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,GETPOST("month"),false); }
+		if (GETPOST("month","int")) { $date_start=dol_get_first_day($year_start,GETPOST("month","int"),false); $date_end=dol_get_last_day($year_start,GETPOST("month","int"),false); }
 		else
 		{
 			$date_start=dol_get_first_day($year_start,empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START,false);
@@ -83,7 +84,9 @@ if (empty($min)) $min = 0;
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
-$modetax = $conf->global->TAX_MODE;
+//$modetax = $conf->global->TAX_MODE;
+$calc=$conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
+$modetax=$conf->global->$calc;
 if (GETPOSTISSET("modetax")) $modetax=GETPOST("modetax",'int');
 if (empty($modetax)) $modetax=0;
 
@@ -92,121 +95,123 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
-/**
+
+
+/*
  * View
  */
+
+$form=new Form($db);
+$company_static=new Societe($db);
+$invoice_customer=new Facture($db);
+$invoice_supplier=new FactureFournisseur($db);
+$expensereport=new ExpenseReport($db);
+$product_static=new Product($db);
+$payment_static=new Paiement($db);
+$paymentfourn_static=new PaiementFourn($db);
+$paymentexpensereport_static=new PaymentExpenseReport($db);
+
 $morequerystring='';
 $listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
-foreach($listofparams as $param)
+foreach ($listofparams as $param)
 {
 	if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
 }
 
-llxHeader('','','','',0,0,'','',$morequerystring);
-
-$form=new Form($db);
-
-$company_static=new Societe($db);
-$invoice_customer=new Facture($db);
-$invoice_supplier=new FactureFournisseur($db);
-$product_static=new Product($db);
-$payment_static=new Paiement($db);
-$paymentfourn_static=new PaiementFourn($db);
+llxHeader('',$langs->trans("LocalTaxReport"),'','',0,0,'','',$morequerystring);
 
 $fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
 $fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
 $fsearch.='  <input type="hidden" name="localTaxType" value="'.$local.'">';
 
 $name=$langs->transcountry($local==1?"LT1ReportByQuarters":"LT2ReportByQuarters", $mysoc->country_code);
-$calc=$conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
-
-if ($conf->global->$calc==0 || $conf->global->$calc==1)	// Calculate on invoice for goods and services
-{
-    $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT".$local."Rec");
-    $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
-    $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-    $prevyear=$year_start; $prevquarter=$q;
-	if ($prevquarter > 1) $prevquarter--;
-	else { $prevquarter=4; $prevyear--; }
-	$nextyear=$year_start; $nextquarter=$q;
-	if ($nextquarter < 4) $nextquarter++;
-	else { $nextquarter=1; $nextyear++; }
-
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.='<br>'.$langs->trans("DepositsAreNotIncluded");
-	else  $description.='<br>'.$langs->trans("DepositsAreIncluded");
-    $description.=$fsearch;
-    $builddate=dol_now();
-
-	$elementcust=$langs->trans("CustomersInvoices");
-	$productcust=$langs->trans("ProductOrService");
-	$amountcust=$langs->trans("AmountHT");
-	$vatcust=$langs->trans("VATReceived");
-	if ($mysoc->tva_assuj) $vatcust.=' ('.$langs->trans("ToPay").')';
-	$elementsup=$langs->trans("SuppliersInvoices");
-	$productsup=$langs->trans("ProductOrService");
-	$amountsup=$langs->trans("AmountHT");
-	$vatsup=$langs->trans("VATPaid");
-	if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
+$calcmode='';
+if ($modetax == 0) $calcmode=$langs->trans('OptionVATDefault');
+if ($modetax == 1) $calcmode=$langs->trans('OptionVATDebitOption');
+if ($modetax == 2) $calcmode=$langs->trans('OptionPaymentForProductAndServices');
+$calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+// Set period
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+$prevyear=$year_start; $prevquarter=$q;
+if ($prevquarter > 1) {
+	$prevquarter--;
+} else {
+	$prevquarter=4; $prevyear--;
 }
-if ($conf->global->$calc==2) 	// Invoice for goods, payment for services
-{
-    $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT".$local."Rec");
-    $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
-    $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-    $prevyear=$year_start; $prevquarter=$q;
-	if ($prevquarter > 1) $prevquarter--;
-	else { $prevquarter=4; $prevyear--; }
-	$nextyear=$year_start; $nextquarter=$q;
-	if ($nextquarter < 4) $nextquarter++;
-	else { $nextquarter=1; $nextyear++; }
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.=' '.$langs->trans("DepositsAreNotIncluded");
-	else  $description.=' '.$langs->trans("DepositsAreIncluded");
-    $description.=$fsearch;
-	$builddate=dol_now();
-
-	$elementcust=$langs->trans("CustomersInvoices");
-	$productcust=$langs->trans("ProductOrService");
-	$amountcust=$langs->trans("AmountHT");
-	$vatcust=$langs->trans("VATReceived");
-	if ($mysoc->tva_assuj) $vatcust.=' ('.$langs->trans("ToPay").')';
-	$elementsup=$langs->trans("SuppliersInvoices");
-	$productsup=$langs->trans("ProductOrService");
-	$amountsup=$langs->trans("AmountHT");
-	$vatsup=$langs->trans("VATPaid");
-	if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
+$nextyear=$year_start; $nextquarter=$q;
+if ($nextquarter < 4) {
+	$nextquarter++;
+} else {
+	$nextquarter=1; $nextyear++;
 }
+$description.=$fsearch;
+$builddate=dol_now();
+
+/*if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description.=$langs->trans("RulesVATDueProducts");
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description.=$langs->trans("RulesVATInProducts");
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description.='<br>'.$langs->trans("RulesVATDueServices");
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description.='<br>'.$langs->trans("RulesVATInServices");
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$description.='<br>'.$langs->trans("DepositsAreNotIncluded");
+}
+*/
+if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue");
+
+// Customers invoices
+$elementcust=$langs->trans("CustomersInvoices");
+$productcust=$langs->trans("ProductOrService");
+$amountcust=$langs->trans("AmountHT");
+$vatcust=$langs->trans("VATReceived");
+$namecust=$langs->trans("Name");
+if ($mysoc->tva_assuj) {
+	$vatcust.=' ('.$langs->trans("ToPay").')';
+}
+
+// Suppliers invoices
+$elementsup=$langs->trans("SuppliersInvoices");
+$productsup=$productcust;
+$amountsup=$amountcust;
+$vatsup=$langs->trans("VATPaid");
+$namesup=$namecust;
+if ($mysoc->tva_assuj) {
+	$vatsup.=' ('.$langs->trans("ToGetBack").')';
+}
+
+
 report_header($name,'',$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
 
 
 if($local==1){
 	$vatcust=$langs->transcountry("LocalTax1", $mysoc->country_code);
 	$vatsup=$langs->transcountry("LocalTax1", $mysoc->country_code);
+	$vatexpensereport=$langs->transcountry("LocalTax1", $mysoc->country_code);
 }else{
 	$vatcust=$langs->transcountry("LocalTax2", $mysoc->country_code);
 	$vatsup=$langs->transcountry("LocalTax2", $mysoc->country_code);
+	$vatexpensereport=$langs->transcountry("LocalTax2", $mysoc->country_code);
 }
 
 // VAT Received and paid
+echo '<table class="noborder" width="100%">';
 
 $y = $year_current;
 $total = 0;
 $i=0;
+$columns = 5;
 
 // Load arrays of datas
-$x_coll = tax_by_date('localtax' . $local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
-$x_paye = tax_by_date('localtax' . $local, $db, 0, 0, $date_start, $date_end, $modetax, 'buy');
-
-echo '<table class="noborder" width="100%">';
+$x_coll = tax_by_rate('localtax' . $local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
+$x_paye = tax_by_rate('localtax' . $local, $db, 0, 0, $date_start, $date_end, $modetax, 'buy');
 
 if (! is_array($x_coll) || ! is_array($x_paye))
 {
 	$langs->load("errors");
 	if ($x_coll == -1)
-		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 	else if ($x_coll == -2)
-		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 	else
-		print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
 }
 else
 {
@@ -226,6 +231,7 @@ else
 			$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
 			$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
 			$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
+			$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
 			$x_both[$my_coll_rate]['coll']['detail'][] = array(
 				'id'        =>$x_coll[$my_coll_rate]['facid'][$id],
 				'descr'     =>$x_coll[$my_coll_rate]['descr'][$id],
@@ -237,20 +243,24 @@ else
 				'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
 				'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
 				'dtype'     =>$x_coll[$my_coll_rate]['dtype'][$id],
+				'datef'     =>$x_coll[$my_coll_rate]['datef'][$id],
+				'datep'     =>$x_coll[$my_coll_rate]['datep'][$id],
+				'company_link'=>$company_static->getNomUrl(1,'',20),
 				'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
 				'ddate_end'  =>$x_coll[$my_coll_rate]['ddate_end'][$id],
 				'totalht'   =>$x_coll[$my_coll_rate]['totalht_list'][$id],
 				'localtax1'=> $x_coll[$my_coll_rate]['localtax1_list'][$id],
 				'localtax2'=> $x_coll[$my_coll_rate]['localtax2_list'][$id],
 				'vat'       =>$x_coll[$my_coll_rate]['vat_list'][$id],
-				'link'      =>$invoice_customer->getNomUrl(1,'',12));
+				'link'      =>$invoice_customer->getNomUrl(1,'',12)
+			);
 		}
 	}
 	// tva paid
-	foreach(array_keys($x_paye) as $my_paye_rate){
+	foreach(array_keys($x_paye) as $my_paye_rate) {
 		$x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
 		$x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
-		if(!isset($x_both[$my_paye_rate]['coll']['totalht'])){
+		if(!isset($x_both[$my_paye_rate]['coll']['totalht'])) {
 			$x_both[$my_paye_rate]['coll']['totalht'] = 0;
 			$x_both[$my_paye_rate]['coll']['vat'] = 0;
 		}
@@ -273,35 +283,39 @@ else
 				'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
 				'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
 				'dtype'     =>$x_paye[$my_paye_rate]['dtype'][$id],
+				'datef'     =>$x_paye[$my_paye_rate]['datef'][$id],
+				'datep'     =>$x_paye[$my_paye_rate]['datep'][$id],
+				'company_link'=>$company_static->getNomUrl(1,'',20),
 				'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
 				'ddate_end'  =>$x_paye[$my_paye_rate]['ddate_end'][$id],
 				'totalht'   =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
 				'localtax1'=> $x_paye[$my_paye_rate]['localtax1_list'][$id],
 				'localtax2'=> $x_paye[$my_paye_rate]['localtax2_list'][$id],
 				'vat'       =>$x_paye[$my_paye_rate]['vat_list'][$id],
-				'link'      =>$invoice_supplier->getNomUrl(1,'',12));
+				'link'      =>$invoice_supplier->getNomUrl(1,'',12)
+			);
 		}
 	}
 	//now we have an array (x_both) indexed by rates for coll and paye
 
+	//print table headers for this quadri - incomes first
+
 	$x_coll_sum = 0;
 	$x_coll_ht = 0;
 	$x_paye_sum = 0;
 	$x_paye_ht = 0;
 
-	$span=3;
-	if ($modetax == 0) $span+=2;
+	$span=$columns;
+	if ($modetax != 1) $span+=2;
 
-	if($conf->global->$calc ==0 || $conf->global->$calc == 2){
+	//if ($modetax == 0 || $modetax == 2)
+	//{
 		// Customers invoices
 		print '<tr class="liste_titre">';
 		print '<td align="left">'.$elementcust.'</td>';
 		print '<td align="left">'.$productcust.'</td>';
-		if ($modetax == 0)
-		{
-			print '<td align="right">'.$amountcust.'</td>';
-			print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
-		}
+		if ($modetax != 2) print '<td align="right">'.$amountcust.'</td>';
+		if ($modetax != 1) print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
 		print '<td align="right">'.$langs->trans("BI").'</td>';
 		print '<td align="right">'.$vatcust.'</td>';
 		print '</tr>';
@@ -317,8 +331,6 @@ else
 			if (is_array($x_both[$rate]['coll']['detail']))
 			{
 				// VAT Rate
-				$var=true;
-
 				if($rate!=0){
 					print "<tr>";
 					print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
@@ -326,116 +338,116 @@ else
 				}
 				foreach($x_both[$rate]['coll']['detail'] as $index => $fields)
 				{
-					if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0)){
-					// Define type
-					$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
-					// Try to enhance type detection using date_start and date_end for free lines where type
-					// was not saved.
-					if (! empty($fields['ddate_start'])) $type=1;
-					if (! empty($fields['ddate_end'])) $type=1;
-
-
-					print '<tr class="oddeven">';
-
-					// Ref
-					print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
-
-					// Description
-					print '<td align="left">';
-					if ($fields['pid'])
+					if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0))
 					{
-						$product_static->id=$fields['pid'];
-						$product_static->ref=$fields['pref'];
-						$product_static->type=$fields['ptype'];
-						print $product_static->getNomUrl(1);
-						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
-					}
-					else
-					{
-						if ($type) $text = img_object($langs->trans('Service'),'service');
-						else $text = img_object($langs->trans('Product'),'product');
-			            if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg))
-			            {
-			                if ($reg[1]=='DEPOSIT') $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
-			                elseif ($reg[1]=='CREDIT_NOTE') $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
-			                else $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
-			            }
-						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+						// Define type
+						$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+						// Try to enhance type detection using date_start and date_end for free lines where type
+						// was not saved.
+						if (! empty($fields['ddate_start'])) $type=1;
+						if (! empty($fields['ddate_end'])) $type=1;
 
-						// Show range
-						print_date_range($fields['ddate_start'],$fields['ddate_end']);
-					}
-					print '</td>';
 
-					// Total HT
-					if ($modetax == 0)
-					{
-						print '<td class="nowrap" align="right">';
-						print price($fields['totalht']);
-						if (price2num($fields['ftotal_ttc']))
+						print '<tr class="oddeven">';
+
+						// Ref
+						print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+
+						// Description
+						print '<td align="left">';
+						if ($fields['pid'])
 						{
-							$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+							$product_static->id=$fields['pid'];
+							$product_static->ref=$fields['pref'];
+							$product_static->type=$fields['ptype'];
+							print $product_static->getNomUrl(1);
+							if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+						}
+						else
+						{
+							if ($type) $text = img_object($langs->trans('Service'),'service');
+							else $text = img_object($langs->trans('Product'),'product');
+				            if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg))
+				            {
+				                if ($reg[1]=='DEPOSIT') $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+				                elseif ($reg[1]=='CREDIT_NOTE') $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+				                else $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+				            }
+							print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+							// Show range
+							print_date_range($fields['ddate_start'],$fields['ddate_end']);
 						}
 						print '</td>';
-					}
 
-					// Payment
-					$ratiopaymentinvoice=1;
-					if ($modetax == 0)
-					{
-						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+						// Total HT
+						if ($modetax != 2)
+						{
+							print '<td class="nowrap" align="right">';
+							print price($fields['totalht']);
+							if (price2num($fields['ftotal_ttc']))
+							{
+								$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+							}
+							print '</td>';
+						}
+
+						// Payment
+						$ratiopaymentinvoice=1;
+						if ($modetax != 1)
+						{
+							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+							print '<td class="nowrap" align="right">';
+							if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+							{
+								$payment_static->id=$fields['payment_id'];
+								print $payment_static->getNomUrl(2);
+							}
+							if ($type == 0)
+							{
+								print $langs->trans("NotUsedForGoods");
+							}
+							else {
+								print price($fields['payment_amount']);
+								if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+							}
+							print '</td>';
+						}
+
+						// Total collected
 						print '<td class="nowrap" align="right">';
-						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-						{
-							$payment_static->id=$fields['payment_id'];
-							print $payment_static->getNomUrl(2);
-						}
-						if ($type == 0)
-						{
-							print $langs->trans("NotUsedForGoods");
-						}
-						else {
-							print price($fields['payment_amount']);
-							if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
-						}
+						$temp_ht=$fields['totalht'];
+						if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+						print price(price2num($temp_ht,'MT'));
 						print '</td>';
+
+						// Localtax
+						print '<td class="nowrap" align="right">';
+						$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
+						print price(price2num($temp_vat,'MT'));
+						//print price($fields['vat']);
+						print '</td>';
+						print '</tr>';
+
+						$subtot_coll_total_ht += $temp_ht;
+						$subtot_coll_vat      += $temp_vat;
+						$x_coll_sum           += $temp_vat;
 					}
-
-					// Total collected
-					print '<td class="nowrap" align="right">';
-					$temp_ht=$fields['totalht'];
-					if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
-					print price(price2num($temp_ht,'MT'));
-					print '</td>';
-
-					// Localtax
-					print '<td class="nowrap" align="right">';
-					$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
-					print price(price2num($temp_vat,'MT'));
-					//print price($fields['vat']);
-					print '</td>';
-					print '</tr>';
-
-					$subtot_coll_total_ht += $temp_ht;
-					$subtot_coll_vat      += $temp_vat;
-					$x_coll_sum           += $temp_vat;
 				}
 			}
-			}
-			if($rate!=0){
-		        // Total customers for this vat rate
-		        print '<tr class="liste_total">';
-		        print '<td></td>';
-		        print '<td align="right">'.$langs->trans("Total").':</td>';
-		        if ($modetax == 0)
-		        {
-		            print '<td class="nowrap" align="right">&nbsp;</td>';
-		            print '<td align="right">&nbsp;</td>';
-		        }
-		        print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
-		        print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
-		        print '</tr>';
-			}
+
+		    // Total customers for this vat rate
+		    print '<tr class="liste_total">';
+		    print '<td></td>';
+		    print '<td align="right">'.$langs->trans("Total").':</td>';
+		    if ($modetax != 1)
+		    {
+		        print '<td class="nowrap" align="right">&nbsp;</td>';
+		        print '<td align="right">&nbsp;</td>';
+		    }
+		    print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
+		    print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
+		    print '</tr>';
 		}
 
 	    if (count($x_coll) == 0)   // Show a total ine if nothing shown
@@ -457,15 +469,15 @@ else
 		print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
 		print '</table>';
 		$diff=$x_coll_sum;
-	}
+	//}
 
-	if($conf->global->$calc ==0 || $conf->global->$calc == 1){
+	//if($conf->global->$calc ==0 || $conf->global->$calc == 1){
 		echo '<table class="noborder" width="100%">';
 		//print table headers for this quadri - expenses now
 		print '<tr class="liste_titre">';
 		print '<td align="left">'.$elementsup.'</td>';
 		print '<td align="left">'.$productsup.'</td>';
-		if ($modetax == 0)
+		if ($modetax != 1)
 		{
 			print '<td align="right">'.$amountsup.'</td>';
 			print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
@@ -479,9 +491,8 @@ else
 			$subtot_paye_total_ht = 0;
 			$subtot_paye_vat = 0;
 
-			if(is_array($x_both[$rate]['paye']['detail']))
+			if (is_array($x_both[$rate]['paye']['detail']))
 			{
-				$var=true;
 				if($rate!=0){
 					print "<tr>";
 					print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
@@ -489,149 +500,144 @@ else
 				}
 				foreach($x_both[$rate]['paye']['detail'] as $index=>$fields)
 				{
-					if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0)){
-					// Define type
-					$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
-					// Try to enhance type detection using date_start and date_end for free lines where type
-					// was not saved.
-					if (! empty($fields['ddate_start'])) $type=1;
-					if (! empty($fields['ddate_end'])) $type=1;
-
-
-					print '<tr class="oddeven">';
-
-					// Ref
-					print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
-
-					// Description
-					print '<td align="left">';
-					if ($fields['pid'])
+					if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0))
 					{
-						$product_static->id=$fields['pid'];
-						$product_static->ref=$fields['pref'];
-						$product_static->type=$fields['ptype'];
-						print $product_static->getNomUrl(1);
-						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
-					}
-					else
-					{
-						if ($type) $text = img_object($langs->trans('Service'),'service');
-						else $text = img_object($langs->trans('Product'),'product');
-						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+						// Define type
+						$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+						// Try to enhance type detection using date_start and date_end for free lines where type
+						// was not saved.
+						if (! empty($fields['ddate_start'])) $type=1;
+						if (! empty($fields['ddate_end'])) $type=1;
 
-						// Show range
-						print_date_range($fields['ddate_start'],$fields['ddate_end']);
-					}
-					print '</td>';
 
-					// Total HT
-					if ($modetax == 0)
-					{
-						print '<td class="nowrap" align="right">';
-						print price($fields['totalht']);
-						if (price2num($fields['ftotal_ttc']))
+						print '<tr class="oddeven">';
+
+						// Ref
+						print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+
+						// Description
+						print '<td align="left">';
+						if ($fields['pid'])
 						{
-							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-							$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
-							//print ' ('.round($ratiolineinvoice*100,2).'%)';
-						}
-						print '</td>';
-					}
-
-					// Payment
-					$ratiopaymentinvoice=1;
-					if ($modetax == 0)
-					{
-						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
-						print '<td class="nowrap" align="right">';
-						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-						{
-							$paymentfourn_static->id=$fields['payment_id'];
-							print $paymentfourn_static->getNomUrl(2);
-						}
-						if ($type == 0)
-						{
-							print $langs->trans("NotUsedForGoods");
+							$product_static->id=$fields['pid'];
+							$product_static->ref=$fields['pref'];
+							$product_static->type=$fields['ptype'];
+							print $product_static->getNomUrl(1);
+							if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
 						}
 						else
 						{
-							print price($fields['payment_amount']);
-							if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+							if ($type) $text = img_object($langs->trans('Service'),'service');
+							else $text = img_object($langs->trans('Product'),'product');
+							print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+							// Show range
+							print_date_range($fields['ddate_start'],$fields['ddate_end']);
 						}
 						print '</td>';
+
+						// Total HT
+						if ($modetax != 2)
+						{
+							print '<td class="nowrap" align="right">';
+							print price($fields['totalht']);
+							if (price2num($fields['ftotal_ttc']))
+							{
+								//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+								$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+								//print ' ('.round($ratiolineinvoice*100,2).'%)';
+							}
+							print '</td>';
+						}
+
+						// Payment
+						$ratiopaymentinvoice=1;
+						if ($modetax != 1)
+						{
+							print '<td class="nowrap" align="right">';
+							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+							if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+							{
+								$paymentfourn_static->id=$fields['payment_id'];
+								print $paymentfourn_static->getNomUrl(2);
+							}
+							if ($type == 0)
+							{
+								print $langs->trans("NA");
+							}
+							else
+							{
+								print price(price2num($fields['payment_amount'],'MT'));
+								if (isset($fields['payment_amount'])) {
+									print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+								}
+							}
+							print '</td>';
+						}
+
+						// VAT paid
+						print '<td class="nowrap" align="right">';
+						$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+						print price(price2num($temp_ht,'MT'),1);
+						print '</td>';
+
+						// Localtax
+						print '<td class="nowrap" align="right">';
+						$temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;;
+						print price(price2num($temp_vat,'MT'),1);
+						//print price($fields['vat']);
+						print '</td>';
+						print '</tr>';
+
+						$subtot_paye_total_ht += $temp_ht;
+						$subtot_paye_vat      += $temp_vat;
+						$x_paye_sum           += $temp_vat;
 					}
-
-					// VAT paid
-					print '<td class="nowrap" align="right">';
-					$temp_ht=$fields['totalht'];
-					if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
-					print price(price2num($temp_ht,'MT'));
-					print '</td>';
-
-					// Localtax
-					print '<td class="nowrap" align="right">';
-					$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
-					print price(price2num($temp_vat,'MT'));
-					//print price($fields['vat']);
-					print '</td>';
-					print '</tr>';
-
-					$subtot_paye_total_ht += $temp_ht;
-					$subtot_paye_vat      += $temp_vat;
-					$x_paye_sum           += $temp_vat;
 				}
 			}
-			}
-			if($rate!=0){
-		        // Total suppliers for this vat rate
-		        print '<tr class="liste_total">';
-		        print '<td>&nbsp;</td>';
-		        print '<td align="right">'.$langs->trans("Total").':</td>';
-		        if ($modetax == 0)
-		        {
-		            print '<td class="nowrap" align="right">&nbsp;</td>';
-		            print '<td align="right">&nbsp;</td>';
-		        }
-		        print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
-		        print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
-		        print '</tr>';
-			}
+
+		    // Total suppliers for this vat rate
+		    print '<tr class="liste_total">';
+		    print '<td>&nbsp;</td>';
+		    print '<td align="right">'.$langs->trans("Total").':</td>';
+		    if ($modetax != 1)
+		    {
+		        print '<td class="nowrap" align="right">&nbsp;</td>';
+		        print '<td align="right">&nbsp;</td>';
+		    }
+		    print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
+		    print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
+		    print '</tr>';
 		}
 
-		if (count($x_paye) == 0)   // Show a total ine if nothing shown
-		{
-	        print '<tr class="liste_total">';
-	        print '<td>&nbsp;</td>';
-	        print '<td align="right">'.$langs->trans("Total").':</td>';
-	        if ($modetax == 0)
-	        {
-	            print '<td class="nowrap" align="right">&nbsp;</td>';
-	            print '<td align="right">&nbsp;</td>';
-	        }
-	        print '<td align="right">'.price(price2num(0,'MT')).'</td>';
-	        print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
-	        print '</tr>';
+		if (count($x_paye) == 0) {  // Show a total line if nothing shown
+			print '<tr class="liste_total">';
+			print '<td>&nbsp;</td>';
+			print '<td align="right">'.$langs->trans("Total").':</td>';
+			if ($modetax != 1) {
+				print '<td class="nowrap" align="right">&nbsp;</td>';
+				print '<td align="right">&nbsp;</td>';
+			}
+			print '<td align="right">'.price(price2num(0,'MT')).'</td>';
+			print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
+			print '</tr>';
 		}
 
 	    print '</table>';
-	    $diff=$x_paye_sum;
-	}
+	//}
 
-	if($conf->global->$calc ==0){$diff=$x_coll_sum - $x_paye_sum;}
-		echo '<table class="noborder" width="100%">';
-		// Total to pay
-	    print '<br><br>';
-	    print '<table class="noborder" width="100%">';
-	    //$diff = $local==1?$x_coll_sum:$x_paye_sum;
-		print '<tr class="liste_total">';
-		print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
-		print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
-		print "</tr>\n";
-
-		echo '</table>';
+	// Total to pay
+    print '<br><br>';
+    print '<table class="noborder" width="100%">';
+    $diff = $x_coll_sum - $x_paye_sum;
+	print '<tr class="liste_total">';
+	print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
+	print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
+	print "</tr>\n";
 
 	$i++;
 }
+print '</table>';
 
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 77d9cd0a93d..8b6956a3942 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -819,7 +819,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 if (! GETPOST('action','aZ09'))
 {
     if ($page == -1) $page = 0 ;
-    $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+    $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
     $offset = $limit * $page ;
 
     if (! $sortorder) $sortorder='DESC';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 8a165ebe811..8489e82ae33 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -54,7 +54,7 @@ $page=GETPOST('page', 'int');
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="b.dateo,b.rowid";
 if (empty($page) || $page == -1) { $page = 0; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 
 $dir=$conf->bank->dir_output.'/checkdeposits/';
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 9ddbd0b5cf6..74fe9ea9455 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -94,7 +94,7 @@ $max=10;
 
 $sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref,";
 $sql.= " bc.statut, bc.nbcheque,";
-$sql.= " ba.ref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.accountancy_journal,";
+$sql.= " ba.ref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";
 $sql.= " aj.code";
 $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal";
@@ -130,6 +130,7 @@ if ($resql)
 		$accountstatic->currency_code=$objp->currency_code;
 		$accountstatic->account_number=$objp->account_number;
 		$accountstatic->accountancy_journal=$objp->code;
+		$accountstatic->fk_accountancy_journal=$objp->fk_accountancy_journal;
 
 		print '<tr class="oddeven">'."\n";
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 532d2e4c9b8..b9e8cac609a 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -43,7 +43,7 @@ $search_ref = GETPOST('search_ref','alpha');
 $search_account = GETPOST('search_account','int');
 $search_amount = GETPOST('search_amount','alpha');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -117,6 +117,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -134,7 +139,9 @@ if ($resql)
 	$newcardbutton='';
 	if ($user->rights->banque->cheque)
 	{
-		$newcardbutton = '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new">'.$langs->trans('NewCheckDeposit').'</a>';
+		$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new">'.$langs->trans('NewCheckDeposit');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 6ca9f29c16e..017593316a7 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2015      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2017      Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2018      Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,7 +60,7 @@ $search_amount=GETPOST("search_amount",'alpha');    // alpha because we must be
 $search_company=GETPOST("search_company",'alpha');
 $search_payment_num=GETPOST('search_payment_num','alpha');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -191,6 +192,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -229,21 +235,21 @@ if ($resql)
     // Lines for filters fields
     print '<tr class="liste_titre_filter">';
     print '<td class="liste_titre" align="left">';
-    print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
+    print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
     print '</td>';
     print '<td class="liste_titre" align="center">';
-    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+    print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
     $formother->select_year($year?$year:-1,'year',1, 20, 5);
     print '</td>';
     print '<td class="liste_titre" align="left">';
-    print '<input class="flat" type="text" size="6" name="search_company" value="'.$search_company.'">';
+    print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
     print '</td>';
     print '<td class="liste_titre">';
     $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1);
     print '</td>';
     print '<td class="liste_titre" align="left">';
-    print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.$search_payment_num.'">';
+    print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
     print '</td>';
     if (! empty($conf->banque->enabled))
     {
@@ -252,7 +258,7 @@ if ($resql)
 	    print '</td>';
     }
     print '<td class="liste_titre" align="right">';
-    print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
+    print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
 	print '</td>';
     print '<td class="liste_titre" align="right">';
     $searchpicto=$form->showFilterAndCheckAddButtons(0);
@@ -278,7 +284,7 @@ if ($resql)
     print_liste_field_titre("Amount",$_SERVER["PHP_SELF"],"p.amount","",$param,'align="right"',$sortfield,$sortorder);
     //print_liste_field_titre("Invoices"),"","","",$param,'align="left"',$sortfield,$sortorder);
 
-    $parameters=array();
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
     $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 7e16b525233..031a0ff354a 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -38,7 +38,7 @@ if ($user->societe_id > 0)
 }
 
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
@@ -85,6 +85,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
@@ -94,7 +99,6 @@ if ($resql)
 {
     $num = $db->num_rows($resql);
     $i = 0;
-    $var=True;
 
     print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num);
 
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index ea9bc5af42a..8e76a219c3d 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -245,13 +245,10 @@ if ($resql)
 
 	if ($num > 0)
 	{
-		$var=True;
-
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
 
-
 			print '<tr class="oddeven">';
 			// Ref
 			print '<td>';
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 31dfbd5b610..02c6e7b08f0 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -37,7 +37,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'prelevement','','','bons');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
@@ -87,6 +87,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
@@ -101,7 +106,13 @@ if ($result)
 
   $selectedfields='';
 
-  $newcardbutton = '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/prelevement/create.php">'.$langs->trans('NewStandingOrder').'</a>';
+  $newcardbutton='';
+  if ($user->rights->prelevement->bons->creer)
+  {
+  	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/prelevement/create.php">'.$langs->trans('NewStandingOrder');
+  	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+  	$newcardbutton.= '</a>';
+  }
 
   // Lines of title fields
   print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index ed0977ebabf..a6d739f1f0c 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -322,6 +322,11 @@ if ($id > 0 || $ref)
 	{
 		$result = $db->query($sql);
 		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
 	}
 
 	$sql.= $db->plimit($limit+1, $offset);
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 57cf518db16..245b25be3b6 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -99,14 +99,6 @@ class BonPrelevement extends CommonObject
 		$this->methodes_trans[0] = "Internet";
 
 		$this->_fetched = 0;
-
-
-		$langs->load("withdrawals");
-		$this->labelstatut[0]=$langs->trans("StatusWaiting");
-		$this->labelstatut[1]=$langs->trans("StatusTrans");
-		$this->labelstatut[2]=$langs->trans("StatusCredited");
-
-		return 1;
 	}
 
 	/**
@@ -1310,14 +1302,14 @@ class BonPrelevement extends CommonObject
 			 */
 			// SEPA Initialisation
 			$CrLf = "\n";
-			
+
 			$now = dol_now();
-			
+
 			$dateTime_ECMA = dol_print_date($now, '%Y-%m-%dT%H:%M:%S');
 
 			$date_actu = $now;
                         if (!empty($executiondate)) $date_actu=$executiondate;
-			
+
 			$dateTime_YMD  = dol_print_date($date_actu, '%Y%m%d');
 			$dateTime_YMDHMS = dol_print_date($date_actu, '%Y%m%d%H%M%S');
 			$fileDebiteurSection = '';
@@ -1890,48 +1882,52 @@ class BonPrelevement extends CommonObject
 	 */
 	function LibStatut($statut,$mode=0)
 	{
-		global $langs;
+		if (empty($this->labelstatut))
+		{
+			global $langs;
+			$langs->load("withdrawals");
+			$this->labelstatut[0]=$langs->trans("StatusWaiting");
+			$this->labelstatut[1]=$langs->trans("StatusTrans");
+			$this->labelstatut[2]=$langs->trans("StatusCredited");
+		}
 
 		if ($mode == 0)
 		{
-			return $langs->trans($this->labelstatut[$statut]);
+			return $this->labelstatut[$statut];
 		}
-
 		if ($mode == 1)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3').' '.$langs->trans($this->labelstatut[$statut]);
-			if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6').' '.$langs->trans($this->labelstatut[$statut]);
+			return $this->labelstatut[$statut];
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
-			if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
-			if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
+			if ($statut==0) return img_picto($this->labelstatut[$statut],'statut1').' '.$this->labelstatut[$statut];
+			if ($statut==1) return img_picto($this->labelstatut[$statut],'statut3').' '.$this->labelstatut[$statut];
+			if ($statut==2) return img_picto($this->labelstatut[$statut],'statut6').' '.$this->labelstatut[$statut];
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
-			if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
-			if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
+			if ($statut==0) return img_picto($this->labelstatut[$statut],'statut1');
+			if ($statut==1) return img_picto($this->labelstatut[$statut],'statut3');
+			if ($statut==2) return img_picto($this->labelstatut[$statut],'statut6');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3').' '.$langs->trans($this->labelstatut[$statut]);
-			if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6').' '.$langs->trans($this->labelstatut[$statut]);
+			if ($statut==0) return img_picto($this->labelstatut[$statut],'statut1').' '.$this->labelstatut[$statut];
+			if ($statut==1) return img_picto($this->labelstatut[$statut],'statut3').' '.$this->labelstatut[$statut];
+			if ($statut==2) return img_picto($this->labelstatut[$statut],'statut6').' '.$this->labelstatut[$statut];
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
-			if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
-			if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
+			if ($statut==0) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut1');
+			if ($statut==1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut3');
+			if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
 		}
 		if ($mode == 6)
 		{
-			if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
-			if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
-			if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
+			if ($statut==0) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut1');
+			if ($statut==1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut3');
+			if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
 		}
 	}
 
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index c94a786917f..c1d87a4c1b5 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -298,8 +298,6 @@ if ($result)
     print '<td align="center">'.$langs->trans("Date").'</td><td align="right">'.$langs->trans("Amount").'</td>';
     print '</tr>';
 
-    $var=True;
-
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 04ec746d7f6..765e0cf4fa8 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -129,8 +129,6 @@ if ($resql)
 	print '</td>';
 	print '</tr>';
 
-	$var = True;
-
 	$users = array();
 
 	while ($i < min($num,$limit))
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 64811c7604a..d446e64fe9b 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -170,6 +170,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 82431e3bdd2..2fbaaf7fbcb 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -169,6 +169,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 271ce4da7fe..64e1991064d 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -71,7 +71,6 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 $thirdpartystatic=new Societe($db);
 $invoicestatic=new Facture($db);
 $bprev = new BonPrelevement($db);
-$var=true;
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
@@ -117,7 +116,6 @@ if ($resql)
     print '<th colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
     if ($num)
     {
-        $var = True;
         while ($i < $num && $i < 20)
         {
             $obj = $db->fetch_object($resql);
@@ -184,7 +182,6 @@ if ($result)
 {
     $num = $db->num_rows($result);
     $i = 0;
-    $var=True;
 
     print"\n<!-- debut table -->\n";
     print '<table class="noborder" width="100%">';
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index ff6fe4e109c..10634670f5f 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -40,7 +40,7 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'prelevement','','','bons');
 
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
@@ -111,6 +111,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index e8b00fc869b..c4131dc365b 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -90,7 +90,7 @@ $tmps=dol_getdate($date_start);
 $year_start = $tmps['year'];
 $tmpe=dol_getdate($date_end);
 $year_end = $tmpe['year'];
-$nbofyear = ($year_end - $start_year) + 1;
+$nbofyear = ($year_end - $year_start) + 1;
 //var_dump("year_start=".$year_start." year_end=".$year_end." nbofyear=".$nbofyear." date_start=".dol_print_date($date_start, 'dayhour')." date_end=".dol_print_date($date_end, 'dayhour'));
 
 
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index 71cfe997fe0..3a3f34b85b4 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -388,7 +388,11 @@ class PaymentSalary extends CommonObject
 						-abs($this->amount),
 						$this->num_payment,
 						'',
-						$user
+						$user,
+						'',
+						'',
+						'',
+						$this->datev
 					);
 
 					// Update fk_bank into llx_paiement.
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 03cef9c07e8..00bc6185ffd 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -118,7 +118,7 @@ if ($object->id)
 
 	print '<table class="border" width="100%">';
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
 	print '</table>';
 
 	print '</div>';
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index f9b9adf616c..a88ec8683a9 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -28,17 +28,14 @@ require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
-$langs->load("compta");
-$langs->load("salaries");
-$langs->load("bills");
-$langs->load("hrm");
+$langs->loadLangs(array("compta","salaries","bills","hrm"));
 
 // Security check
 $socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $search_ref = GETPOST('search_ref','int');
 $search_user = GETPOST('search_user','alpha');
 $search_label = GETPOST('search_label','alpha');
@@ -52,8 +49,8 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="s.datep";
-if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="s.datep,s.rowid";
+if (! $sortorder) $sortorder="DESC,DESC";
 $optioncss = GETPOST('optioncss','alpha');
 
 $filtre=$_GET["filtre"];
@@ -150,9 +147,15 @@ if ($result)
 	if ($typeid) $param.='&amp;typeid='.$typeid;
 	if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
 
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/compta/salaries/card.php?action=create">'.$langs->trans('NewSalaryPayment').'</a>';
+	$newcardbutton='';
+	if ($user->rights->salaries->payment->write)
+	{
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/salaries/card.php?action=create">'.$langs->trans('NewSalaryPayment');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
+	}
 
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -202,7 +205,7 @@ if ($result)
     print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre("Employee",$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre("Label",$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"s.datep,s.rowid","",$param,'align="center"',$sortfield,$sortorder);
     print_liste_field_titre("PaymentMode",$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
     if (! empty($conf->banque->enabled)) print_liste_field_titre("BankAccount",$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
diff --git a/htdocs/compta/salaries/stats/index.php b/htdocs/compta/salaries/stats/index.php
index 0ba0c29ea6f..dabe988909f 100644
--- a/htdocs/compta/salaries/stats/index.php
+++ b/htdocs/compta/salaries/stats/index.php
@@ -59,6 +59,7 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear;
 $startyear=$year-1;
 $endyear=$year;
 
+
 /*
  * View
  */
@@ -231,11 +232,11 @@ print '</form>';
 print '<br><br>';
 
 print '<table class="border" width="100%">';
-print '<tr height="24">';
+print '<tr>';
 print '<td align="center">'.$langs->trans("Year").'</td>';
-print '<td align="center">'.$langs->trans("Number").'</td>';
-print '<td align="center">'.$langs->trans("AmountTotal").'</td>';
-print '<td align="center">'.$langs->trans("AmountAverage").'</td>';
+print '<td align="right">'.$langs->trans("Number").'</td>';
+print '<td align="right">'.$langs->trans("AmountTotal").'</td>';
+print '<td align="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear=0;
@@ -269,7 +270,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
 	print $px1->show();
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index cdcabc5617b..d7bdd9c77e6 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -327,13 +327,23 @@ if ($action == 'create')
 	// Date end period
 	print '<tr>';
 	print '<td class="fieldrequired">';
-	print $langs->trans("PeriodEndDate");
+	print $form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo"));
 	print '</td>';
    	print '<td>';
 	print $form->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
 	print '</td>';
 	print '</tr>';
 
+	// Date due
+	print '<tr>';
+	print '<td class="fieldrequired">';
+	print $langs->trans("DateDue");
+	print '</td>';
+	print '<td>';
+	print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
+	print '</td>';
+	print "</tr>\n";
+
 	// Amount
 	print '<tr>';
 	print '<td class="fieldrequired">';
@@ -370,16 +380,6 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-	// Date due
-	print '<tr>';
-	print '<td class="fieldrequired">';
-	print $langs->trans("DateDue");
-	print '</td>';
-	print '<td>';
-	print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
-	print '</td>';
-	print "</tr>\n";
-
 	print '</table>';
 
 	dol_fiche_end();
@@ -496,7 +496,7 @@ if ($id > 0)
 		print "</tr>";
 
 		// Period end date
-		print "<tr><td>".$langs->trans("PeriodEndDate")."</td>";
+		print "<tr><td>".$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo"))."</td>";
 		print "<td>";
 		if ($action == 'edit')
 		{
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index fa4127c3af6..f16d18c8143 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -192,7 +192,7 @@ class ChargeSociales extends CommonObject
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
 
             //dol_syslog("ChargesSociales::create this->id=".$this->id);
-			$result=$this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE',$user);
+			$result=$this->call_trigger('SOCIALCONTRIBUTION_CREATE',$user);
 			if ($result < 0) $error++;
 
 			if(empty($error)) {
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 4cd0dfd2b59..ba9c671f755 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -164,6 +164,9 @@ class PaymentSocialContribution extends CommonObject
 
 		}
 
+		$result = $this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE',$user);
+		if($result < 0) $error++;
+
 		if ($totalamount != 0 && ! $error)
 		{
 		    $this->amount=$totalamount;
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 0bf1e7f6f13..0e2bcc5c986 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -150,7 +150,7 @@ if ($object->id)
     print '<table class="border" width="100%">';
 
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 3850ddfe5c5..d38ae348c90 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -42,7 +42,7 @@ $search_label = GETPOST('search_label','alpha');
 $search_amount = GETPOST('search_amount','alpha');
 $search_status = GETPOST('search_status','int');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -149,7 +149,9 @@ if ($resql)
 	$newcardbutton='';
 	if($user->rights->tax->charges->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?action=create">'.$langs->trans('MenuNewSocialContribution').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?action=create">'.$langs->trans('MenuNewSocialContribution');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 879e9b69ee7..6abb6013095 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -45,7 +45,7 @@ $year=GETPOST("year",'int');
 $filtre=GETPOST("filtre",'alpha');
 if (! $year && $mode != 'sconly') { $year=date("Y", time()); }
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
new file mode 100644
index 00000000000..b2186633413
--- /dev/null
+++ b/htdocs/compta/stats/byratecountry.php
@@ -0,0 +1,361 @@
+<?php
+/* Copyright (C) 2001-2003        Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004             Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2013        Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2007, 2015  Yannick Warnier      <ywarnier@beeznest.org>
+ * Copyright (C) 2014	          Ferran Marcet        <fmarcet@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/compta/tva/quadri_detail.php
+ *		\ingroup    tax
+ *		\brief      VAT by rate
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
+
+$langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin","accountancy"));
+
+$modecompta = GETPOST('modecompta','alpha');
+
+// Date range
+$year=GETPOST("year",'int');
+$month=GETPOST("month",'int');
+if (empty($year))
+{
+	$year_current = strftime("%Y",dol_now());
+	$month_current = strftime("%m",dol_now());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$month_current = strftime("%m",dol_now());
+	$year_start = $year;
+}
+$date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
+$date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
+// Quarter
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+	$q=GETPOST("q","int");
+	if (empty($q))
+	{
+		// We define date_start and date_end
+		$month_start=GETPOST("month")?GETPOST("month"):($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
+		$year_end=$year_start;
+		$month_end=$month_start;
+		if (! GETPOST("month"))	// If month not forced
+		{
+			if (! GETPOST('year') && $month_start > $month_current)
+			{
+				$year_start--;
+				$year_end--;
+			}
+			$month_end=$month_start-1;
+			if ($month_end < 1) $month_end=12;
+			else $year_end++;
+		}
+		$date_start=dol_get_first_day($year_start,$month_start,false); $date_end=dol_get_last_day($year_end,$month_end,false);
+	}
+	else
+	{
+		if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
+		if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
+		if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
+		if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+	}
+}
+
+// $date_start and $date_end are defined. We force $year_start and $nbofyear
+$tmps=dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe=dol_getdate($date_end);
+$year_end = $tmpe['year'];
+
+$tmp_date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
+if ($tmp_date_end < $date_end || $date_end < $date_start) $date_end = $tmp_date_end;
+
+$min = price2num(GETPOST("min","alpha"));
+if (empty($min)) $min = 0;
+
+// Define modetax (0 or 1)
+// 0=normal, 1=option vat for services is on debit, 2=option on payments for products
+$modetax = $conf->global->TAX_MODE;
+if (GETPOSTISSET("modetax")) $modetax=GETPOST("modetax",'int');
+if (empty($modetax)) $modetax=0;
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+$company_static=new Societe($db);
+$invoice_customer=new Facture($db);
+$invoice_supplier=new FactureFournisseur($db);
+$expensereport=new ExpenseReport($db);
+$product_static=new Product($db);
+$payment_static=new Paiement($db);
+$paymentfourn_static=new PaiementFourn($db);
+$paymentexpensereport_static=new PaymentExpenseReport($db);
+
+$morequerystring='';
+$listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
+foreach ($listofparams as $param)
+{
+	if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
+}
+
+llxHeader('',$langs->trans("TurnoverReport"),'','',0,0,'','',$morequerystring);
+
+
+//print load_fiche_titre($langs->trans("VAT"),"");
+
+//$fsearch.='<br>';
+$fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
+$fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
+//$fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
+//$fsearch.='  <input type="text" name="min" value="'.$min.'">';
+
+
+// Show report header
+$name=$langs->trans("xxx");
+$calcmode='';
+if ($modetax == 0) $calcmode=$langs->trans('OptionVATDefault');
+if ($modetax == 1) $calcmode=$langs->trans('OptionVATDebitOption');
+if ($modetax == 2) $calcmode=$langs->trans('OptionPaymentForProductAndServices');
+$calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+// Set period
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+$prevyear=$year_start; $prevquarter=$q;
+if ($prevquarter > 1) {
+	$prevquarter--;
+} else {
+	$prevquarter=4; $prevyear--;
+}
+$nextyear=$year_start; $nextquarter=$q;
+if ($nextquarter < 4) {
+	$nextquarter++;
+} else {
+	$nextquarter=1; $nextyear++;
+}
+$description.=$fsearch;
+$builddate=dol_now();
+
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description.=$langs->trans("RulesVATDueProducts");
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description.=$langs->trans("RulesVATInProducts");
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description.='<br>'.$langs->trans("RulesVATDueServices");
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description.='<br>'.$langs->trans("RulesVATInServices");
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$description.='<br>'.$langs->trans("DepositsAreNotIncluded");
+}
+if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue");
+
+// Customers invoices
+$elementcust=$langs->trans("CustomersInvoices");
+$productcust=$langs->trans("ProductOrService");
+$amountcust=$langs->trans("AmountHT");
+
+// Suppliers invoices
+$elementsup=$langs->trans("SuppliersInvoices");
+$productsup=$productcust;
+$amountsup=$amountcust;
+$namesup=$namecust;
+
+
+
+
+// Show report header
+$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByVatRate");
+
+if ($modecompta=="CREANCES-DETTES") {
+	$calcmode=$langs->trans("CalcModeDebt");
+	$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
+
+	$description=$langs->trans("RulesCADue");
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description.= $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description.= $langs->trans("DepositsAreIncluded");
+	}
+
+	$builddate=dol_now();
+} else {
+	$calcmode=$langs->trans("CalcModeEngagement");
+	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
+
+	$description=$langs->trans("RulesCAIn");
+	$description.= $langs->trans("DepositsAreIncluded");
+
+	$builddate=dol_now();
+}
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+else $periodlink = '';
+
+$description.='  <input type="hidden" name="modecompta" value="'.$modecompta.'">';
+
+report_header($name,'',$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
+
+if (! empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
+{
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+}
+
+
+if ($modecompta == 'CREANCES-DETTES')
+{
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("TurnoverbyVatrate") . '</td>';
+print '<td align="left">' . $langs->trans("ProductOrService") . '</td>';
+print '<td align="left">' . $langs->trans("Country") . '</td>';
+for($i = 1; $i <= 12; $i ++) {
+	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+}
+print '<td width="60" align="right"><b>' . $langs->trans("TotalHT") . '</b></td></tr>';
+
+$sql = "SELECT fd.tva_tx AS vatrate,";
+$sql .= " fd.product_type AS product_type,";
+$sql .= " cc.label AS country,";
+for($i = 1; $i <= 12; $i ++) {
+	$sql .= " SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+}
+$sql .= "  SUM(fd.total_ht) as total";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+$sql .= "  INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
+$sql .= "  INNER JOIN " . MAIN_DB_PREFIX . "societe as soc ON soc.rowid = f.fk_soc";
+$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "c_country as cc ON cc.rowid = soc.fk_pays";
+$sql .= " WHERE f.datef >= '" . $db->idate($date_start) . "'";
+$sql .= "  AND f.datef <= '" . $db->idate($date_end) . "'";
+$sql.= " AND f.fk_statut in (1,2)";
+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.entity IN (" . getEntity("facture", 0) . ")";
+$sql .= " GROUP BY fd.tva_tx,fd.product_type, cc.label ";
+
+dol_syslog("htdocs/compta/tva/index.php sql=" . $sql, LOG_DEBUG);
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
+
+	while ( $row = $db->fetch_row($resql)) {
+		print '<tr class="oddeven"><td class="right">' . vatrate($row[0]) . '</td>';
+		if ($row[1] == 0) {
+			print '<td align="left">'. $langs->trans("Product") . '</td>';
+		} else {
+			print '<td align="left">'. $langs->trans("Service") . '</td>';
+		}
+		print '<td>' .$row[2] . '</td>';
+
+		for($i = 3; $i <= 14; $i ++) {
+			print '<td align="right" width="6%">' . price($row[$i]) . '</td>';
+		}
+		print '<td align="right" width="6%"><b>' . price($row[15]) . '</b></td>';
+		print '</tr>';
+	}
+	$db->free($resql);
+} else {
+	print $db->lasterror(); // Show last sql error
+}
+print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("PurchasebyVatrate") . '</td>';
+print '<td align="left">' . $langs->trans("ProductOrService") . '</td>';
+print '<td align="left">' . $langs->trans("Country") . '</td>';
+for($i = 1; $i <= 12; $i ++) {
+	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+}
+print '<td width="60" align="right"><b>' . $langs->trans("TotalHT") . '</b></td></tr>';
+
+$sql2 = "SELECT ffd.tva_tx AS vatrate,";
+$sql2 .= " ffd.product_type AS product_type,";
+$sql2 .= " cc.label AS country,";
+for($i = 1; $i <= 12; $i ++) {
+	$sql2 .= " SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+}
+$sql2 .= "  SUM(ffd.total_ht) as total";
+$sql2 .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as ffd";
+$sql2 .= "  INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as ff ON ff.rowid = ffd.fk_facture_fourn";
+$sql2 .= "  INNER JOIN " . MAIN_DB_PREFIX . "societe as soc ON soc.rowid = ff.fk_soc";
+$sql2 .= "  LEFT JOIN " . MAIN_DB_PREFIX . "c_country as cc ON cc.rowid = soc.fk_pays";
+$sql2 .= " WHERE ff.datef >= '" . $db->idate($date_start) . "'";
+$sql2 .= "  AND ff.datef <= '" . $db->idate($date_end) . "'";
+$sql.= " AND ff.fk_statut in (1,2)";
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql.= " AND ff.type IN (0,1,2,5)";
+} else {
+	$sql.= " AND ff.type IN (0,1,2,3,5)";
+}
+$sql2 .= " AND ff.entity IN (" . getEntity("facture_fourn", 0) . ")";
+$sql2 .= " GROUP BY ffd.tva_tx, ffd.product_type, cc.label";
+
+//print $sql2;
+dol_syslog("htdocs/compta/tva/index.php sql=" . $sql, LOG_DEBUG);
+$resql2 = $db->query($sql2);
+if ($resql2) {
+	$num = $db->num_rows($resql2);
+
+	while ( $row = $db->fetch_row($resql2)) {
+		print '<tr class="oddeven"><td class="right">' . vatrate($row[0]) . '</td>';
+		if ($row[1] == 0) {
+			print '<td align="left">'. $langs->trans("Product") . '</td>';
+		} else {
+			print '<td align="left">'. $langs->trans("Service") . '</td>';
+		}
+		print '<td>' . $row[2] . '</td>';
+		for($i = 3; $i <= 14; $i ++) {
+			print '<td align="right" width="6%">' . price($row[$i]) . '</td>';
+		}
+		print '<td align="right" width="6%"><b>' . price($row[15]) . '</b></td>';
+		print '</tr>';
+	}
+	$db->free($resql2);
+} else {
+	print $db->lasterror(); // Show last sql error
+}
+print "</table>\n";
+
+} else {
+	// $modecompta != 'CREANCES-DETTES'
+	// "Calculation of part of each product for accountancy in this mode is not possible. When a partial payment (for example 5 euros) is done on an
+	// invoice with 2 product (product A for 10 euros and product B for 20 euros), what is part of paiment for product A and part of paiment for product B ?
+	// Because there is no way to know this, this report is not relevant.
+	print '<br>'.$langs->trans("TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant") . '<br>';
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index f367f8ee436..e4d1f16cb8b 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -29,9 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-$langs->load("products");
-$langs->load("categories");
-$langs->load("errors");
+$langs->loadLangs(array("products","categories","errors",'accountancy'));
 
 // Security pack (data & check)
 $socid = GETPOST('socid','int');
@@ -78,13 +76,13 @@ if (empty($year))
 	$month_current = strftime("%m",dol_now());
 	$year_start = $year;
 }
-$date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]);
-$date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]);
+$date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
+$date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
 // Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$q=GETPOST("q")?GETPOST("q"):0;
-	if ($q==0)
+	$q=GETPOST("q","int");
+	if (empty($q))
 	{
 		// We define date_start and date_end
 		$month_start=GETPOST("month")?GETPOST("month"):($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
@@ -103,14 +101,24 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 		}
 		$date_start=dol_get_first_day($year_start,$month_start,false); $date_end=dol_get_last_day($year_end,$month_end,false);
 	}
-	if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
-	if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
-	if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
-	if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+	else
+	{
+		if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
+		if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
+		if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
+		if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+	}
 } else {
 	// TODO We define q
 }
 
+// $date_start and $date_end are defined. We force $year_start and $nbofyear
+$tmps=dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe=dol_getdate($date_end);
+$year_end = $tmpe['year'];
+$nbofyear = ($year_end - $year_start) + 1;
+
 $commonparams=array();
 $commonparams['modecompta']=$modecompta;
 $commonparams['sortorder'] = $sortorder;
@@ -154,9 +162,7 @@ $name=$langs->trans("SalesTurnover").', '.$langs->trans("ByProductsAndServices")
 
 if ($modecompta=="CREANCES-DETTES") {
 	$calcmode=$langs->trans("CalcModeDebt");
-	$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-
-	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+	$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 
 	$description=$langs->trans("RulesCADue");
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
@@ -168,21 +174,22 @@ if ($modecompta=="CREANCES-DETTES") {
 	$builddate=dol_now();
 } else {
 	$calcmode=$langs->trans("CalcModeEngagement");
-	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=CREANCES-DETTES">','</a>').')';
-
-	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 
 	$description=$langs->trans("RulesCAIn");
 	$description.= $langs->trans("DepositsAreIncluded");
 
 	$builddate=dol_now();
 }
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+else $periodlink = '';
 
 report_header($name,$namelink,$period,$periodlink,$description,$builddate,$exportlink,$tableparams,$calcmode);
 
 if (! empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -199,17 +206,17 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql = "SELECT DISTINCT p.rowid as rowid, p.ref as ref, p.label as label, p.fk_product_type as product_type,";
 	$sql.= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
 	$sql.= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
-	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as l, ".MAIN_DB_PREFIX."product as p";
+	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as l";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2)	// Without any category
 	{
-		$sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
 	}
 	else if ($selected_cat) 	// Into a specific category
 	{
 		$sql.= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
-	$sql.= " WHERE l.fk_product = p.rowid";
-	$sql.= " AND l.fk_facture = f.rowid";
+	$sql.= " WHERE l.fk_facture = f.rowid";
 	$sql.= " AND f.fk_statut in (1,2)";
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 		$sql.= " AND f.type IN (0,1,2,5)";
@@ -357,23 +364,21 @@ if ($modecompta == 'CREANCES-DETTES')
 	);
 	print "</tr>\n";
 
-	// Array Data
-	$var=true;
-
 	if (count($name)) {
 		foreach($name as $key=>$value) {
 
 			print '<tr class="oddeven">';
 
 			// Product
+			print "<td>";
 			$fullname=$name[$key];
-			if ($key >= 0) {
+			if ($key > 0) {
 				$linkname='<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$key.'">'.img_object($langs->trans("ShowProduct"),$type[$key]==0?'product':'service').' '.$fullname.'</a>';
 			} else {
 				$linkname=$langs->trans("PaymentsNotLinkedToProduct");
 			}
-
-			print "<td>".$linkname."</td>\n";
+			print $linkname;
+			print "</td>\n";
 
 			// Quantity
 			print '<td align="right">';
@@ -417,11 +422,11 @@ if ($modecompta == 'CREANCES-DETTES')
 		// Total
 		print '<tr class="liste_total">';
 		print '<td>'.$langs->trans("Total").'</td>';
-		print '<td align="right">'.price($qtytotal).'</td>';
-		print '<td>&nbsp;</td>';
+		print '<td align="right">'.$qtytotal.'</td>';
+		print '<td align="right">100%</td>';
 		print '<td align="right">'.price($catotal_ht).'</td>';
 		print '<td align="right">'.price($catotal).'</td>';
-		print '<td>&nbsp;</td>';
+		print '<td align="right">100%</td>';
 		print '</tr>';
 
 		$db->free($result);
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 1fa48738e66..1d386df6c6f 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -99,6 +99,12 @@ else
 {
 	// TODO We define q
 }
+// $date_start and $date_end are defined. We force $year_start and $nbofyear
+$tmps=dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe=dol_getdate($date_end);
+$year_end = $tmpe['year'];
+$nbofyear = ($year_end - $year_start) + 1;
 
 $commonparams=array();
 $commonparams['modecompta']=$modecompta;
@@ -139,9 +145,7 @@ $form=new Form($db);
 if ($modecompta=="CREANCES-DETTES") {
     $name=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
     $calcmode=$langs->trans("CalcModeDebt");
-    $calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-    //$periodlink="<a href='".$_SERVER["PHP_SELF"]."?year=".($year-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year+1)."&modecompta=".$modecompta."'>".img_next()."</a>";
+    $calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
     $description=$langs->trans("RulesCADue");
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
 	else  $description.= $langs->trans("DepositsAreIncluded");
@@ -150,14 +154,16 @@ if ($modecompta=="CREANCES-DETTES") {
 } else {
     $name=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
 	$calcmode=$langs->trans("CalcModeEngagement");
-    $calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=CREANCES-DETTES">','</a>').')';
-	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-    //$periodlink="<a href='".$_SERVER["PHP_SELF"]."?year=".($year-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year+1)."&modecompta=".$modecompta."'>".img_next()."</a>";
+	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
     $description=$langs->trans("RulesCAIn");
 	$description.= $langs->trans("DepositsAreIncluded");
     $builddate=dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
 }
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+else $periodlink = '';
+
 $moreparam=array();
 if (! empty($modecompta)) $moreparam['modecompta']=$modecompta;
 
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index b7b37d0837c..5c1e8cc4db7 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -90,8 +90,8 @@ $date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GE
 // Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$q=GETPOST("q")?GETPOST("q"):0;
-	if ($q==0)
+	$q=GETPOST("q","int")?GETPOST("q","int"):0;
+	if (empty($q))
 	{
 		// We define date_start and date_end
 		$month_start=GETPOST("month")?GETPOST("month"):($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
@@ -120,6 +120,13 @@ else
 	// TODO We define q
 }
 
+// $date_start and $date_end are defined. We force $year_start and $nbofyear
+$tmps=dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe=dol_getdate($date_end);
+$year_end = $tmpe['year'];
+$nbofyear = ($year_end - $year_start) + 1;
+
 $commonparams=array();
 $commonparams['modecompta']=$modecompta;
 $commonparams['sortorder'] = $sortorder;
@@ -167,9 +174,7 @@ if ($modecompta=="CREANCES-DETTES")
 {
 	$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
 	$calcmode=$langs->trans("CalcModeDebt");
-	$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+	$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description=$langs->trans("RulesCADue");
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
 	else  $description.= $langs->trans("DepositsAreIncluded");
@@ -178,14 +183,15 @@ if ($modecompta=="CREANCES-DETTES")
 } else {
 	$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
 	$calcmode=$langs->trans("CalcModeEngagement");
-	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=CREANCES-DETTES">','</a>').')';
-	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 	$description=$langs->trans("RulesCAIn");
 	$description.= $langs->trans("DepositsAreIncluded");
 	$builddate=dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+else $periodlink = '';
 
 report_header($name,$namelink,$period,$periodlink,$description,$builddate,$exportlink,$tableparams,$calcmode);
 
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 598de2ba490..bb5cb25e30d 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -71,7 +71,6 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 			$month_end=$month_start-1;
 			if ($month_end < 1) $month_end=12;
-			else $year_end++;
 		}
 		else $month_end=$month_start;
 		$date_start=dol_get_first_day($year_start,$month_start,false); $date_end=dol_get_last_day($year_end,$month_end,false);
@@ -85,6 +84,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 $userid=GETPOST('userid','int');
 $socid = GETPOST('socid','int');
 
+$tmps=dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe=dol_getdate($date_end);
+$year_end = $tmpe['year'];
+$nbofyear = ($year_end - $year_start) + 1;
+
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
 if (! empty($conf->accounting->enabled)) $modecompta='BOOKKEEPING';
@@ -114,7 +119,7 @@ if ($modecompta=="CREANCES-DETTES")
 	$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$calcmode.='<br>('.$langs->trans("SeeReportInBookkeepingMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">','</a>').')';
 	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-	$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start+1)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
+	$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+$nbofyear-2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+$nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
 	$description=$langs->trans("RulesCADue");
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
 	else  $description.= $langs->trans("DepositsAreIncluded");
@@ -128,7 +133,7 @@ else if ($modecompta=="RECETTES-DEPENSES")
 	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 	$calcmode.='<br>('.$langs->trans("SeeReportInBookkeepingMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">','</a>').')';
 	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-	$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start+1)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
+	$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+$nbofyear-2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+$nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
 	$description=$langs->trans("RulesCAIn");
 	$description.= $langs->trans("DepositsAreIncluded");
 	$builddate=dol_now();
@@ -141,7 +146,7 @@ else if ($modecompta=="BOOKKEEPING")
 	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 	$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-	$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start+1)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
+	$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+$nbofyear-2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+$nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
 	$description=$langs->trans("RulesCATotalSaleJournal");
 	$builddate=dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
@@ -493,7 +498,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 		}
 		if (! $total[$annee-1] && $total[$annee])
 		{
-			print '<td align="right" class="borderrightlight">+zzzz'.$total[$annee-1].$langs->trans('Inf').'%</td>';
+			print '<td align="right" class="borderrightlight">+'.$langs->trans('Inf').'%</td>';
 		}
 		if (! $total[$annee-1] && ! $total[$annee])
 		{
@@ -551,7 +556,6 @@ print '</div>';
 
  if ($num)
  {
- $var = True;
  $total_ttc_Rac = $totalam_Rac = $total_Rac = 0;
  while ($i < $num)
  {
@@ -561,7 +565,7 @@ print '</div>';
  $i++;
  }
 
- print "<tr ".$bc[$var]."><td align=\"right\" colspan=\"5\"><i>Facture a encaisser : </i></td><td align=\"right\"><i>".price($total_ttc_Rac)."</i></td><td colspan=\"5\"><-- bug ici car n'exclut pas le deja r?gl? des factures partiellement r?gl?es</td></tr>";
+ print "<tr class="oddeven"><td align=\"right\" colspan=\"5\"><i>Facture a encaisser : </i></td><td align=\"right\"><i>".price($total_ttc_Rac)."</i></td><td colspan=\"5\"><-- bug ici car n'exclut pas le deja r?gl? des factures partiellement r?gl?es</td></tr>";
  }
  $db->free($resql);
  }
@@ -602,7 +606,6 @@ print '</div>';
 
  if ($num)
  {
- $var = True;
  $total_pr = 0;
  while ($i < $num)
  {
@@ -611,7 +614,7 @@ print '</div>';
  $i++;
  }
 
- print "<tr ".$bc[$var]."><td align=\"right\" colspan=\"5\"><i>Signe et non facture:</i></td><td align=\"right\"><i>".price($total_pr)."</i></td><td colspan=\"5\"><-- bug ici, ca devrait exclure le deja facture</td></tr>";
+ print "<tr class="oddeven"><td align=\"right\" colspan=\"5\"><i>Signe et non facture:</i></td><td align=\"right\"><i>".price($total_pr)."</i></td><td colspan=\"5\"><-- bug ici, ca devrait exclure le deja facture</td></tr>";
  }
  $db->free($resql);
  }
@@ -619,7 +622,7 @@ print '</div>';
  {
  dol_print_error($db);
  }
- print "<tr ".$bc[$var]."><td align=\"right\" colspan=\"5\"><i>Total CA previsionnel : </i></td><td align=\"right\"><i>".price($total_CA)."</i></td><td colspan=\"3\"><-- bug ici car bug sur les 2 precedents</td></tr>";
+ print "<tr class="oddeven"><td align=\"right\" colspan=\"5\"><i>Total CA previsionnel : </i></td><td align=\"right\"><i>".price($total_CA)."</i></td><td colspan=\"3\"><-- bug ici car bug sur les 2 precedents</td></tr>";
  }
  print "</table>";
 
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 2411858a924..240a4624d44 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -59,10 +59,18 @@ if ($_POST["cancel"] == $langs->trans("Cancel") && ! $id)
 	exit;
 }
 
+if ($action == 'setlib' && $user->rights->tax->charges->creer)
+{
+	$object->fetch($id);
+	$result = $object->setValueFrom('label', GETPOST('lib','alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
+}
+
 if ($action == 'setdatev' && $user->rights->tax->charges->creer)
 {
     $object->fetch($id);
-    $object->datev=dol_mktime(12,0,0,$_POST['datevmonth'],$_POST['datevday'],$_POST['datevyear']);
+    $object->datev=dol_mktime(12,0,0,GETPOST('datevmonth','int'),GETPOST('datevday','int'),GETPOST('datevyear','int'));
     $result=$object->update($user);
     if ($result < 0) dol_print_error($db,$object->error);
 
@@ -172,7 +180,8 @@ if ($action == 'delete')
 	}
 	else
 	{
-        setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
+		$mesg='Error try do delete a line linked to a conciliated bank transaction';
+		setEventMessages($mesg, null, 'errors');
 	}
 }
 
@@ -180,11 +189,13 @@ if ($action == 'delete')
 /*
  *	View
  */
+
+$form = new Form($db);
+
 $title=$langs->trans("VAT") . " - " . $langs->trans("Card");
 $help_url='';
 llxHeader("",$title,$helpurl);
 
-$form = new Form($db);
 
 if ($id)
 {
@@ -248,7 +259,7 @@ if ($action == 'create')
     print $form->select_date($datep,"datep",'','','','add',1,1);
     print '</td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
+    print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
     print $form->select_date($datev,"datev",'','','','add',1,1);
     print '</td></tr>';
 
@@ -261,7 +272,7 @@ if ($action == 'create')
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="minwidth300" name="label" id="label" value="'.($_POST["label"]?GETPOST("label",'',2):$label).'"></td></tr>';
 
 	// Amount
-	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount","alpha").'"></td></tr>';
 
     if (! empty($conf->banque->enabled))
     {
@@ -306,6 +317,13 @@ if ($id)
 
 	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
 
+	$morehtmlref='<div class="refidno">';
+	// Label of social contribution
+	$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+	// Project
+	$morehtmlref.='</div>';
+
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
@@ -316,18 +334,17 @@ if ($id)
 	print '<table class="border" width="100%">';
 
 	// Label
-	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	//print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td>';
+	print '<td class="titlefield">'.$langs->trans("DatePayment").'</td><td>';
 	print dol_print_date($object->datep,'day');
 	print '</td></tr>';
 
-
 	print '<tr><td>';
-	print $form->editfieldkey("DateValue", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
+	print $form->editfieldkey($form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")), 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
 	print '</td><td>';
-	print $form->editfieldval("DateValue", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
+	print $form->editfieldval("PeriodEndDate", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
 	//print dol_print_date($object->datev,'day');
 	print '</td></tr>';
 
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 80242103c51..af330910cdf 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
  */
 class Tva extends CommonObject
 {
-	//public $element='tva';			//!< Id that identify managed objects
-	//public $table_element='tva';	//!< Name of table without prefix where object is stored
+	public $element='tva';			//!< Id that identify managed objects
+	public $table_element='tva';	//!< Name of table without prefix where object is stored
 	public $picto='payment';
 
 	var $tms;
@@ -48,8 +48,6 @@ class Tva extends CommonObject
 	var $fk_user_creat;
 	var $fk_user_modif;
 
-
-
     /**
 	 *	Constructor
 	 *
@@ -58,8 +56,6 @@ class Tva extends CommonObject
     function __construct($db)
     {
         $this->db = $db;
-        $this->element = 'tva';
-        $this->table_element = 'tva';
     }
 
 
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 71376a566e1..734f4880e48 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -30,7 +30,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 
 $langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
 
@@ -84,10 +91,6 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
-// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->ACCOUNTING_MODE;
-if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta");
-
 
 
 /*
@@ -96,13 +99,19 @@ if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta");
 
 $form=new Form($db);
 $company_static=new Societe($db);
+$invoice_customer=new Facture($db);
+$invoice_supplier=new FactureFournisseur($db);
+$expensereport=new ExpenseReport($db);
+$product_static=new Product($db);
+$payment_static=new Paiement($db);
+$paymentfourn_static=new PaiementFourn($db);
+$paymentexpensereport_static=new PaymentExpenseReport($db);
 
 $morequerystring='';
 $listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
-foreach($listofparams as $param) {
-	if (GETPOST($param)!='') {
-		$morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
-	}
+foreach ($listofparams as $param)
+{
+	if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
 }
 
 $special_report = false;
@@ -118,15 +127,28 @@ $fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
 $fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
 $fsearch.='  <input type="text" name="min" id="min" value="'.$min.'" size="6">';
 
-$description='';
-
 // Show report header
-$name=$langs->trans("VATReportByCustomers");
+$name=$langs->trans("VATReportByThirdParties");
 $calcmode='';
 if ($modetax == 0) $calcmode=$langs->trans('OptionVATDefault');
 if ($modetax == 1) $calcmode=$langs->trans('OptionVATDebitOption');
 if ($modetax == 2) $calcmode=$langs->trans('OptionPaymentForProductAndServices');
 $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+// Set period
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+$prevyear=$year_start; $prevquarter=$q;
+if ($prevquarter > 1) {
+	$prevquarter--;
+} else {
+	$prevquarter=4; $prevyear--;
+}
+$nextyear=$year_start; $nextquarter=$q;
+if ($nextquarter < 4) {
+	$nextquarter++;
+} else {
+	$nextquarter=1; $nextyear++;
+}
+$builddate=dol_now();
 
 if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description.=$langs->trans("RulesVATDueProducts");
 if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description.=$langs->trans("RulesVATInProducts");
@@ -137,23 +159,24 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue");
 
-$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
 //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
 $description.=$fsearch;
-$description.='<br>'
-	. '<input type="radio" name="extra_report" value="0" '.($special_report?'':'checked="checked"').'> '
-	. $langs->trans('SimpleReport')
-	. '</input>'
-	. '<br>'
-	. '<input type="radio" name="extra_report" value="1" '.($special_report?'checked="checked"':'').'> '
-	. $langs->trans('AddExtraReport')
-	. '</input>'
-	. '<br>';
-$builddate=dol_now();
-//$exportlink=$langs->trans("NotYetAvailable");
+if (! empty($conf->global->TAX_REPORT_EXTRA_REPORT))
+{
+	$description.='<br>'
+		. '<input type="radio" name="extra_report" value="0" '.($special_report?'':'checked="checked"').'> '
+		. $langs->trans('SimpleReport')
+		. '</input>'
+		. '<br>'
+		. '<input type="radio" name="extra_report" value="1" '.($special_report?'checked="checked"':'').'> '
+		. $langs->trans('AddExtraReport')
+		. '</input>'
+		. '<br>';
+}
 
 $elementcust=$langs->trans("CustomersInvoices");
 $productcust=$langs->trans("Description");
+$namerate=$langs->trans("VATRate");
 $amountcust=$langs->trans("AmountHT");
 if ($mysoc->tva_assuj) {
 	$vatcust.=' ('.$langs->trans("ToPay").')';
@@ -172,152 +195,547 @@ $vatsup=$langs->trans("VATPaid");
 
 // VAT Received
 
-//print "<br>";
-//print load_fiche_titre($vatcust);
-
 print "<table class=\"noborder\" width=\"100%\">";
-print "<tr class=\"liste_titre\">";
-print '<td align="left">'.$langs->trans("Num")."</td>";
-print '<td align="left">'.$langs->trans("Customer")."</td>";
-print "<td>".$langs->trans("VATIntra")."</td>";
-print "<td align=\"right\">".$langs->trans("AmountHTVATRealReceived")."</td>";
-print "<td align=\"right\">".$vatcust."</td>";
-print "</tr>\n";
 
-$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
+$y = $year_current;
+$total = 0;
+$i=0;
+$columns = 5;
 
-$action = "tvaclient";
-$object = &$coll_list;
-$parameters["mode"] = $modetax;
-$parameters["start"] = $date_start;
-$parameters["end"] = $date_end;
-$parameters["direction"] = 'sell';
-$parameters["type"] = 'vat';
+// Load arrays of datas
+$x_coll = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'sell');
+$x_paye = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'buy');
 
-// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('externalbalance'));
-$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-if (is_array($coll_list)) {
-	$var=true;
-	$total = 0;  $totalamount = 0;
-	$i = 1;
-	foreach ($coll_list as $coll) {
-		if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
-
-			$intra = str_replace($find,$replace,$coll->tva_intra);
-			if(empty($intra)) {
-				if($coll->assuj == '1') {
-					$intra = $langs->trans('Unknown');
-				} else {
-					//$intra = $langs->trans('NotRegistered');
-					$intra = '';
-				}
-			}
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">'.$i."</td>";
-			$company_static->id=$coll->socid;
-			$company_static->name=$coll->name;
-			$company_static->client=1;
-			print '<td class="nowrap">'.$company_static->getNomUrl(1,'customer').'</td>';
-			$find = array(' ','.');
-			$replace = array('','');
-			print '<td class="nowrap">'.$intra."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($coll->tva)."</td>";
-			$totalamount = $totalamount + $coll->amount;
-			$total = $total + $coll->tva;
-			print "</tr>\n";
-			$i++;
-		}
-	}
-	$x_coll_sum = $total;
-
-	print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
-	print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
-	print '<td class="nowrap" align="right">'.price($total).'</td>';
-	print '</tr>';
-} else {
+if (! is_array($x_coll) || ! is_array($x_paye))
+{
 	$langs->load("errors");
-	if ($coll_list == -1) {
-		if ($modecompta == 'CREANCES-DETTES')
-		{
-			print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
-		}
-	} else if ($coll_list == -2) {
-		print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
+	if ($x_coll == -1) {
+		print '<tr><td colspan="' . $columns . '">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
+	} else if ($x_coll == -2) {
+		print '<tr><td colspan="' . $columns . '">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
 	} else {
-		print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
+		print '<tr><td colspan="' . $columns . '">' . $langs->trans("Error") . '</td></tr>';
 	}
-}
-
-//print '</table>';
-
-
-// VAT Paid
-
-//print "<br>";
-//print load_fiche_titre($vatsup);
-
-//print "<table class=\"noborder\" width=\"100%\">";
-print "<tr class=\"liste_titre liste_titre_topborder\">";
-print '<td align="left">'.$langs->trans("Num")."</td>";
-print '<td align="left">'.$langs->trans("Supplier")."</td>";
-print "<td>".$langs->trans("VATIntra")."</td>";
-print "<td align=\"right\">".$langs->trans("AmountHTVATRealPaid")."</td>";
-print "<td align=\"right\">".$vatsup."</td>";
-print "</tr>\n";
-
-$company_static=new Societe($db);
-
-$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
-
-$parameters["direction"] = 'buy';
-$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if (is_array($coll_list)) {
-	$var=true;
-	$total = 0;  $totalamount = 0;
-	$i = 1;
-	foreach ($coll_list as $coll) {
-		if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
-
-			$intra = str_replace($find,$replace,$coll->tva_intra);
-			if (empty($intra)) {
-				if ($coll->assuj == '1') {
-					$intra = $langs->trans('Unknown');
-				} else {
-					//$intra = $langs->trans('NotRegistered');
-					$intra = '';
-				}
-			}
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">'.$i."</td>";
-			$company_static->id=$coll->socid;
-			$company_static->name=$coll->name;
-			$company_static->fournisseur=1;
-			print '<td class="nowrap">'.$company_static->getNomUrl(1,'supplier').'</td>';
-			$find = array(' ','.');
-			$replace = array('','');
-			print '<td class="nowrap">'.$intra."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($coll->tva)."</td>";
-			$totalamount = $totalamount + $coll->amount;
-			$total = $total + $coll->tva;
-			print "</tr>\n";
-			$i++;
+} else {
+	$x_both = array();
+	//now, from these two arrays, get another array with one rate per line
+	foreach(array_keys($x_coll) as $my_coll_thirdpartyid)
+	{
+		$x_both[$my_coll_thirdpartyid]['coll']['totalht'] = $x_coll[$my_coll_thirdpartyid]['totalht'];
+		$x_both[$my_coll_thirdpartyid]['coll']['vat']	 = $x_coll[$my_coll_thirdpartyid]['vat'];
+		$x_both[$my_coll_thirdpartyid]['paye']['totalht'] = 0;
+		$x_both[$my_coll_thirdpartyid]['paye']['vat'] = 0;
+		$x_both[$my_coll_thirdpartyid]['coll']['links'] = '';
+		$x_both[$my_coll_thirdpartyid]['coll']['detail'] = array();
+		foreach($x_coll[$my_coll_thirdpartyid]['facid'] as $id=>$dummy) {
+			$invoice_customer->id=$x_coll[$my_coll_thirdpartyid]['facid'][$id];
+			$invoice_customer->ref=$x_coll[$my_coll_thirdpartyid]['facnum'][$id];
+			$invoice_customer->type=$x_coll[$my_coll_thirdpartyid]['type'][$id];
+			$company_static->fetch($x_coll[$my_coll_thirdpartyid]['company_id'][$id]);
+			$x_both[$my_coll_thirdpartyid]['coll']['detail'][] = array(
+			'id'        =>$x_coll[$my_coll_thirdpartyid]['facid'][$id],
+			'descr'     =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
+			'pid'       =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
+			'pref'      =>$x_coll[$my_coll_thirdpartyid]['pref'][$id],
+			'ptype'     =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
+			'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
+			'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
+			'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
+			'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
+			'dtype'     =>$x_coll[$my_coll_thirdpartyid]['dtype'][$id],
+			'drate'     =>$x_coll[$my_coll_thirdpartyid]['drate'][$id],
+			'datef'     =>$x_coll[$my_coll_thirdpartyid]['datef'][$id],
+			'datep'     =>$x_coll[$my_coll_thirdpartyid]['datep'][$id],
+			'company_link'=>$company_static->getNomUrl(1,'',20),
+			'ddate_start'=>$x_coll[$my_coll_thirdpartyid]['ddate_start'][$id],
+			'ddate_end'  =>$x_coll[$my_coll_thirdpartyid]['ddate_end'][$id],
+			'totalht'   =>$x_coll[$my_coll_thirdpartyid]['totalht_list'][$id],
+			'vat'       =>$x_coll[$my_coll_thirdpartyid]['vat_list'][$id],
+			'link'      =>$invoice_customer->getNomUrl(1,'',12)
+			);
 		}
 	}
-	$x_paye_sum = $total;
+	// tva paid
+	foreach (array_keys($x_paye) as $my_paye_thirdpartyid) {
+		$x_both[$my_paye_thirdpartyid]['paye']['totalht'] = $x_paye[$my_paye_thirdpartyid]['totalht'];
+		$x_both[$my_paye_thirdpartyid]['paye']['vat'] = $x_paye[$my_paye_thirdpartyid]['vat'];
+		if (!isset($x_both[$my_paye_thirdpartyid]['coll']['totalht'])) {
+			$x_both[$my_paye_thirdpartyid]['coll']['totalht'] = 0;
+			$x_both[$my_paye_thirdpartyid]['coll']['vat'] = 0;
+		}
+		$x_both[$my_paye_thirdpartyid]['paye']['links'] = '';
+		$x_both[$my_paye_thirdpartyid]['paye']['detail'] = array();
 
-	print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
-	print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
-	print '<td class="nowrap" align="right">'.price($total).'</td>';
+		foreach ($x_paye[$my_paye_thirdpartyid]['facid'] as $id=>$dummy)
+		{
+			// ExpenseReport
+			if ($x_paye[$my_paye_thirdpartyid]['ptype'][$id] == 'ExpenseReportPayment')
+			{
+				$expensereport->id=$x_paye[$my_paye_thirdpartyid]['facid'][$id];
+				$expensereport->ref=$x_paye[$my_paye_thirdpartyid]['facnum'][$id];
+				$expensereport->type=$x_paye[$my_paye_thirdpartyid]['type'][$id];
+
+				$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
+				'id'				=>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
+				'descr'				=>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+				'pid'				=>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
+				'pref'				=>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
+				'ptype'				=>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+				'payment_id'		=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+				'payment_amount'	=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
+				'ftotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
+				'dtotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
+				'dtype'				=>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
+				'drate'             =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
+				'ddate_start'		=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
+				'ddate_end'			=>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
+				'totalht'			=>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
+				'vat'				=>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
+				'link'				=>$expensereport->getNomUrl(1)
+				);
+			}
+			else
+			{
+				$invoice_supplier->id=$x_paye[$my_paye_thirdpartyid]['facid'][$id];
+				$invoice_supplier->ref=$x_paye[$my_paye_thirdpartyid]['facnum'][$id];
+				$invoice_supplier->type=$x_paye[$my_paye_thirdpartyid]['type'][$id];
+				$company_static->fetch($x_paye[$my_paye_thirdpartyid]['company_id'][$id]);
+				$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
+				'id'        =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
+				'descr'     =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+				'pid'       =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
+				'pref'      =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
+				'ptype'     =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+				'payment_id'=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+				'payment_amount'=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
+				'ftotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
+				'dtotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
+				'dtype'     =>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
+				'drate'     =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
+				'datef'     =>$x_paye[$my_paye_thirdpartyid]['datef'][$id],
+				'datep'     =>$x_paye[$my_paye_thirdpartyid]['datep'][$id],
+				'company_link'=>$company_static->getNomUrl(1,'',20),
+				'ddate_start'=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
+				'ddate_end'  =>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
+				'totalht'   =>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
+				'vat'       =>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
+				'link'      =>$invoice_supplier->getNomUrl(1,'',12)
+				);
+			}
+		}
+	}
+	//now we have an array (x_both) indexed by rates for coll and paye
+
+
+	//print table headers for this quadri - incomes first
+
+	$x_coll_sum = 0;
+	$x_coll_ht = 0;
+	$x_paye_sum = 0;
+	$x_paye_ht = 0;
+
+	$span=$columns;
+	if ($modetax != 1) $span+=2;
+
+	//print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
+
+	// Customers invoices
+	print '<tr class="liste_titre">';
+	print '<td align="left">'.$elementcust.'</td>';
+	print '<td align="left">'.$langs->trans("DateInvoice").'</td>';
+	if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>';
+	else print '<td></td>';
+	print '<td align="right">'.$namerate.'</td>';
+	print '<td align="left">'.$productcust.'</td>';
+	if ($modetax != 1)
+	{
+		print '<td align="right">'.$amountcust.'</td>';
+		print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
+	print '<td align="right">'.$langs->trans("AmountHTVATRealReceived").'</td>';
+	print '<td align="right">'.$vatcust.'</td>';
 	print '</tr>';
 
+	$action = "tvadetail";
+	$parameters["mode"] = $modetax;
+	$parameters["start"] = $date_start;
+	$parameters["end"] = $date_end;
+	$parameters["type"] = 'vat';
+
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+	foreach (array_keys($x_coll) as $thirdparty_id) {
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
+
+		if (is_array($x_both[$thirdparty_id]['coll']['detail']))
+		{
+
+			// VAT Rate
+			print "<tr>";
+			print '<td class="tax_rate">';
+			if (is_numeric($thirdparty_id))
+			{
+				$company_static->fetch($thirdparty_id);
+				print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
+			}
+			else
+			{
+				$tmpid = preg_replace('/userid_/','',$thirdparty_id);
+				$user_static->fetch($tmpid);
+				print $langs->trans("User").': '.$user_static->getNomUrl(1);
+			}
+			print '</td><td colspan="'.($span+1).'"></td>';
+			print '</tr>'."\n";
+
+			foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type=1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type=1;
+				}
+
+
+				print '<tr class="oddeven">';
+
+				// Ref
+				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+
+				// Invoice date
+				print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+
+				// Payment date
+				if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+				else print '<td></td>';
+
+				// Rate
+				print '<td align="right">' . $fields['drate'] . '</td>';
+
+				// Description
+				print '<td align="left">';
+				if ($fields['pid'])
+				{
+					$product_static->id=$fields['pid'];
+					$product_static->ref=$fields['pref'];
+					$product_static->type=$fields['dtype'];		// We force with the type of line to have type how line is registered
+					print $product_static->getNomUrl(1);
+					if (dol_string_nohtmltag($fields['descr'])) {
+						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+					}
+				}
+				else
+				{
+					if ($type) {
+						$text = img_object($langs->trans('Service'),'service');
+					} else {
+						$text = img_object($langs->trans('Product'),'product');
+					}
+					if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg)) {
+						if ($reg[1]=='DEPOSIT') {
+							$fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+						} elseif ($reg[1]=='CREDIT_NOTE') {
+							$fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+						} else {
+							$fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+						}
+					}
+					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+
+					// Show range
+					print_date_range($fields['ddate_start'],$fields['ddate_end']);
+				}
+				print '</td>';
+
+				// Total HT
+				if ($modetax != 1)
+				{
+					print '<td class="nowrap" align="right">';
+					print price($fields['totalht']);
+					if (price2num($fields['ftotal_ttc']))
+					{
+						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+						$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+						//print ' ('.round($ratiolineinvoice*100,2).'%)';
+					}
+					print '</td>';
+				}
+
+				// Payment
+				$ratiopaymentinvoice=1;
+				if ($modetax != 1)
+				{
+					print '<td class="nowrap" align="right">';
+					//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+					if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+					{
+						$payment_static->id=$fields['payment_id'];
+						print $payment_static->getNomUrl(2);
+					}
+					if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+					{
+						print $langs->trans("NA");
+					} else {
+						if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+							$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+						}
+						print price(price2num($fields['payment_amount'],'MT'));
+						if (isset($fields['payment_amount'])) {
+							print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+						}
+					}
+					print '</td>';
+				}
+
+				// Total collected
+				print '<td class="nowrap" align="right">';
+				$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+				print price(price2num($temp_ht,'MT'),1);
+				print '</td>';
+
+				// VAT
+				print '<td class="nowrap" align="right">';
+				$temp_vat=$fields['vat']*$ratiopaymentinvoice;
+				print price(price2num($temp_vat,'MT'),1);
+				//print price($fields['vat']);
+				print '</td>';
+				print '</tr>';
+
+				$subtot_coll_total_ht += $temp_ht;
+				$subtot_coll_vat      += $temp_vat;
+				$x_coll_sum           += $temp_vat;
+			}
+		}
+		// Total customers for this vat rate
+		print '<tr class="liste_total">';
+		print '<td colspan="4"></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1) {
+			print '<td class="nowrap" align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
+		print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
+		print '</tr>';
+	}
+
+	if (count($x_coll) == 0)   // Show a total ine if nothing shown
+	{
+		print '<tr class="liste_total">';
+		print '<td colspan="4"></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1) {
+			print '<td class="nowrap" align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num(0,'MT')).'</td>';
+		print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
+		print '</tr>';
+	}
+
+	// Blank line
+	print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
+
+	// Print table headers for this quadri - expenses now
+	print '<tr class="liste_titre liste_titre_topborder">';
+	print '<td align="left">'.$elementsup.'</td>';
+	print '<td align="left">'.$langs->trans("DateInvoice").'</td>';
+	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>';
+	else print '<td></td>';
+	print '<td align="left">'.$namesup.'</td>';
+	print '<td align="left">'.$productsup.'</td>';
+	if ($modetax != 1) {
+		print '<td align="right">'.$amountsup.'</td>';
+		print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
+	print '<td align="right">'.$langs->trans("AmountHTVATRealPaid").'</td>';
+	print '<td align="right">'.$vatsup.'</td>';
+	print '</tr>'."\n";
+
+	foreach (array_keys($x_paye) as $thirdparty_id)
+	{
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
+
+		if (is_array($x_both[$thirdparty_id]['paye']['detail']))
+		{
+			print "<tr>";
+			print '<td class="tax_rate">';
+			if (is_numeric($thirdparty_id))
+			{
+				$company_static->fetch($thirdparty_id);
+				print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
+			}
+			else
+			{
+				$tmpid = preg_replace('/userid_/','',$thirdparty_id);
+				$user_static->fetch($tmpid);
+				print $langs->trans("User").': '.$user_static->getNomUrl(1);
+			}
+			print '<td colspan="'.($span+1).'"></td>';
+			print '</tr>'."\n";
+
+			foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index=>$fields) {
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type=1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type=1;
+				}
+
+
+				print '<tr class="oddeven">';
+
+				// Ref
+				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+
+				// Invoice date
+				print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+
+				// Payment date
+				if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+				else print '<td></td>';
+
+				// Company name
+				print '<td align="left">' . $fields['company_link'] . '</td>';
+
+				// Description
+				print '<td align="left">';
+				if ($fields['pid'])
+				{
+					$product_static->id=$fields['pid'];
+					$product_static->ref=$fields['pref'];
+					$product_static->type=$fields['dtype'];		// We force with the type of line to have type how line is registered
+					print $product_static->getNomUrl(1);
+					if (dol_string_nohtmltag($fields['descr'])) {
+						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+					}
+				}
+				else
+				{
+					if ($type) {
+						$text = img_object($langs->trans('Service'),'service');
+					} else {
+						$text = img_object($langs->trans('Product'),'product');
+					}
+					if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg)) {
+						if ($reg[1]=='DEPOSIT') {
+							$fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+						} elseif ($reg[1]=='CREDIT_NOTE') {
+							$fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+						} else {
+							$fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+						}
+					}
+					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+
+					// Show range
+					print_date_range($fields['ddate_start'],$fields['ddate_end']);
+				}
+				print '</td>';
+
+				// Total HT
+				if ($modetax != 1)
+				{
+					print '<td class="nowrap" align="right">';
+					print price($fields['totalht']);
+					if (price2num($fields['ftotal_ttc']))
+					{
+						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+						$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+						//print ' ('.round($ratiolineinvoice*100,2).'%)';
+					}
+					print '</td>';
+				}
+
+				// Payment
+				$ratiopaymentinvoice=1;
+				if ($modetax != 1)
+				{
+					print '<td class="nowrap" align="right">';
+					if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+					{
+						$paymentfourn_static->id=$fields['payment_id'];
+						print $paymentfourn_static->getNomUrl(2);
+					}
+
+					if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
+						|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+					{
+						print $langs->trans("NA");
+					}
+					else
+					{
+						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+							$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+						}
+						print price(price2num($fields['payment_amount'],'MT'));
+						if (isset($fields['payment_amount'])) {
+							print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+						}
+					}
+					print '</td>';
+				}
+
+				// VAT paid
+				print '<td class="nowrap" align="right">';
+				$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+				print price(price2num($temp_ht,'MT'),1);
+				print '</td>';
+
+				// VAT
+				print '<td class="nowrap" align="right">';
+				$temp_vat=$fields['vat']*$ratiopaymentinvoice;
+				print price(price2num($temp_vat,'MT'),1);
+				//print price($fields['vat']);
+				print '</td>';
+				print '</tr>';
+
+				$subtot_paye_total_ht += $temp_ht;
+				$subtot_paye_vat	  += $temp_vat;
+				$x_paye_sum		   += $temp_vat;
+			}
+		}
+		// Total suppliers for this vat rate
+		print '<tr class="liste_total">';
+		print '<td colspan="4"></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1) {
+			print '<td class="nowrap" align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
+		print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
+		print '</tr>';
+	}
+
+	if (count($x_paye) == 0) {  // Show a total line if nothing shown
+		print '<tr class="liste_total">';
+		print '<td colspan="4"></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1) {
+			print '<td class="nowrap" align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num(0,'MT')).'</td>';
+		print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
+		print '</tr>';
+	}
+
 	print '</table>';
 
 	// Total to pay
@@ -325,198 +743,15 @@ if (is_array($coll_list)) {
 	print '<table class="noborder" width="100%">';
 	$diff = $x_coll_sum - $x_paye_sum;
 	print '<tr class="liste_total">';
-	print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
+	print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
 	print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
 	print "</tr>\n";
 
-} else {
-	$langs->load("errors");
-	if ($coll_list == -1) {
-		if ($modecompta == 'CREANCES-DETTES')
-		{
-			print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
-		}
-	} else if ($coll_list == -2) {
-		print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
-	} else {
-		print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
-	}
+	$i++;
 }
 
 print '</table>';
 
-if ($special_report) {
-	// Get country 2-letters code
-	global $mysoc;
-	$country_id = $mysoc->country_id;
-	$country = new Ccountry($db);
-	$country->fetch($country_id);
-
-	// Print listing of other-country customers as additional report
-	// This matches tax requirements to list all same-country customers (only)
-	print '<h3>'.$langs->trans('OtherCountriesCustomersReport').'</h3>';
-	print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry');
-	$coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, 'sell');
-
-	print "<table class=\"noborder\" width=\"100%\">";
-	print "<tr class=\"liste_titre\">";
-	print '<td align="left">' . $langs->trans("Num") . "</td>";
-	print '<td align="left">' . $langs->trans("Customer") . "</td>";
-	print "<td>" . $langs->trans("VATIntra") . "</td>";
-	print "<td align=\"right\">" . $langs->trans("AmountHTVATRealReceived") . "</td>";
-	print "<td align=\"right\">" . $vatcust . "</td>";
-	print "</tr>\n";
-
-	if (is_array($coll_list)) {
-		$var = true;
-		$total = 0;
-		$totalamount = 0;
-		$i = 1;
-		foreach ($coll_list as $coll) {
-			if (substr($coll->tva_intra, 0, 2) == $country->code) {
-				// Only use different-country VAT codes
-				continue;
-			}
-			if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
-				$var = !$var;
-				$intra = str_replace($find, $replace, $coll->tva_intra);
-				if (empty($intra)) {
-					if ($coll->assuj == '1') {
-						$intra = $langs->trans('Unknown');
-					} else {
-						//$intra = $langs->trans('NotRegistered');
-						$intra = '';
-					}
-				}
-				print "<tr " . $bc[$var] . ">";
-				print '<td class="nowrap">' . $i . "</td>";
-				$company_static->id = $coll->socid;
-				$company_static->name = $coll->name;
-				$company_static->client = 1;
-				print '<td class="nowrap">' . $company_static->getNomUrl(1,
-						'customer') . '</td>';
-				$find = array(' ', '.');
-				$replace = array('', '');
-				print '<td class="nowrap">' . $intra . "</td>";
-				print "<td class=\"nowrap\" align=\"right\">" . price($coll->amount) . "</td>";
-				print "<td class=\"nowrap\" align=\"right\">" . price($coll->tva) . "</td>";
-				$totalamount = $totalamount + $coll->amount;
-				$total = $total + $coll->tva;
-				print "</tr>\n";
-				$i++;
-			}
-		}
-		$x_coll_sum = $total;
-
-		print '<tr class="liste_total"><td align="right" colspan="3">' . $langs->trans("Total") . ':</td>';
-		print '<td class="nowrap" align="right">' . price($totalamount) . '</td>';
-		print '<td class="nowrap" align="right">' . price($total) . '</td>';
-		print '</tr>';
-	} else {
-		$langs->load("errors");
-		if ($coll_list == -1) {
-			if ($modecompta == 'CREANCES-DETTES')
-			{
-				print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
-			}
-			else
-			{
-				print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
-			}
-		} else {
-			if ($coll_list == -2) {
-				print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
-			} else {
-				print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
-			}
-		}
-	}
-	print '</table>';
-
-	// Print listing of same-country customers as additional report
-	// This matches tax requirements to list all same-country customers (only)
-	print '<h3>'.$langs->trans('SameCountryCustomersWithVAT').'</h3>';
-	print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry');
-	$coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, 'sell');
-
-	print "<table class=\"noborder\" width=\"100%\">";
-	print "<tr class=\"liste_titre\">";
-	print '<td align="left">' . $langs->trans("Num") . "</td>";
-	print '<td align="left">' . $langs->trans("Customer") . "</td>";
-	print "<td>" . $langs->trans("VATIntra") . "</td>";
-	print "<td align=\"right\">" . $langs->trans("AmountHTVATRealReceived") . "</td>";
-	print "<td align=\"right\">" . $vatcust . "</td>";
-	print "</tr>\n";
-
-	if (is_array($coll_list)) {
-		$var = true;
-		$total = 0;
-		$totalamount = 0;
-		$i = 1;
-		foreach ($coll_list as $coll) {
-			if (substr($coll->tva_intra, 0, 2) != $country->code) {
-				// Only use same-country VAT codes
-				continue;
-			}
-			if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
-				$var = !$var;
-				$intra = str_replace($find, $replace, $coll->tva_intra);
-				if (empty($intra)) {
-					if ($coll->assuj == '1') {
-						$intra = $langs->trans('Unknown');
-					} else {
-						//$intra = $langs->trans('NotRegistered');
-						$intra = '';
-					}
-				}
-				print "<tr " . $bc[$var] . ">";
-				print '<td class="nowrap">' . $i . "</td>";
-				$company_static->id = $coll->socid;
-				$company_static->name = $coll->name;
-				$company_static->client = 1;
-				print '<td class="nowrap">' . $company_static->getNomUrl(1, 'customer') . '</td>';
-				$find = array(' ', '.');
-				$replace = array('', '');
-				print '<td class="nowrap">' . $intra . "</td>";
-				print "<td class=\"nowrap\" align=\"right\">" . price($coll->amount) . "</td>";
-				print "<td class=\"nowrap\" align=\"right\">" . price($coll->tva) . "</td>";
-				$totalamount = $totalamount + $coll->amount;
-				$total = $total + $coll->tva;
-				print "</tr>\n";
-				$i++;
-			}
-		}
-		$x_coll_sum = $total;
-
-		print '<tr class="liste_total"><td align="right" colspan="3">' . $langs->trans("Total") . ':</td>';
-		print '<td class="nowrap" align="right">' . price($totalamount) . '</td>';
-		print '<td class="nowrap" align="right">' . price($total) . '</td>';
-		print '</tr>';
-	} else {
-		$langs->load("errors");
-		if ($coll_list == -1) {
-			if ($modecompta == 'CREANCES-DETTES')
-			{
-				print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
-			}
-			else
-			{
-				print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
-			}
-		} else {
-			if ($coll_list == -2) {
-				print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
-			} else {
-				print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
-			}
-		}
-	}
-	print '</table>';
-}
 
 llxFooter();
 
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 2fb7ba272c8..04d65dfadf5 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -84,7 +84,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
     $object->fetch($id);
-    $result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
+    $result = $object->setValueFrom('label', GETPOST('lib','alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
     if ($result < 0)
         setEventMessages($object->error, $object->errors, 'errors');
 }
@@ -111,23 +111,8 @@ if ($object->id)
 
 	$morehtmlref='<div class="refidno">';
 	// Label of social contribution
-	$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
-    // Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' : ';
-        if (! empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-            $morehtmlref.=$proj->ref;
-            $morehtmlref.='</a>';
-        } else {
-            $morehtmlref.='';
-        }
-	}
+	$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 	$morehtmlref.='</div>';
 
 	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/tva/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
@@ -151,7 +136,7 @@ if ($object->id)
     print '<table class="border" width="100%">';
 
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 1c9632fac61..e6cdf738b96 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 
 $langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
 
@@ -44,13 +45,12 @@ if (empty($year))
 }
 $date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
 $date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
-// Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$q=GETPOST("q");
+	$q=GETPOST("q","int");
 	if (empty($q))
 	{
-		if (GETPOST("month")) { $date_start=dol_get_first_day($year_start,GETPOST("month"),false); $date_end=dol_get_last_day($year_start,GETPOST("month"),false); }
+		if (GETPOST("month","int")) { $date_start=dol_get_first_day($year_start,GETPOST("month","int"),false); $date_end=dol_get_last_day($year_start,GETPOST("month","int"),false); }
 		else
 		{
 			$date_start=dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START,false);
@@ -81,10 +81,10 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
 /**
  * print function
  *
- * @param 	DoliDB	$db		Database handler
- * @param 	string	$sql	SQL Request
- * @param 	string	$date	Date
- * @return	void
+ * @param		DoliDB	$db		Database handler
+ * @param		string	$sql	SQL Request
+ * @param		string	$date	Date
+ * @return		void
  */
 function pt ($db, $sql, $date)
 {
@@ -96,25 +96,81 @@ function pt ($db, $sql, $date)
         $i = 0;
         $total = 0;
         print '<table class="noborder" width="100%">';
+
         print '<tr class="liste_titre">';
-        print '<td class="nowrap" width="60%">'.$date.'</td>';
-        print '<td align="right">'.$langs->trans("Amount").'</td>';
-        print '<td>&nbsp;</td>'."\n";
+        print '<td class="nowrap">'.$date.'</td>';
+        print '<td align="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+        print '<td align="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
         print "</tr>\n";
 
+        $amountclaimed = 0;
+        $amountpaid = 0;
+        $previousmonth = '';
+        $previousmode = '';
         while ($i < $num) {
             $obj = $db->fetch_object($result);
+            //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+            if ($obj->mode == 'claimed' && ! empty($previousmode))
+            {
+            	print '<tr class="oddeven">';
+            	print '<td class="nowrap">'.$previousmonth."</td>\n";
+            	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+            	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+            	print "</tr>\n";
 
-            print '<tr class="oddeven">';
-            print '<td class="nowrap">'.$obj->dm."</td>\n";
-            $total = $total + $obj->mm;
+            	$amountclaimed = 0;
+            	$amountpaid = 0;
+            }
 
-            print '<td class="nowrap" align="right">'.price($obj->mm)."</td><td >&nbsp;</td>\n";
-            print "</tr>\n";
+            if ($obj->mode == 'claimed')
+            {
+            	$amountclaimed = $obj->mm;
+            	$totalclaimed = $totalclaimed + $amountclaimed;
+            }
+            if ($obj->mode == 'paid')
+            {
+            	$amountpaid = $obj->mm;
+            	$totalpaid = $totalpaid + $amountpaid;
+            }
+
+            if ($obj->mode == 'paid')
+            {
+            	print '<tr class="oddeven">';
+            	print '<td class="nowrap">'.$obj->dm."</td>\n";
+            	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+            	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+            	print "</tr>\n";
+            	$amountclaimed = 0;
+            	$amountpaid = 0;
+            	$previousmode = '';
+            	$previousmonth = '';
+            }
+            else
+            {
+            	$previousmode = $obj->mode;
+            	$previousmonth = $obj->dm;
+            }
 
             $i++;
         }
-        print '<tr class="liste_total"><td align="right">'.$langs->trans("Total")." :</td><td class=\"nowrap\" align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>";
+
+        if ($obj->mode == 'claimed' && ! empty($previousmode))
+        {
+        	print '<tr class="oddeven">';
+        	print '<td class="nowrap">'.$previousmonth."</td>\n";
+        	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+        	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+        	print "</tr>\n";
+
+        	$amountclaimed = 0;
+        	$amountpaid = 0;
+        }
+
+        print '<tr class="liste_total">';
+        print '<td align="right">'.$langs->trans("Total").'</td>';
+        print '<td class="nowrap" align="right">'.price($totalclaimed).'</td>';
+        print '<td class="nowrap" align="right">'.price($totalpaid).'</td>';
+        print "</tr>";
 
         print "</table>";
         $db->free($result);
@@ -189,21 +245,128 @@ $m = $tmp['mon'];
 $tmp=dol_getdate($date_end);
 $yend = $tmp['year'];
 $mend = $tmp['mon'];
-
+//var_dump($m);
 $total=0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
 $i=0; $mcursor=0;
 while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000)	// $mcursor is to avoid too large loop
 {
-	$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
+	//$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
 	if ($m == 13) $y++;
 	if ($m > 12) $m -= 12;
 	$mcursor++;
 
-	$coll_listsell = tax_by_date('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
-	$coll_listbuy = tax_by_date('vat', $db, $y, 0, 0, 0, $modetax, 'buy', $m);
+	$x_coll = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
+	$x_paye = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'buy', $m);
+
+	$x_both = array();
+	//now, from these two arrays, get another array with one rate per line
+	foreach(array_keys($x_coll) as $my_coll_rate)
+	{
+		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
+		$x_both[$my_coll_rate]['coll']['vat']	 = $x_coll[$my_coll_rate]['vat'];
+		$x_both[$my_coll_rate]['paye']['totalht'] = 0;
+		$x_both[$my_coll_rate]['paye']['vat'] = 0;
+		$x_both[$my_coll_rate]['coll']['links'] = '';
+		$x_both[$my_coll_rate]['coll']['detail'] = array();
+		foreach($x_coll[$my_coll_rate]['facid'] as $id=>$dummy) {
+			//$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
+			//$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
+			//$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
+			//$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
+			$x_both[$my_coll_rate]['coll']['detail'][] = array(
+			'id'        =>$x_coll[$my_coll_rate]['facid'][$id],
+			'descr'     =>$x_coll[$my_coll_rate]['descr'][$id],
+			'pid'       =>$x_coll[$my_coll_rate]['pid'][$id],
+			'pref'      =>$x_coll[$my_coll_rate]['pref'][$id],
+			'ptype'     =>$x_coll[$my_coll_rate]['ptype'][$id],
+			'payment_id'=>$x_coll[$my_coll_rate]['payment_id'][$id],
+			'payment_amount'=>$x_coll[$my_coll_rate]['payment_amount'][$id],
+			'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
+			'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
+			'dtype'     =>$x_coll[$my_coll_rate]['dtype'][$id],
+			'datef'     =>$x_coll[$my_coll_rate]['datef'][$id],
+			'datep'     =>$x_coll[$my_coll_rate]['datep'][$id],
+			//'company_link'=>$company_static->getNomUrl(1,'',20),
+			'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
+			'ddate_end'  =>$x_coll[$my_coll_rate]['ddate_end'][$id],
+			'totalht'   =>$x_coll[$my_coll_rate]['totalht_list'][$id],
+			'vat'       =>$x_coll[$my_coll_rate]['vat_list'][$id],
+			//'link'      =>$invoice_customer->getNomUrl(1,'',12)
+			);
+		}
+	}
+
+	// tva paid
+	foreach (array_keys($x_paye) as $my_paye_rate) {
+		$x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
+		$x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
+		if (!isset($x_both[$my_paye_rate]['coll']['totalht'])) {
+			$x_both[$my_paye_rate]['coll']['totalht'] = 0;
+			$x_both[$my_paye_rate]['coll']['vat'] = 0;
+		}
+		$x_both[$my_paye_rate]['paye']['links'] = '';
+		$x_both[$my_paye_rate]['paye']['detail'] = array();
+
+		foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
+		{
+			// ExpenseReport
+			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment')
+			{
+				//$expensereport->id=$x_paye[$my_paye_rate]['facid'][$id];
+				//$expensereport->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+				//$expensereport->type=$x_paye[$my_paye_rate]['type'][$id];
+
+				$x_both[$my_paye_rate]['paye']['detail'][] = array(
+				'id'				=>$x_paye[$my_paye_rate]['facid'][$id],
+				'descr'				=>$x_paye[$my_paye_rate]['descr'][$id],
+				'pid'				=>$x_paye[$my_paye_rate]['pid'][$id],
+				'pref'				=>$x_paye[$my_paye_rate]['pref'][$id],
+				'ptype'				=>$x_paye[$my_paye_rate]['ptype'][$id],
+				'payment_id'		=>$x_paye[$my_paye_rate]['payment_id'][$id],
+				'payment_amount'	=>$x_paye[$my_paye_rate]['payment_amount'][$id],
+				'ftotal_ttc'		=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+				'dtotal_ttc'		=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+				'dtype'				=>$x_paye[$my_paye_rate]['dtype'][$id],
+				'ddate_start'		=>$x_paye[$my_paye_rate]['ddate_start'][$id],
+				'ddate_end'			=>$x_paye[$my_paye_rate]['ddate_end'][$id],
+				'totalht'			=>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
+				//'link'				=>$expensereport->getNomUrl(1)
+				);
+			}
+			else
+			{
+				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
+				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
+				//$company_static->fetch($x_paye[$my_paye_rate]['company_id'][$id]);
+				$x_both[$my_paye_rate]['paye']['detail'][] = array(
+				'id'        =>$x_paye[$my_paye_rate]['facid'][$id],
+				'descr'     =>$x_paye[$my_paye_rate]['descr'][$id],
+				'pid'       =>$x_paye[$my_paye_rate]['pid'][$id],
+				'pref'      =>$x_paye[$my_paye_rate]['pref'][$id],
+				'ptype'     =>$x_paye[$my_paye_rate]['ptype'][$id],
+				'payment_id'=>$x_paye[$my_paye_rate]['payment_id'][$id],
+				'payment_amount'=>$x_paye[$my_paye_rate]['payment_amount'][$id],
+				'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+				'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+				'dtype'     =>$x_paye[$my_paye_rate]['dtype'][$id],
+				'datef'     =>$x_paye[$my_paye_rate]['datef'][$id],
+				'datep'     =>$x_paye[$my_paye_rate]['datep'][$id],
+				//'company_link'=>$company_static->getNomUrl(1,'',20),
+				'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
+				'ddate_end'  =>$x_paye[$my_paye_rate]['ddate_end'][$id],
+				'totalht'   =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+				'vat'       =>$x_paye[$my_paye_rate]['vat_list'][$id],
+				//'link'      =>$invoice_supplier->getNomUrl(1,'',12)
+				);
+			}
+		}
+	}
+	//now we have an array (x_both) indexed by rates for coll and paye
 
     $action = "tva";
-    $object = array(&$coll_listsell, &$coll_listbuy);
+    $object = array(&$x_coll, &$x_paye, &$x_both);
     $parameters["mode"] = $modetax;
     $parameters["year"] = $y;
     $parameters["month"] = $m;
@@ -213,13 +376,13 @@ while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000)	// $mcu
     $hookmanager->initHooks(array('externalbalance'));
     $reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-    if (! is_array($coll_listbuy) && $coll_listbuy == -1)
+    if (! is_array($x_coll) && $coll_listbuy == -1)
     {
         $langs->load("errors");
         print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
         break;
     }
-    if (! is_array($coll_listbuy) && $coll_listbuy == -2)
+    if (! is_array($x_paye) && $coll_listbuy == -2)
     {
         print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
         break;
@@ -227,46 +390,121 @@ while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000)	// $mcu
 
 
     print '<tr class="oddeven">';
-    print '<td class="nowrap"><a href="quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</a></td>';
+    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</a></td>';
 
-    $x_coll = 0;
-    foreach($coll_listsell as $vatrate=>$val)
+    $x_coll_sum = 0;
+    foreach (array_keys($x_coll) as $rate)
     {
-        $x_coll+=$val['vat'];
-    }
-    $subtotalcoll = $subtotalcoll + $x_coll;
-    print "<td class=\"nowrap\" align=\"right\">".price($x_coll)."</td>";
+    	$subtot_coll_total_ht = 0;
+    	$subtot_coll_vat = 0;
 
-    $x_paye = 0;
-    foreach($coll_listbuy as $vatrate=>$val)
+    	foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+	    {
+	    	// Payment
+	    	$ratiopaymentinvoice=1;
+	    	if ($modetax != 1)
+	    	{
+	    		// Define type
+	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+	    		$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+	    		// Try to enhance type detection using date_start and date_end for free lines where type
+	    		// was not saved.
+	    		if (!empty($fields['ddate_start'])) {
+	    			$type=1;
+	    		}
+	    		if (!empty($fields['ddate_end'])) {
+	    			$type=1;
+	    		}
+
+	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+	    		{
+	    			//print $langs->trans("NA");
+	    		} else {
+	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+	    				$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+	    			}
+	    		}
+	    	}
+	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+	    	$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+	    	$temp_vat=$fields['vat']*$ratiopaymentinvoice;
+	    	$subtot_coll_total_ht += $temp_ht;
+	    	$subtot_coll_vat      += $temp_vat;
+	    	$x_coll_sum           += $temp_vat;
+	    }
+    }
+    print "<td class=\"nowrap\" align=\"right\">".price(price2num($x_coll_sum,'MT'))."</td>";
+
+    $x_paye_sum = 0;
+    foreach (array_keys($x_paye) as $rate)
     {
-        $x_paye+=$val['vat'];
-    }
-    $subtotalpaye = $subtotalpaye + $x_paye;
-    print "<td class=\"nowrap\" align=\"right\">".price($x_paye)."</td>";
+    	$subtot_paye_total_ht = 0;
+    	$subtot_paye_vat = 0;
 
-    $diff = $x_coll - $x_paye;
+	    foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+	    {
+	    	// Payment
+	    	$ratiopaymentinvoice=1;
+	    	if ($modetax != 1)
+	    	{
+	    		// Define type
+	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+	    		$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+	    		// Try to enhance type detection using date_start and date_end for free lines where type
+	    		// was not saved.
+	    		if (!empty($fields['ddate_start'])) {
+	    			$type=1;
+	    		}
+	    		if (!empty($fields['ddate_end'])) {
+	    			$type=1;
+	    		}
+
+	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+	    		{
+	    			//print $langs->trans("NA");
+	    		} else {
+	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+	    				$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+	    			}
+	    		}
+	    	}
+	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+	    	$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+	    	$temp_vat=$fields['vat']*$ratiopaymentinvoice;
+	    	$subtot_paye_total_ht += $temp_ht;
+	    	$subtot_paye_vat      += $temp_vat;
+	    	$x_paye_sum           += $temp_vat;
+	    }
+    }
+    print "<td class=\"nowrap\" align=\"right\">".price(price2num($x_paye_sum,'MT'))."</td>";
+
+    $subtotalcoll = $subtotalcoll + $x_coll_sum;
+    $subtotalpaye = $subtotalpaye + $x_paye_sum;
+
+    $diff = $x_coll_sum - $x_paye_sum;
     $total = $total + $diff;
-    $subtotal = $subtotal + $diff;
+    $subtotal = price2num($subtotal + $diff, 'MT');
 
-    print "<td class=\"nowrap\" align=\"right\">".price($diff)."</td>\n";
+    print "<td class=\"nowrap\" align=\"right\">".price(price2num($diff,'MT'))."</td>\n";
     print "<td>&nbsp;</td>\n";
     print "</tr>\n";
 
-    $i++;
+    $i++; $m++;
     if ($i > 2)
     {
         print '<tr class="liste_total">';
         print '<td align="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.($m/3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-        print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td>';
-        print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td>';
-        print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
+        print '<td class="nowrap" align="right">'.price(price2num($subtotalcoll,'MT')).'</td>';
+        print '<td class="nowrap" align="right">'.price(price2num($subtotalpaye,'MT')).'</td>';
+        print '<td class="nowrap" align="right">'.price(price2num($subtotal,'MT')).'</td>';
         print '<td>&nbsp;</td></tr>';
         $i = 0;
         $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
     }
 }
-print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap" align="right">'.price($total).'</td>';
+print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap" align="right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
 print '</tr>';
 
@@ -276,32 +514,44 @@ print '</table>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
-print load_fiche_titre($langs->trans("VATPaid"), '', '');
 
 /*
  * Payed
  */
 
-$sql = "SELECT SUM(amount) as mm, date_format(f.datep,'%Y-%m') as dm";
+print load_fiche_titre($langs->trans("VATPaid"), '', '');
+
+$sql='';
+
+$sql.= "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm, 'claimed' as mode";
 $sql.= " FROM ".MAIN_DB_PREFIX."tva as f";
 $sql.= " WHERE f.entity = ".$conf->entity;
-$sql.= " AND f.datep >= '".$db->idate($date_start)."'";
-$sql.= " AND f.datep <= '".$db->idate($date_end)."'";
-$sql.= " GROUP BY dm ORDER BY dm ASC";
+$sql.= " AND (f.datev >= '".$db->idate($date_start)."' AND f.datev <= '".$db->idate($date_end)."')";
+$sql.= " GROUP BY dm";
 
-pt($db, $sql,$langs->trans("Year")." $y");
+$sql.= " UNION ";
 
+$sql.= "SELECT SUM(amount) as mm, date_format(f.datep,'%Y-%m') as dm, 'paid' as mode";
+$sql.= " FROM ".MAIN_DB_PREFIX."tva as f";
+$sql.= " WHERE f.entity = ".$conf->entity;
+$sql.= " AND (f.datep >= '".$db->idate($date_start)."' AND f.datep <= '".$db->idate($date_end)."')";
+$sql.= " GROUP BY dm";
 
-print '<br>';
+$sql.= " ORDER BY dm ASC, mode ASC";
+//print $sql;
+
+pt($db, $sql, $langs->trans("Month"));
 
 
 if (! empty($conf->global->MAIN_FEATURES_LEVEL))
 {
-    /*
+	print '<br>';
+
+	/*
      * Recap
      */
 
-    print load_fiche_titre($langs->trans("VATRecap"), '', ''); // need to add translation
+    print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
 
     $sql1 = "SELECT SUM(amount) as mm, date_format(f.datev,'%Y') as dm";
     $sql1 .= " FROM " . MAIN_DB_PREFIX . "tva as f";
@@ -316,7 +566,7 @@ if (! empty($conf->global->MAIN_FEATURES_LEVEL))
         print '<table class="noborder" width="100%">';
 
         print "<tr>";
-        print '<td align="right">' . $langs->trans("VATDue") . '</td>'; // need to add translation
+        print '<td align="right">' . $langs->trans("VATDue") . '</td>';
         print '<td class="nowrap" align="right">' . price(price2num($total, 'MT')) . '</td>';
         print "</tr>\n";
 
@@ -327,7 +577,7 @@ if (! empty($conf->global->MAIN_FEATURES_LEVEL))
 
         $restopay = $total - $obj->mm;
         print "<tr>";
-        print '<td align="right">' . $langs->trans("VATRestopay") . '</td>'; // need to add translation
+        print '<td align="right">' . $langs->trans("RemainToPay") . '</td>';
         print '<td class="nowrap" align="right">' . price(price2num($restopay, 'MT')) . '</td>';
         print "</tr>\n";
 
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index 6a3955403e7..24208aedf2a 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -37,10 +37,27 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
+$object = new Tva($db);
+
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'setlib' && $user->rights->tax->charges->creer)
+{
+	$object->fetch($id);
+	$result = $object->setValueFrom('label', GETPOST('lib','alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
+}
+
 
 /*
  * View
  */
+
 $title=$langs->trans("VAT") . " - " . $langs->trans("Info");
 $help_url='';
 llxHeader("",$title,$helpurl);
@@ -53,6 +70,12 @@ $head = vat_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("VATPayment"), -1, 'payment');
 
+$morehtmlref='<div class="refidno">';
+// Label of social contribution
+$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+$morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+$morehtmlref.='</div>';
+
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index e796ddacac7..efe436a3704 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -46,7 +46,7 @@ $search_account = GETPOST('search_account','int');
 $month = GETPOST("month","int");
 $year = GETPOST("year","int");
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -151,7 +151,9 @@ if ($result)
 	$newcardbutton='';
 	if ($user->rights->tax->charges->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/compta/tva/card.php?action=create">'.$langs->trans('NewVATPayment').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/compta/tva/card.php?action=create">'.$langs->trans('NewVATPayment');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -168,11 +170,11 @@ if ($result)
 	print '<table class="noborder" width="100%">';
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat" size="4" name="search_ref" value="'.$search_ref.'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre" colspan="1" align="center">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	print '<td class="liste_titre" align="center">';
+	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
 	$syear = $year;
 	$formother->select_year($syear?$syear:-1,'year',1, 20, 5);
 	print '</td>';
@@ -197,7 +199,7 @@ if ($result)
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre("Label",$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre("DateValue",$_SERVER["PHP_SELF"],"t.datev","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre("PeriodEndDate",$_SERVER["PHP_SELF"],"t.datev","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"t.datep","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
 	if (! empty($conf->banque->enabled)) print_liste_field_titre("Account",$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
@@ -264,7 +266,7 @@ if ($result)
     $colspan=5;
     if (! empty($conf->banque->enabled)) $colspan++;
     print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Total").'</td>';
-    print "<td align=\"right\"><b>".price($total)."</b></td>";
+    print '<td align="right">'.price($total).'</td>';
 	print "<td>&nbsp;</td></tr>";
 
     print "</table>";
diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
deleted file mode 100644
index e572eb7e006..00000000000
--- a/htdocs/compta/tva/quadri.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006      Yannick Warnier      <ywarnier@beeznest.org>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	    \file       htdocs/compta/tva/quadri.php
- *      \ingroup    tax
- *      \brief      Trimestrial page
- *      TODO 		Deal with recurrent invoices as well
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-
-$langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
-
-$year = GETPOST('year', 'int');
-if ($year == 0 )
-{
-  $year_current = strftime("%Y",time());
-  $year_start = $year_current;
-} else {
-  $year_current = $year;
-  $year_start = $year;
-}
-
-// Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'tax', '', '', 'charges');
-
-
-/**
- * Gets VAT to collect for the given month of the given year
- * The function gets the VAT in split results, as the VAT declaration asks
- * to report the amounts for different VAT rates as different lines.
- * This function also accounts recurrent invoices.
- *
- * @param	DoliDB	$db		Database handler
- * @param	int		$y		Year
- * @param	int		$q		Year quarter (1-4)
- * @return	array
- */
-function tva_coll($db,$y,$q)
-{
-	global $conf;
-
-    if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
-    {
-        // if vat paid on due invoices
-        $sql = "SELECT d.fk_facture as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.total_tva as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-        $sql.= ", ".MAIN_DB_PREFIX."facturedet as d" ;
-        $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE f.fk_soc = s.rowid";
-        $sql.= " AND f.entity = ".$conf->entity;
-        $sql.= " AND f.fk_statut in (1,2)";
-        $sql.= " AND f.rowid = d.fk_facture ";
-        $sql.= " AND date_format(f.datef,'%Y') = '".$y."'";
-        $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3);
-        $sql.= " AND date_format(f.datef,'%m') <= ".($q*3).")";
-        $sql.= " ORDER BY rate, facid";
-
-    }
-    else
-    {
-        // if vat paid on paiments
-    }
-
-    $resql = $db->query($sql);
-
-    if ($resql)
-    {
-    	$list = array();
-    	$rate = -1;
-    	while($assoc = $db->fetch_array($resql))
-    	{
-    		if($assoc['rate'] != $rate){ //new rate
-    			$list[$assoc['rate']]['totalht'] = $assoc['totalht'];
-    			$list[$assoc['rate']]['vat'] = $assoc['amount'];
-    			$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-    		}else{
-    			$list[$assoc['rate']]['totalht'] += $assoc['totalht'];
-    			$list[$assoc['rate']]['vat'] += $assoc['amount'];
-    			if(!in_array($assoc['facid'],$list[$assoc['rate']]['facid'])){
-	    			$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-	    			$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-    			}
-    		}
-    		$rate = $assoc['rate'];
-    	}
-		return $list;
-    }
-    else
-    {
-        dol_print_error($db);
-    }
-}
-
-
-/**
- * Gets VAT to pay for the given month of the given year
- * The function gets the VAT in split results, as the VAT declaration asks
- * to report the amounts for different VAT rates as different lines
- *
- * @param	DoliDB	$db			Database handler object
- * @param	int		$y			Year
- * @param	int		$q			Year quarter (1-4)
- * @return	array
- */
-function tva_paye($db, $y,$q)
-{
-	global $conf;
-
-    if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
-    {
-        // Si on paye la tva sur les factures dues (non brouillon)
-        $sql = "SELECT d.fk_facture_fourn as facid, f.ref_supplier as facnum, d.tva_tx as rate, d.total_ht as totalht, d.tva as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-        $sql.= ", ".MAIN_DB_PREFIX."facture_fourn_det as d" ;
-        $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE f.fk_soc = s.rowid";
-        $sql.= " AND f.entity = ".$conf->entity;
-        $sql.= " AND f.fk_statut = 1 ";
-        $sql.= " AND f.rowid = d.fk_facture_fourn ";
-        $sql.= " AND date_format(f.datef,'%Y') = '".$y."'";
-        $sql.= " AND (round(date_format(f.datef,'%m')) > ".(($q-1)*3);
-        $sql.= " AND round(date_format(f.datef,'%m')) <= ".($q*3).")";
-        $sql.= " ORDER BY rate, facid ";
-    }
-    else
-    {
-        // Si on paye la tva sur les payments
-    }
-
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-   	$list = array();
-    	$rate = -1;
-    	while($assoc = $db->fetch_array($resql))
-    	{
-    		if($assoc['rate'] != $rate){ //new rate
-    			$list[$assoc['rate']]['totalht'] = $assoc['totalht'];
-    			$list[$assoc['rate']]['vat'] = $assoc['amount'];
-    			$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-    		}else{
-    			$list[$assoc['rate']]['totalht'] += $assoc['totalht'];
-    			$list[$assoc['rate']]['vat'] += $assoc['amount'];
-    			if(!in_array($assoc['facid'],$list[$assoc['rate']]['facid'])){
-	    			$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-	    			$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-    			}
-    		}
-    		$rate = $assoc['rate'];
-    	}
-		return $list;
-
-    }
-    else
-    {
-        dol_print_error($db);
-    }
-}
-
-
-/**
- * View
- */
-
-llxHeader();
-
-$textprevyear="<a href=\"quadri.php?year=" . ($year_current-1) . "\">".img_previous()."</a>";
-$textnextyear=" <a href=\"quadri.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
-
-print load_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
-
-
-echo '<table width="100%">';
-echo '<tr><td>';
-print load_fiche_titre($langs->trans("VATSummary"));
-echo '</td></tr>';
-
-echo '<tr>';
-
-print "<table class=\"noborder\" width=\"100%\">";
-print "<tr class=\"liste_titre\">";
-print "<td width=\"20%\">".$langs->trans("Year")." $year_current</td>";
-print "<td align=\"right\">".$langs->trans("Income")."</td>";
-print "<td align=\"right\">".$langs->trans("VATToPay")."</td>";
-print "<td align=\"right\">".$langs->trans("Invoices")."</td>";
-print "<td align=\"right\">".$langs->trans("Outcome")."</td>";
-print "<td align=\"right\">".$langs->trans("VATToCollect")."</td>";
-print "<td align=\"right\">".$langs->trans("Invoices")."</td>";
-print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
-print "</tr>\n";
-
-if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
-{
-	$y = $year_current;
-
-	$total = 0;  $subtotal = 0;
-	$i=0;
-	$subtot_coll_total = 0;
-	$subtot_coll_vat = 0;
-	$subtot_paye_total = 0;
-	$subtot_paye_vat = 0;
-	for ($q = 1 ; $q <= 4 ; $q++) {
-		print "<tr class=\"liste_titre\"><td colspan=\"8\">".$langs->trans("Quadri")." $q (".dol_print_date(dol_mktime(0,0,0,(($q-1)*3)+1,1,$y),"%b %Y").' - '.dol_print_date(dol_mktime(0,0,0,($q*3),1,$y),"%b %Y").")</td></tr>";
-		$var=true;
-
-		$x_coll = tva_coll($db, $y, $q);
-		$x_paye = tva_paye($db, $y, $q);
-		$x_both = array();
-		//now, from these two arrays, get another array with one rate per line
-		foreach(array_keys($x_coll) as $my_coll_rate){
-			$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
-			$x_both[$my_coll_rate]['coll']['vat'] = $x_coll[$my_coll_rate]['vat'];
-			$x_both[$my_coll_rate]['paye']['totalht'] = 0;
-			$x_both[$my_coll_rate]['paye']['vat'] = 0;
-			$x_both[$my_coll_rate]['coll']['links'] = '';
-			foreach($x_coll[$my_coll_rate]['facid'] as $id=>$dummy){
-				$x_both[$my_coll_rate]['coll']['links'] .= '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$x_coll[$my_coll_rate]['facid'][$id].'" title="'.$x_coll[$my_coll_rate]['facnum'][$id].'">..'.substr($x_coll[$my_coll_rate]['facnum'][$id],-2).'</a> ';
-			}
-		}
-		foreach(array_keys($x_paye) as $my_paye_rate){
-			$x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
-			$x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
-			if(!isset($x_both[$my_paye_rate]['coll']['totalht'])){
-				$x_both[$my_paye_rate]['coll']['total_ht'] = 0;
-				$x_both[$my_paye_rate]['coll']['vat'] = 0;
-			}
-			$x_both[$my_paye_rate]['paye']['links'] = '';
-			foreach($x_paye[$my_paye_rate]['facid'] as $id=>$dummy){
-				$x_both[$my_paye_rate]['paye']['links'] .= '<a href="../../fourn/facture/card.php?facid='.$x_paye[$my_paye_rate]['facid'][$id].'" title="'.$x_paye[$my_paye_rate]['facnum'][$id].'">..'.substr($x_paye[$my_paye_rate]['facnum'][$id],-2).'</a> ';
-			}
-		}
-		//now we have an array (x_both) indexed by rates for coll and paye
-
-		$x_coll_sum = 0;
-		$x_coll_ht = 0;
-		$x_paye_sum = 0;
-		$x_paye_ht = 0;
-		foreach($x_both as $rate => $both){
-
-			print '<tr class="oddeven">';
-			print "<td>$rate%</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($both['coll']['totalht'])."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($both['coll']['vat'])."</td>";
-			print "<td align=\"right\">".$both['coll']['links']."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($both['paye']['totalht'])."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($both['paye']['vat'])."</td>";
-			print "<td align=\"right\">".$both['paye']['links']."</td>";
-			print "<td></td>";
-			print "</tr>";
-			$x_coll_sum += $both['coll']['vat'];
-			$x_paye_sum += $both['paye']['vat'];
-			$subtot_coll_total 	+= $both['coll']['totalht'];
-			$subtot_coll_vat 	+= $both['coll']['vat'];
-			$subtot_paye_total 	+= $both['paye']['totalht'];
-			$subtot_paye_vat 	+= $both['paye']['vat'];
-		}
-
-		$diff = $x_coll_sum - $x_paye_sum;
-		$total = $total + $diff;
-		$subtotal = $subtotal + $diff;
-
-
-		print '<tr class="oddeven">';
-		print '<td colspan="7"></td>';
-		print "<td class=\"nowrap\" align=\"right\">".price($diff)."</td>\n";
-		print "</tr>\n";
-
-		$i++;
-	}
-	print '<tr class="liste_total">';
-	print '<td align="right">'.$langs->trans("Total").':</td>';
-	print '<td class="nowrap" align="right">'.price($subtot_coll_total).'</td>';
-	print '<td class="nowrap" align="right">'.price($subtot_coll_vat).'</td>';
-	print '<td></td>';
-	print '<td class="nowrap" align="right">'.price($subtot_paye_total).'</td>';
-	print '<td class="nowrap" align="right">'.price($subtot_paye_vat).'</td>';
-	print '<td></td>';
-	print '<td class="nowrap" align="right"><b>'.price($total).'</b>';
-	print '</td>';
-	print '</tr>';
-
-}
-else
-{
-	print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-	print '<tr><td colspan="5">'.$langs->trans("FeatureIsSupportedInInOutModeOnly").'</td></tr>';
-}
-
-print '</table>';
-echo '</td></tr>';
-echo '</table>';
-
-llxFooter();
-$db->close();
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 713cab1dc13..0866bafad0c 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -22,7 +22,7 @@
 /**
  *		\file       htdocs/compta/tva/quadri_detail.php
  *		\ingroup    tax
- *		\brief      Trimestrial page - detailed version
+ *		\brief      VAT by rate
  */
 
 require '../../main.inc.php';
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
@@ -55,10 +56,10 @@ $date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GE
 // Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$q=GETPOST("q");
+	$q=GETPOST("q","int");
 	if (empty($q))
 	{
-		if (GETPOST("month")) { $date_start=dol_get_first_day($year_start,GETPOST("month"),false); $date_end=dol_get_last_day($year_start,GETPOST("month"),false); }
+		if (GETPOST("month","int")) { $date_start=dol_get_first_day($year_start,GETPOST("month","int"),false); $date_end=dol_get_last_day($year_start,GETPOST("month","int"),false); }
 		else
 		{
 			$date_start=dol_get_first_day($year_start,empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START,false);
@@ -96,6 +97,16 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  * View
  */
 
+$form=new Form($db);
+$company_static=new Societe($db);
+$invoice_customer=new Facture($db);
+$invoice_supplier=new FactureFournisseur($db);
+$expensereport=new ExpenseReport($db);
+$product_static=new Product($db);
+$payment_static=new Paiement($db);
+$paymentfourn_static=new PaiementFourn($db);
+$paymentexpensereport_static=new PaymentExpenseReport($db);
+
 $morequerystring='';
 $listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
 foreach ($listofparams as $param)
@@ -105,16 +116,6 @@ foreach ($listofparams as $param)
 
 llxHeader('',$langs->trans("VATReport"),'','',0,0,'','',$morequerystring);
 
-$form=new Form($db);
-
-$company_static=new Societe($db);
-$invoice_customer=new Facture($db);
-$invoice_supplier=new FactureFournisseur($db);
-$expensereport=new ExpenseReport($db);
-$product_static=new Product($db);
-$payment_static=new Paiement($db);
-$paymentfourn_static=new PaiementFourn($db);
-$paymentexpensereport_static=new PaymentExpenseReport($db);
 
 //print load_fiche_titre($langs->trans("VAT"),"");
 
@@ -126,7 +127,7 @@ $fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
 
 
 // Show report header
-$name=$langs->trans("VATReportByPeriods");
+$name=$langs->trans("VATReportByRates");
 $calcmode='';
 if ($modetax == 0) $calcmode=$langs->trans('OptionVATDefault');
 if ($modetax == 1) $calcmode=$langs->trans('OptionVATDebitOption');
@@ -185,6 +186,7 @@ $vatcust=$langs->trans("VATReceived");
 $vatsup=$langs->trans("VATPaid");
 $vatexpensereport=$langs->trans("VATPaid");
 
+
 // VAT Received and paid
 print '<table class="noborder" width="100%">';
 
@@ -194,8 +196,8 @@ $i=0;
 $columns = 5;
 
 // Load arrays of datas
-$x_coll = tax_by_date('vat', $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
-$x_paye = tax_by_date('vat', $db, 0, 0, $date_start, $date_end, $modetax, 'buy');
+$x_coll = tax_by_rate('vat', $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
+$x_paye = tax_by_rate('vat', $db, 0, 0, $date_start, $date_end, $modetax, 'buy');
 
 if (! is_array($x_coll) || ! is_array($x_paye))
 {
@@ -362,14 +364,14 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 		if (is_array($x_both[$rate]['coll']['detail']))
 		{
 			// VAT Rate
-			$var=true;
 			print "<tr>";
 			print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.($span+1).'"></td>';
 			print '</tr>'."\n";
 
 			foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
 				// Define type
-				$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
 				// Try to enhance type detection using date_start and date_end for free lines where type
 				// was not saved.
 				if (!empty($fields['ddate_start'])) {
@@ -401,10 +403,10 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 				{
 					$product_static->id=$fields['pid'];
 					$product_static->ref=$fields['pref'];
-					$product_static->type=$fields['ptype'];
+					$product_static->type=$fields['dtype'];		// We force with the type of line to have type how line is registered
 					print $product_static->getNomUrl(1);
 					if (dol_string_nohtmltag($fields['descr'])) {
-						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
 					}
 				}
 				else
@@ -423,7 +425,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 							$fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
 						}
 					}
-					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
 
 					// Show range
 					print_date_range($fields['ddate_start'],$fields['ddate_end']);
@@ -503,7 +505,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 		print '</tr>';
 	}
 
-	if (count($x_coll) == 0)   // Show a total ine if nothing shown
+	if (count($x_coll) == 0)   // Show a total line if nothing shown
 	{
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
@@ -543,14 +545,14 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 
 		if (is_array($x_both[$rate]['paye']['detail']))
 		{
-			$var=true;
 			print "<tr>";
 			print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.($span+1).'"></td>';
 			print '</tr>'."\n";
 
 			foreach ($x_both[$rate]['paye']['detail'] as $index=>$fields) {
 				// Define type
-				$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
 				// Try to enhance type detection using date_start and date_end for free lines where type
 				// was not saved.
 				if (!empty($fields['ddate_start'])) {
@@ -582,10 +584,10 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 				{
 					$product_static->id=$fields['pid'];
 					$product_static->ref=$fields['pref'];
-					$product_static->type=$fields['ptype'];
+					$product_static->type=$fields['dtype'];		// We force with the type of line to have type how line is registered
 					print $product_static->getNomUrl(1);
 					if (dol_string_nohtmltag($fields['descr'])) {
-						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
 					}
 				}
 				else
@@ -595,7 +597,16 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 					} else {
 						$text = img_object($langs->trans('Product'),'product');
 					}
-					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+					if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg)) {
+						if ($reg[1]=='DEPOSIT') {
+							$fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+						} elseif ($reg[1]=='CREDIT_NOTE') {
+							$fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+						} else {
+							$fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+						}
+					}
+					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
 
 					// Show range
 					print_date_range($fields['ddate_start'],$fields['ddate_end']);
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 560acabaee9..bb67f0f183d 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -686,7 +686,7 @@ else
             $parameters=array('socid' => $socid, 'objsoc' => $objsoc, 'colspan' => ' colspan="3"', 'cols' => 3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            if (empty($reshook))
             {
             	print $object->showOptionals($extrafields,'edit');
             }
@@ -963,7 +963,7 @@ else
             $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            if (empty($reshook))
             {
             	print $object->showOptionals($extrafields,'edit');
             }
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 83ad411b4b6..5053e07212f 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -342,6 +342,7 @@ class Contact extends CommonObject
 		$sql .= ", email='".$this->db->escape($this->email)."'";
 		$sql .= ", skype='".$this->db->escape($this->skype)."'";
 		$sql .= ", photo='".$this->db->escape($this->photo)."'";
+		$sql .= ", birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
 		$sql .= ", note_private = ".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
 		$sql .= ", note_public = ".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
 		$sql .= ", phone = ".(isset($this->phone_pro)?"'".$this->db->escape($this->phone_pro)."'":"null");
@@ -366,11 +367,8 @@ class Contact extends CommonObject
 
 		    $action='update';
 
-		    // Actions on extra fields (by external module or standard code)
-		    $hookmanager->initHooks(array('contactdao'));
-		    $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))
+		    // Actions on extra fields
+		    if (! $error)
 		    {
 		    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 		    	{
@@ -381,7 +379,6 @@ class Contact extends CommonObject
 		    		}
 		    	}
 		    }
-		    else if ($reshook < 0) $error++;
 
 			if (! $error && $this->user_id > 0)
 			{
@@ -588,8 +585,8 @@ class Contact extends CommonObject
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
-            $error++;
-		    $this->error=$this->db->lasterror();
+			$error++;
+			$this->error=$this->db->lasterror();
 		}
 
 		// Mis a jour alerte birthday
@@ -690,7 +687,10 @@ class Contact extends CommonObject
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
 		if ($id) $sql.= " WHERE c.rowid = ". $id;
-		elseif ($ref_ext) $sql .= " WHERE c.ref_ext = '".$this->db->escape($ref_ext)."'";
+		elseif ($ref_ext) {
+			$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
+			$sql .= " AND c.ref_ext = '".$this->db->escape($ref_ext)."'";
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 281924cb589..2d729d8ebb4 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -153,7 +153,7 @@ if ($object->id)
     print '</td></tr>';
 
     print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 5c101401dac..8719c77f1b4 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -7,7 +7,8 @@
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2018       Nicolas ZABOURI          <info@inovea-conseil.com>
+ * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2018       Juanjo Menent			<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -259,7 +260,7 @@ if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_conta
 if (! empty($search_categ_thirdparty)) $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 (! empty($search_categ_supplier)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc";       // We need this table joined to the select in order to filter by categ
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-$sql.= ' WHERE p.entity IN ('.getEntity('societe').')';
+$sql.= ' WHERE p.entity IN ('.getEntity('socpeople').')';
 if (!$user->rights->societe->client->voir && !$socid) //restriction
 {
 	$sql .= " AND (sc.fk_user = " .$user->id." OR p.fk_soc IS NULL)";
@@ -303,6 +304,7 @@ if (strlen($search_phone_mobile))   $sql.= natural_search('p.phone_mobile', $sea
 if (strlen($search_fax))            $sql.= natural_search('p.fax', $search_fax);
 if (strlen($search_skype))          $sql.= natural_search('p.skype', $search_skype);
 if (strlen($search_email))          $sql.= natural_search('p.email', $search_email);
+if (strlen($search_zip))   			$sql.= natural_search("p.zip",$search_zip);
 if ($search_status != '' && $search_status >= 0) $sql.= " AND p.statut = ".$db->escape($search_status);
 if ($search_import_key)             $sql.= natural_search("p.import_key",$search_import_key);
 if ($type == "o")        // filtre sur type
@@ -347,6 +349,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -415,7 +422,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 $newcardbutton='';
 if ($user->rights->societe->contact->creer)
 {
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/contact/card.php?action=create">'.$langs->trans('NewContactAddress').'</a>';
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/contact/card.php?action=create">'.$langs->trans('NewContactAddress');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 3fb55acc2ca..a33d020d74d 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2018	Philippe Grand			<philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,9 +31,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
-$langs->load("companies");
-$langs->load("admin");
-$langs->load("contracts");
+// Load traductions files requiredby by page
+$langs->loadLangs(array("companies","admin","contracts"));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 41cf0c12f3e..d474da18a85 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -46,12 +46,7 @@ if (! empty($conf->projet->enabled)) {
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 
-$langs->load("contracts");
-$langs->load("orders");
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("products");
-$langs->load('compta');
+$langs->loadLangs(array("contracts","orders","companies","bills","products",'compta'));
 
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
@@ -1287,7 +1282,7 @@ if ($action == 'create')
 	print $hookmanager->resPrint;
 
 	// Other attributes
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
@@ -1554,6 +1549,7 @@ else
 			print '<input type="hidden" name="fournprice" value="'.(!empty($object->lines[$cursorline-1]->fk_fournprice) ? $object->lines[$cursorline-1]->fk_fournprice : 0).'">';
 
 			// Area with common detail of line
+			print '<div class="div-table-responsive-no-min">';
 			print '<table class="notopnoleftnoright allwidth tableforservicepart1" width="100%">';
 
 			$sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.product_type, cd.description, cd.price_ht, cd.qty,";
@@ -1592,7 +1588,7 @@ else
 
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
 				{
-					print '<tr '.$bcnd[$var].' class="tdtop">';
+					print '<tr class="tdtop oddeven">';
 					// Label
 					if ($objp->fk_product > 0)
 					{
@@ -1688,7 +1684,7 @@ else
 							$colspan = 7;
 						}
 
-						print '<tr '.$bcnd[$var].'>';
+						print '<tr class="oddeven">';
 						print '<td colspan="'.$colspan.'">';
 
 						// Date planned
@@ -1725,14 +1721,14 @@ else
 					if (is_array($extralabelslines) && count($extralabelslines)>0) {
 						$line = new ContratLigne($db);
 						$line->fetch_optionals($objp->rowid);
-						print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bcnd[$var], 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+						print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 					}
 				}
 				// Ligne en mode update
 				else
 				{
 					// Ligne carac
-					print "<tr ".$bcnd[$var].">";
+					print '<tr class="oddeven">';
 					print '<td>';
 					if ($objp->fk_product)
 					{
@@ -1781,13 +1777,13 @@ else
 					print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 					print '</td>';
 					print '</tr>';
-					
+
 					$colspan=6;
 					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
 					if($conf->global->PRODUCT_USE_UNITS) $colspan++;
 
 					// Ligne dates prevues
-					print "<tr ".$bcnd[$var].">";
+					print '<tr class="oddeven">';
 					print '<td colspan="'.$colspan.'">';
 					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");
@@ -1799,7 +1795,7 @@ else
 					if (is_array($extralabelslines) && count($extralabelslines)>0) {
 						$line = new ContratLigne($db);
 						$line->fetch_optionals($objp->rowid);
-						print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+						print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 					}
 				}
 
@@ -1812,12 +1808,13 @@ else
 
 			if ($object->statut > 0)
 			{
-				print '<tr '.$bcnd[$var].'>';
+				print '<tr class="oddeven">';
 				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled?7:6).'"><hr class="opacitymedium tdhrthin"></td>';
 				print "</tr>\n";
 			}
 
 			print "</table>";
+			print '</div>';
 
 			print "</form>\n";
 
@@ -1889,7 +1886,7 @@ else
 			{
 				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
 
-				print '<tr '.$bcnd[$var].'>';
+				print '<tr class="oddeven">';
 				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
 				print '<td width="30" align="right">';
 				if ($user->societe_id == 0)
@@ -1916,7 +1913,7 @@ else
 				print '</td>';
 				print "</tr>\n";
 
-				print '<tr '.$bcnd[$var].'>';
+				print '<tr class="oddeven">';
 
 				print '<td>';
 				// Si pas encore active
@@ -1972,7 +1969,7 @@ else
 					}
 				}
 
-				print '<tr '.$bc[false].'>';
+				print '<tr class="oddeven">';
 				print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
 				print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active",1,0,1);
 				print '</td>';
@@ -1984,7 +1981,7 @@ else
 
 				print '</tr>';
 
-				print '<tr '.$bc[false].'>';
+				print '<tr class="oddeven">';
 				print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td>';
 				print '<td class="nohover right">';
 				print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"> &nbsp; ';
@@ -2029,7 +2026,7 @@ else
 				$now=dol_now();
 				if ($dateactend > $now) $dateactend=$now;
 
-				print '<tr '.$bc[false].'><td colspan="2" class="nohover">';
+				print '<tr class="oddeven"><td colspan="2" class="nohover">';
 				if ($objp->statut >= 4)
 				{
 					if ($objp->statut == 4)
@@ -2042,7 +2039,7 @@ else
 				print '<td class="center nohover">';
 				print '</td></tr>';
 
-				print '<tr '.$bc[false].'>';
+				print '<tr class="oddeven">';
 				print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.dol_escape_htmltag(GETPOST('comment', 'alpha')).'"></td>';
 				print '<td class="nohover right">';
 				print '<input type="submit" class="button" name="close" value="'.$langs->trans("Disable").'"> &nbsp; ';
@@ -2082,8 +2079,6 @@ else
 			// Form to add new line
 	   		if ($action != 'editline')
 			{
-				$var = true;
-
 				$forcetoshowtitlelines=1;
 
 				// Add free products/services
@@ -2136,7 +2131,7 @@ else
 					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
 				}
 
-				if (! empty($conf->facture->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
+				if (! empty($conf->facture->enabled) && $object->statut > 0)
 				{
 					$langs->load("bills");
 					if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
@@ -2205,7 +2200,6 @@ else
 			$genallowed = $user->rights->contrat->lire;
 			$delallowed = $user->rights->contrat->creer;
 
-			$var = true;
 
 			print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 689b0465fd4..1bb17eb4352 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -182,7 +182,7 @@ class Contracts extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int     ID of contrat
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->contrat->creer) {
 			  throw new RestException(401, "Insuffisant rights");
@@ -247,7 +247,7 @@ class Contracts extends DolibarrApi
      *
      * @return int
      */
-    function postLine($id, $request_data = NULL) {
+    function postLine($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->contrat->creer) {
 		  	throw new RestException(401);
 		  }
@@ -300,7 +300,7 @@ class Contracts extends DolibarrApi
      *
      * @return object
      */
-    function putLine($id, $lineid, $request_data = NULL) {
+    function putLine($id, $lineid, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->contrat->creer) {
 		  	throw new RestException(401);
 		  }
@@ -359,7 +359,7 @@ class Contracts extends DolibarrApi
      *
      * @return object
      */
-    function activateLine($id, $lineid, $datestart, $dateend = NULL, $comment = NULL) {
+    function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null) {
     	if(! DolibarrApiAccess::$user->rights->contrat->creer) {
     		throw new RestException(401);
     	}
@@ -396,7 +396,7 @@ class Contracts extends DolibarrApi
      *
      * @return object
      */
-    function unactivateLine($id, $lineid, $datestart, $comment = NULL) {
+    function unactivateLine($id, $lineid, $datestart, $comment = null) {
     	if(! DolibarrApiAccess::$user->rights->contrat->creer) {
     		throw new RestException(401);
     	}
@@ -470,7 +470,7 @@ class Contracts extends DolibarrApi
      *
      * @return int
      */
-    function put($id, $request_data = NULL) {
+    function put($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->contrat->creer) {
 		  	throw new RestException(401);
 		  }
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 215dc185ac4..8e6f6af33ce 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -237,7 +237,13 @@ class Contrat extends CommonObject
 	 */
 	function active_line($user, $line_id, $date, $date_end='', $comment='')
 	{
-		return $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
+		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
+		if ($result < 0)
+		{
+			$this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
+			$this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
+		}
+		return $result;
 	}
 
 
@@ -252,7 +258,13 @@ class Contrat extends CommonObject
 	 */
 	function close_line($user, $line_id, $date_end, $comment='')
 	{
-		return $this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
+		$result=$this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
+		if ($result < 0)
+		{
+			$this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
+			$this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
+		}
+		return $result;
 	}
 
 
@@ -767,17 +779,7 @@ class Contrat extends CommonObject
 				$line->fk_user_cloture  = $objp->fk_user_cloture;
 				$line->fk_unit           = $objp->fk_unit;
 
-				$line->ref				= $objp->product_ref;						// deprecated
-				if (empty($objp->fk_product))
-				{
-					$line->label			= '';         			// deprecated
-					$line->libelle 			= $objp->description;	// deprecated
-				}
-				else
-				{
-					$line->label			= $objp->product_label;         			// deprecated
-					$line->libelle			= $objp->product_label;         		// deprecated
-				}
+				$line->ref				= $objp->product_ref;	// deprecated
 				$line->product_ref		= $objp->product_ref;   // Ref product
 				$line->product_desc		= $objp->product_desc;  // Description product
 				$line->product_label	= $objp->product_label; // Label product
@@ -2459,12 +2461,15 @@ class ContratLigne extends CommonObjectLine
 	var $fk_contrat;
 	var $fk_product;
 	var $statut;					// 0 inactive, 4 active, 5 closed
-	var $type;                     // 0 for product, 1 for service
+	var $type;						// 0 for product, 1 for service
+	/**
+	 * @var string
+	 * @deprecated
+	 */
 	var $label;
 	/**
 	 * @var string
-	 * @deprecated Use $label instead
-	 * @see label
+	 * @deprecated
 	 */
 	public $libelle;
 
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 4bc2747a829..53125f3063b 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -181,7 +181,7 @@ if ($object->id)
 
     print '<table class="border" width="100%">';
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index b1755b7f7ec..61d62896cf1 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015	   Claudio Aschieri		<c.aschieri@19.coop>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2016      Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2016-2018 Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -301,6 +301,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit + 1, $offset);
@@ -372,7 +377,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 $newcardbutton='';
 if ($user->rights->contrat->creer)
 {
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create">'.$langs->trans('NewContractSubscription').'</a>';
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create">'.$langs->trans('NewContractSubscription');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
@@ -512,11 +519,11 @@ if (! empty($arrayfields['c.date_contrat']['checked']))
 	// Date contract
 	print '<td class="liste_titre center nowraponall">';
 	//print $langs->trans('Month').': ';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.$day.'">';
+	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.$month.'">';
 	//print '&nbsp;'.$langs->trans('Year').': ';
 	$syear = $year;
-	print $formother->selectyear($syear,'year',1, 20, 5, 0, 0, '', 'widthauto');
+	print $formother->selectyear($syear,'year',1, 20, 5);
 	print '</td>';
 }
 // Extra fields
@@ -577,7 +584,7 @@ if (! empty($arrayfields['c.date_contrat']['checked']))      print_liste_field_t
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (! empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index f78ed639804..0fc475c19fb 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2018      Ferran Marcet		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -204,6 +205,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk
 $sql.= " cd.date_ouverture_prevue,";
 $sql.= " cd.date_ouverture,";
 $sql.= " cd.date_fin_validite,";
+$sql.= " cd.date_cloture,";
 $sql.= " cd.qty,";
 $sql.= " cd.total_ht,";
 $sql.= " cd.total_tva,";
@@ -255,6 +257,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -382,7 +389,7 @@ if (! empty($arrayfields['cd.date_cloture']['checked'])) print_liste_field_titre
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (! empty($arrayfields['cd.datec']['checked']))  print_liste_field_titre($arrayfields['cd.datec']['label'],$_SERVER["PHP_SELF"],"cd.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
@@ -525,7 +532,9 @@ print "</tr>\n";
 $contractstatic=new Contrat($db);
 $productstatic=new Product($db);
 
-$var=True; $i=0;
+$var=true;
+$i=0;
+$totalarray=array();
 while ($i < min($num,$limit))
 {
 	$obj = $db->fetch_object($resql);
@@ -542,6 +551,7 @@ while ($i < min($num,$limit))
 		print '<td>';
 		print $contractstatic->getNomUrl(1,16);
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Service
 	if (! empty($arrayfields['p.description']['checked']))
@@ -563,6 +573,7 @@ while ($i < min($num,$limit))
 			if ($obj->type == 1) print img_object($obj->description,'service').' '.dol_trunc($obj->description,24);
 		}
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 
 	if (! empty($arrayfields['cd.qty']['checked']))
@@ -570,30 +581,45 @@ while ($i < min($num,$limit))
 		print '<td>';
 		print $obj->qty;
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	if (! empty($arrayfields['cd.total_ht']['checked']))
 	{
-		print '<td>';
+		print '<td align="right">';
 		print price($obj->total_ht);
 		print '</td>';
-	}
+		$totalarray['totalht'] += $obj->total_ht;
+        if (! $i) {
+            $totalarray['displaytotalline']++;
+            $totalarray['nbfield']++;
+            $totalarray['totalhtfield']=$totalarray['nbfield'];
+        }
+    }
 	if (! empty($arrayfields['cd.total_tva']['checked']))
 	{
-		print '<td>';
+		print '<td align="right">';
 		print price($obj->total_tva);
 		print '</td>';
-	}
+        $totalarray['totalvat'] += $obj->total_tva;
+        if (! $i) {
+            $totalarray['nbfield']++;
+            $totalarray['totalvatfield']=$totalarray['nbfield'];
+            $totalarray['displaytotalline']++;
+        }
+    }
 	if (! empty($arrayfields['cd.tva_tx']['checked']))
 	{
-		print '<td>';
+		print '<td align="right">';
 		print price2num($obj->tva_tx).'%';
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	if (! empty($arrayfields['cd.subprice']['checked']))
 	{
-		print '<td>';
+		print '<td align="right">';
 		print price($obj->subprice);
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 
 
@@ -606,26 +632,29 @@ while ($i < min($num,$limit))
 		$companystatic->client=1;
 		print $companystatic->getNomUrl(1,'customer',28);
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 
 	// Start date
 	if (! empty($arrayfields['cd.date_ouverture_prevue']['checked']))
 	{
 		print '<td align="center">';
-		print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue)):'&nbsp;');
+		print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour'):'&nbsp;');
 		if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0)
 		print ' '.img_picto($langs->trans("Late"),"warning");
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	if (! empty($arrayfields['cd.date_ouverture']['checked']))
 	{
-		print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture)):'&nbsp;').'</td>';
+		print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour'):'&nbsp;').'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// End date
 	if (! empty($arrayfields['cd.date_fin_validite']['checked']))
 	{
-		print '<td align="center">'.($obj->date_fin_validite?dol_print_date($db->jdate($obj->date_fin_validite)):'&nbsp;');
+		print '<td align="center">'.($obj->date_fin_validite?dol_print_date($db->jdate($obj->date_fin_validite), 'dayhour'):'&nbsp;');
 		if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5)
 		{
 			$warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
@@ -634,10 +663,13 @@ while ($i < min($num,$limit))
 		}
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
+	// Close date (real end date)
 	if (! empty($arrayfields['cd.date_cloture']['checked']))
 	{
-		print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture)).'</td>';
+		print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 
 	// Extra fields
@@ -675,6 +707,7 @@ while ($i < min($num,$limit))
 		   print $staticcontratligne->LibStatut($obj->statut,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now)?1:0);
 	   }
 	   print '</td>';
+       if (! $i) $totalarray['nbfield']++;
 	}
 	// Action column
 	print '<td class="nowrap" align="center">';
@@ -690,6 +723,25 @@ while ($i < min($num,$limit))
 	print "</tr>\n";
 	$i++;
 }
+
+// Show total line
+if (isset($totalarray['displaytotalline'])) {
+	print '<tr class="liste_total">';
+	$i=0;
+	while ($i < $totalarray['nbfield']) {
+		$i++;
+		if ($i == 1) {
+			if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
+			else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+		}
+		elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
+		elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+		elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+		else print '<td></td>';
+	}
+	print '</tr>';
+}
+
 $db->free($resql);
 
 $parameters=array('sql' => $sql);
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index b8ede4d7d14..394680f4d8e 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -28,6 +28,7 @@
 // $permissiontodelete must be defined
 // $backurlforlist must be defined
 // $backtopage may be defined
+// $triggermodname may be defined
 
 if ($cancel)
 {
@@ -47,13 +48,22 @@ if ($action == 'add' && ! empty($permissiontoadd))
 		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
 
 		// Set value to insert
-		if (in_array($object->fields[$key]['type'], array('text', 'html'))) $value = GETPOST($key,'none');
-		else $value = GETPOST($key,'alpha');
+		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
+			$value = GETPOST($key,'none');
+		} elseif ($object->fields[$key]['type']=='date') {
+			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+		} elseif ($object->fields[$key]['type']=='datetime') {
+			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+		} elseif ($object->fields[$key]['type']=='price') {
+			$value = price2num(GETPOST($key));
+		} else {
+			$value = GETPOST($key,'alpha');
+		}
 		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
 		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
 
 		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '')
+		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
@@ -66,7 +76,7 @@ if ($action == 'add' && ! empty($permissiontoadd))
 		if ($result > 0)
 		{
 			// Creation OK
-			$urltogo=$backtopage?$backtopage:$backurlforlist;
+			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
 			header("Location: ".$urltogo);
 			exit;
 		}
@@ -95,11 +105,12 @@ if ($action == 'update' && ! empty($permissiontoadd))
 		// Set value to update
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
 			$value = GETPOST($key,'none');
-		}
-		elseif ($object->fields[$key]['type']=='date') {
+		} elseif ($object->fields[$key]['type']=='date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
 		} elseif ($object->fields[$key]['type']=='datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+		} elseif ($object->fields[$key]['type']=='price') {
+			$value = price2num(GETPOST($key));
 		} else {
 			$value = GETPOST($key,'alpha');
 		}
@@ -107,7 +118,7 @@ if ($action == 'update' && ! empty($permissiontoadd))
 		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
 
 		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '')
+		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
@@ -124,8 +135,7 @@ if ($action == 'update' && ! empty($permissiontoadd))
 		else
 		{
 			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 			$action='edit';
 		}
 	}
@@ -135,6 +145,27 @@ if ($action == 'update' && ! empty($permissiontoadd))
 	}
 }
 
+// Action to update one extrafield
+if ($action == "update_extras" && ! empty($permissiontoadd))
+{
+	$object->fetch(GETPOST('id','int'));
+	$attributekey = GETPOST('attribute','alpha');
+	$attributekeylong = 'options_'.$attributekey;
+	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
+
+	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+	if ($result > 0)
+	{
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+		$action = 'view';
+	}
+	else
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = 'edit_extras';
+	}
+}
+
 // Action to delete
 if ($action == 'confirm_delete' && ! empty($permissiontodelete))
 {
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 9a9298528eb..371dd75a8e2 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -357,6 +357,14 @@ if (! $error && $massaction == 'confirm_presend')
 					$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 
 					$parameters=array('mode'=>'formemail');
+
+					if ( ! empty( $listofobjectthirdparties ) ) {
+						$parameters['listofobjectthirdparties'] = $listofobjectthirdparties;
+					}
+					if ( ! empty( $listofobjectref ) ) {
+						$parameters['listofobjectref'] = $listofobjectref;
+					}
+
 					complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
 
 					$subject=make_substitutions($subject, $substitutionarray);
@@ -728,6 +736,56 @@ if ($massaction == 'confirm_createbills')
 	}
 }
 
+if (!$error && $massaction == 'cancelorders')
+{
+
+	$db->begin();
+
+	$nbok = 0;
+
+
+	$orders = GETPOST('toselect', 'array');
+	foreach ($orders as $id_order)
+	{
+
+		$cmd = new Commande($db);
+		if ($cmd->fetch($id_order) <= 0)
+			continue;
+
+		if ($cmd->statut != Commande::STATUS_VALIDATED)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
+			$error++;
+			break;
+		}
+		else
+			$result = $cmd->cancel();
+
+		if ($result < 0)
+		{
+			setEventMessages($cmd->error, $cmd->errors, 'errors');
+			$error++;
+			break;
+		}
+		else
+			$nbok++;
+	}
+	if (!$error)
+	{
+		if ($nbok > 1)
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		else
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		$db->commit();
+	}
+	else
+	{
+		$db->rollback();
+	}
+}
+
+
 if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_search'))
 {
 	if (empty($diroutputmassaction))
@@ -1021,24 +1079,23 @@ if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm ==
 		$result=$objecttmp->fetch($toselectid);
 		if ($result > 0)
 		{
-			// Refuse deletion for some status ?
-			/*
-       		if ($objectclass == 'Facture' && $objecttmp->status == Facture::STATUS_DRAFT)
-       		{
-       			$langs->load("errors");
-       			$nbignored++;
-       			$resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction',$objecttmp->ref).'</div><br>';
-       			continue;
-       		}*/
+			// Refuse deletion for some objects/status
+			if ($objectclass == 'Facture' && empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $objecttmp->status != Facture::STATUS_DRAFT)
+			{
+				$langs->load("errors");
+				$nbignored++;
+				$resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction',$objecttmp->ref).'</div><br>';
+				continue;
+			}
 
-			if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
+			if (in_array($objecttmp->element, array('societe', 'member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
 			else $result = $objecttmp->delete($user);
 
 			if ($result <= 0)
 			{
-				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-				$error++;
-				break;
+			    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			    $error++;
+			    break;
 			}
 			else $nbok++;
 		}
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 8f7ee1287fe..18a236056b9 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -23,8 +23,8 @@
 
 // $mysoc must be defined
 // $id must be defined
-// $paramname must be defined
-// $mode must be defined (used to know the automatic BCC to add)
+// $paramname may be defined
+// $autocopy may be defined (used to know the automatic BCC to add)
 // $trigger_name must be set (can be '')
 // $actiontypecode can be set
 // $object and $uobject may be defined
@@ -129,38 +129,14 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		{
 			$thirdparty=$object;
 			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-			elseif (! empty($conf->dolimail->enabled))
-			{
-				$dolimail = new Dolimail($db);
-				$possibleaccounts=$dolimail->get_societe_by_email($_POST['sendto'],"1");
-				$possibleuser=$dolimail->get_from_user_by_mail($_POST['sendto'],"1"); // suche in llx_societe and socpeople
-				if (!$possibleaccounts && !$possibleuser)
-				{
-					setEventMessages($langs->trans('ErrorFailedToFindSocieteRecord',$_POST['sendto']), null, 'errors');
-				}
-				elseif (count($possibleaccounts)>1)
-				{
-					$sendtosocid=$possibleaccounts[1]['id'];
-					$result=$object->fetch($sendtosocid);
-
-					setEventMessages($langs->trans('ErrorFoundMoreThanOneRecordWithEmail',$_POST['sendto'],$object->name), null, 'mesgs');
-				}
-				else
-				{
-					if($possibleaccounts){
-						$sendtosocid=$possibleaccounts[1]['id'];
-						$result=$object->fetch($sendtosocid);
-					}elseif($possibleuser){
-						$sendtosocid=$possibleuser[0]['id'];
-
-						$result=$uobject->fetch($sendtosocid);
-						$object=$uobject;
-					}
-
-				}
-			}
 		}
 		else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
+
+		if (is_object($hookmanager))
+		{
+			$parameters=array();
+			$reshook=$hookmanager->executeHooks('initSendToSocid',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		}
 	}
 	else $thirdparty = $mysoc;
 
@@ -170,6 +146,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		$sendtocc='';
 		$sendtobcc='';
 		$sendtoid = array();
+		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+			$sendtouserid=array();
+		}
 
 		// Define $sendto
 		$receiver=$_POST['receiver'];
@@ -191,7 +170,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
 				{
-					$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
+					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
 				elseif ($val)	// Id du contact
 				{
@@ -200,6 +179,18 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				}
 			}
 		}
+		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+			$receiveruser=$_POST['receiveruser'];
+			if (is_array($receiveruser) && count($receiveruser)>0)
+			{
+				$fuserdest = new User($db);
+				foreach($receiveruser as $key=>$val)
+				{
+					$tmparray[] = $fuserdest->user_get_property($key,'email');
+					$sendtouserid[] = $key;
+				}
+			}
+		}
 		$sendto=implode(',',$tmparray);
 
 		// Define $sendtocc
@@ -221,7 +212,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
 				{
-					$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
+					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
 				elseif ($val)	// Id du contact
 				{
@@ -230,6 +221,19 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				}
 			}
 		}
+		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+			$receiveruser=$_POST['receiveccruser'];
+
+			if (is_array($receiveruser) && count($receiveruser)>0)
+			{
+				$fuserdest = new User($db);
+				foreach($receiveruser as $key=>$val)
+				{
+					$tmparray[] = $fuserdest->user_get_property($key,'email');
+					$sendtouserid[] = $key;
+				}
+			}
+		}
 		$sendtocc=implode(',',$tmparray);
 
 		if (dol_strlen($sendto))
@@ -245,13 +249,13 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 			$fromtype = GETPOST('fromtype','alpha');
 			if ($fromtype === 'robot') {
-				$from = $conf->global->MAIN_MAIL_EMAIL_FROM .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
+				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
 			}
 			elseif ($fromtype === 'user') {
-				$from = $user->getFullName($langs) .' <'.$user->email.'>';
+				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
 			}
 			elseif ($fromtype === 'company') {
-				$from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
 			}
 			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp=explode(',', $user->email_aliases);
@@ -267,14 +271,14 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				$obj = $db->fetch_object($resql);
 				if ($obj)
 				{
-					$from = $obj->label.' <'.$obj->email.'>';
+					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
 			}
 			else {
-				$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
+				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
 			}
 
-			$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
+			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")). ' <' . $_POST['replytomail'].'>';
 			$message = GETPOST('message','none');
 			$subject = GETPOST('subject','none');
 
@@ -343,9 +347,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						if (!$folder) $folder = "Sent";	// Default Sent folder
 
 						$mailboxconfig->mbox = imap_open($mailboxconfig->get_connector_url().$folder, $mailboxconfig->mailbox_imap_login, $mailboxconfig->mailbox_imap_password);
-						if (FALSE === $mailboxconfig->mbox)
+						if (false === $mailboxconfig->mbox)
 						{
-							$info = FALSE;
+							$info = false;
 							$err = $langs->trans('Error3_Imap_Connection_Error');
 							setEventMessages($err,$mailboxconfig->element, null, 'errors');
 						}
@@ -430,6 +434,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						if (is_array($attachedfiles) && count($attachedfiles)>0) {
 							$object->attachedfiles	= $attachedfiles;
 						}
+						if (is_array($sendtouserid) && count($sendtouserid)>0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+							$object->sendtouserid	= $sendtouserid;
+						}
 
 						// Call of triggers
 						if (! empty($trigger_name))
@@ -448,10 +455,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
 					setEventMessages($mesg, null, 'mesgs');
 
-					$moreparam='';
-					if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
-					header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
-					exit;
+  					$moreparam='';
+	  				if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
+		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
+			  		exit;
 				}
 				else
 				{
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index eadce1dc74c..03ff1491e49 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -31,13 +31,13 @@ if ($action == 'update' && is_array($arrayofparameters))
 {
 	$db->begin();
 
-	$ok=True;
+	$ok=true;
 	foreach($arrayofparameters as $key => $val)
 	{
 		$result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity);
 		if ($result < 0)
 		{
-			$ok=False;
+			$ok=false;
 			break;
 		}
 	}
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index 612f38bb05b..f6bd5b5214a 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -26,8 +26,6 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
@@ -70,7 +68,7 @@ if ($boxorder && $zone != '' &&  $userid > 0)
 	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
 	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
-	if ($result > 0) 
+	if ($result > 0)
 	{
 	    $langs->load("boxes");
 	    if (! GETPOST('closing'))
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index f79753260d7..9e9f8a0d799 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -26,7 +26,6 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
index 1c7c7a56e4b..b03b9f128cf 100644
--- a/htdocs/core/ajax/contacts.php
+++ b/htdocs/core/ajax/contacts.php
@@ -23,10 +23,7 @@
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index f8a636e52a5..908c1ef9f11 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -25,7 +25,6 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 include '../../main.inc.php';
 
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index 6eb4d5836b8..9405aa26cf1 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -21,16 +21,10 @@
  *       \brief      File to return Ajax response on file upload
  */
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
 
 
 require '../../main.inc.php';
diff --git a/htdocs/core/ajax/getaccountcurrency.php b/htdocs/core/ajax/getaccountcurrency.php
index 40e52672c0e..2289d8e1c0f 100644
--- a/htdocs/core/ajax/getaccountcurrency.php
+++ b/htdocs/core/ajax/getaccountcurrency.php
@@ -22,10 +22,7 @@
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index 7e9e541c768..099f66ba3de 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -22,10 +22,8 @@
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
diff --git a/htdocs/core/ajax/price.php b/htdocs/core/ajax/price.php
index d4a101fb497..577f659b2cc 100644
--- a/htdocs/core/ajax/price.php
+++ b/htdocs/core/ajax/price.php
@@ -22,10 +22,8 @@
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require('../../main.inc.php');
 
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index 4fe31ee7ae8..98f18df8a68 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -28,7 +28,6 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');  // Disable "main.inc.php" hooks
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 61c2dca675b..7070d1a8799 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -22,10 +22,8 @@
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index cc7335618d0..fa1ce2103d4 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -27,7 +27,6 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
 
 require '../../main.inc.php';
 
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 1bc527ff555..57483848c4e 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -27,10 +27,9 @@
 if (! isset($usedbyinclude) || empty($usedbyinclude))
 {
     if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-    //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
-    if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-    if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-    if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+    if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+    if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+    if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
     if (! defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN','1');
 
     $res=@include '../../main.inc.php';
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index ac9691bfa25..3826e521d06 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -22,10 +22,7 @@
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 936d269f82a..a8dc7f1231d 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -85,7 +85,7 @@ class box_contacts extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE sp.entity IN (".getEntity('societe').")";
+			$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
 			$sql.= " ORDER BY sp.tms DESC";
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index d665d70da56..abbdc7b7c71 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -222,13 +222,14 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow.='<input type="hidden" name="page_y" value="">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
 				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfBillsByMonth");
 				$stringtoshow.=' &nbsp; ';
 				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input class="reposition inline-block valigntextbottom" type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index efd7de41e5a..53d9ce08059 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -219,13 +219,14 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow.='<input type="hidden" name="page_y" value="">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
 				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfBillsByMonth");
 				$stringtoshow.=' &nbsp; ';
 				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" class="inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 699f2db902b..05a0ff498ec 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -218,13 +218,14 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow.='<input type="hidden" name="page_y" value="">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
 				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfOrdersByMonth");
 				$stringtoshow.=' &nbsp; ';
 				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfOrdersByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index f49f38c1228..e88ed46be72 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -217,13 +217,14 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow.='<input type="hidden" name="page_y" value="">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
 				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfOrdersByMonth");
 				$stringtoshow.=' &nbsp; ';
 				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfOrdersByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 69a09e8aad2..39a7a3984d2 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -338,6 +338,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
 			$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 			$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+			$stringtoshow.='<input type="hidden" name="page_y" value="">';
 			$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
 			if (! empty($conf->facture->enabled) || ! empty($user->rights->facture->lire))
 			{
@@ -355,7 +356,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 			$stringtoshow.='<br>';
 			$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
-			$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto('','refresh.png','','',1).'">';
+			$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto('','refresh.png','','',1).'">';
 			$stringtoshow.='</form>';
 			$stringtoshow.='</div>';
 
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 50e3cbe9bf8..bddf4a27e64 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -219,13 +219,14 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$stringtoshow.='<div class="center hideobject divboxfilter" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow.='<input type="hidden" name="page_y" value="">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
 				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfProposalsByMonth");
 				$stringtoshow.=' &nbsp; ';
 				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfProposalsByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index dc20e9b9665..895f411e3d6 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2004-2006 Destailleur Laurent  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
@@ -83,7 +82,7 @@ class box_supplier_orders extends ModeleBoxes
             $sql = "SELECT s.nom as name, s.rowid as socid,";
             $sql.= " s.code_client, s.code_fournisseur,";
             $sql.= " s.logo,";
-            $sql.= " c.ref, c.tms, c.rowid, c.date_commande,";
+            $sql.= " c.rowid, c.ref, c.tms, c.date_commande,";
             $sql.= " c.total_ht,";
             $sql.= " c.tva as total_tva,";
             $sql.= " c.total_ttc,";
@@ -110,7 +109,7 @@ class box_supplier_orders extends ModeleBoxes
                     $date=$db->jdate($objp->date_commande);
 					$datem=$db->jdate($objp->tms);
 
-					$supplierorderstatic->id = $objp->id;
+					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
 
 					$thirdpartytmp->id = $objp->socid;
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 74f0ffc9d9d..61af58a4b8b 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -261,17 +261,17 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                 {
                     $sublink='';
                     if (! empty($head['sublink']))  $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?'':' target="'.$head['target'].'"').'>';
-                    if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="'.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
+                    if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium '.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
                     if (! empty($head['sublink']))  $sublink.= '</a>';
 
                     $out.= '<td class="nocellnopadd boxclose right nowraponall">';
                     $out.=$sublink;
                     // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
-                    $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="boxhandle hideonsmartphone cursormove"');
-                    $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"');
+                    $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="opacitymedium boxhandle hideonsmartphone cursormove"');
+                    $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="opacitymedium boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"');
                     $label=$head['text'];
                     //if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
-                    if (! empty($head['graph'])) $label.=' <span class="fa fa-bar-chart"></span>';
+                    if (! empty($head['graph'])) $label.=' <span class="opacitymedium fa fa-bar-chart"></span>';
                     $out.= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
                     $out.= '</td></tr></table>';
                 }
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index af3dce343f4..3bccc54204f 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -775,9 +775,6 @@ class CMailFile
 				if (! empty($this->error) || ! $result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res=false;
-				} else {
-                    $this->error = $langs->trans("SentXXXmessages", $result);
-					$this->errors[] = $langs->trans("SentXXXmessages", $result);
 				}
 			}
 			else
@@ -1158,7 +1155,7 @@ class CMailFile
 					$out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
 					$out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
 					$out.= "Content-Transfer-Encoding: base64".$this->eol;
-					$out.= "Content-Description: File Attachment".$this->eol;
+					$out.= "Content-Description: ".$filename_list[$i].$this->eol;
 					$out.= $this->eol;
 					$out.= $encoded;
 					$out.= $this->eol;
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 4d45f5aabbb..d3d77640540 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -376,7 +376,7 @@ abstract class CommonDocGenerator
 		$array_key.'_payment_mode_code'=>$object->mode_reglement_code,
 		$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
 		$array_key.'_payment_term_code'=>$object->cond_reglement_code,
-		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
+		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)),
 
 		$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
 		$array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)),
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 88ef341cb04..4c236324373 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012-2013 Christophe Battarel  <christophe.battarel@altairis.fr>
- * Copyright (C) 2011-2014 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2018 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2012-2015 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
@@ -13,7 +13,7 @@
  * Copyright (C) 2016      Bahfir abbes         <dolipar@dolipar.org>
  * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
  * Copyright (C) 2017      Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2017      Rui Strecht		<rui.strecht@aliartalentos.com>
+ * Copyright (C) 2017      Rui Strecht		    <rui.strecht@aliartalentos.com>
  * Copyright (C) 2018      Frederic France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -448,7 +448,7 @@ abstract class CommonObject
 	 *
 	 * 	@param		int			$withcountry		1=Add country into address string
 	 *  @param		string		$sep				Separator to use to build string
-	 *  @param		int		$withregion			1=Add region into address string
+	 *  @param		int		    $withregion			1=Add region into address string
 	 *	@return		string							Full address string
 	 */
 	function getFullAddress($withcountry=0,$sep="\n",$withregion=0)
@@ -599,7 +599,7 @@ abstract class CommonObject
 
 		if (empty($this->last_main_doc))
 		{
-			return '';		// No known last doc
+			return '';		// No way to known which document name to use
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
@@ -717,7 +717,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			// On recherche id type_contact
+			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
 			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 			$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
@@ -741,7 +741,7 @@ abstract class CommonObject
 
 		$datecreate = dol_now();
 
-		// Socpeople must have already been added by some a trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
+		// Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
 		$TListeContacts=$this->liste_contact(-1, $source);
 		$already_added=false;
 		if(!empty($TListeContacts)) {
@@ -757,7 +757,7 @@ abstract class CommonObject
 
 			$this->db->begin();
 
-			// Insertion dans la base
+			// Insert into database
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
 			$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
 			$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;
@@ -832,7 +832,7 @@ abstract class CommonObject
 	 */
 	function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)
 	{
-		// Insertion dans la base
+		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
 		$sql.= " statut = ".$statut;
 		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
@@ -1116,7 +1116,7 @@ abstract class CommonObject
 		$sql.= " WHERE ec.element_id = ".$id;
 		$sql.= " AND ec.fk_socpeople = c.rowid";
 		if ($source == 'internal') $sql.= " AND c.entity IN (0,".$conf->entity.")";
-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
+		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
 		$sql.= " AND tc.element = '".$element."'";
 		$sql.= " AND tc.source = '".$source."'";
@@ -1408,18 +1408,19 @@ abstract class CommonObject
 	 *	Setter generic. Update a specific field into database.
 	 *  Warning: Trigger is run only if param trigkey is provided.
 	 *
-	 *	@param	string		$field		Field to update
-	 *	@param	mixed		$value		New value
-	 *	@param	string		$table		To force other table element or element line (should not be used)
-	 *	@param	int			$id			To force other object id (should not be used)
-	 *	@param	string		$format		Data format ('text', 'date'). 'text' is used if not defined
-	 *	@param	string		$id_field	To force rowid field name. 'rowid' is used if not defined
-	 *	@param	User|string	$fuser		Update the user of last update field with this user. If not provided, current user is used except if value is 'none'
-	 *  @param  string      $trigkey    Trigger key to run (in most cases something like 'XXX_MODIFY')
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@param	string		$field			Field to update
+	 *	@param	mixed		$value			New value
+	 *	@param	string		$table			To force other table element or element line (should not be used)
+	 *	@param	int			$id				To force other object id (should not be used)
+	 *	@param	string		$format			Data format ('text', 'date'). 'text' is used if not defined
+	 *	@param	string		$id_field		To force rowid field name. 'rowid' is used if not defined
+	 *	@param	User|string	$fuser			Update the user of last update field with this user. If not provided, current user is used except if value is 'none'
+	 *  @param  string      $trigkey    	Trigger key to run (in most cases something like 'XXX_MODIFY')
+	 *  @param	string		$fk_user_field	Name of field to save user id making change
+	 *	@return	int							<0 if KO, >0 if OK
 	 *  @see updateExtraField
 	 */
-	function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='')
+	function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif')
 	{
 		global $user,$langs,$conf;
 
@@ -1428,24 +1429,26 @@ abstract class CommonObject
 		if (empty($format))   $format='text';
 		if (empty($id_field)) $id_field='rowid';
 
-		$fk_user_field = 'fk_user_modif';
-
 		$error=0;
 
 		$this->db->begin();
 
 		// Special case
 		if ($table == 'product' && $field == 'note_private') $field='note';
-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
-			$fk_user_field = 'fk_user_mod';
-		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
+
 		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
 		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
 		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
-		if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
-		elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+
+		if ($fk_user_field)
+		{
+			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
+			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+		}
+
 		$sql.= " WHERE ".$id_field." = ".$id;
 
 		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
@@ -2787,11 +2790,12 @@ abstract class CommonObject
 	 *	@param  int		$targetid		Object target id (if not defined, id of object)
 	 *	@param  string	$targettype		Object target type (if not defined, elemennt name of object)
 	 *	@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 object that differs from source. 1=Include also link to objects of same type.
-	 *	@return	int						<0 if KO, >0 if OK
+	 *  @param  int		$alsosametype	0=Return only links to object that differs from source. 1=Include also link to objects of same type.
+	 *  @param  string	$orderby		SQL 'ORDER BY' clause
+	 *	@return int						<0 if KO, >0 if OK
 	 *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked
 	 */
-	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1)
+	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype')
 	{
 		global $conf;
 
@@ -2847,7 +2851,7 @@ abstract class CommonObject
 			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
 			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
 		}
-		$sql .= ' ORDER BY sourcetype';
+		$sql .= ' ORDER BY '.$orderby;
 
 		dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -3590,12 +3594,12 @@ abstract class CommonObject
 	 *  @param	Societe			$buyer				Object thirdparty who buy
 	 *	@return	void
 	 */
-	function formAddObjectLine($dateSelector,$seller,$buyer)
+	function formAddObjectLine($dateSelector, $seller, $buyer)
 	{
 		global $conf,$user,$langs,$object,$hookmanager;
 		global $form,$bcnd,$var;
 
-		//Line extrafield
+		// Line extrafield
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafieldsline = new ExtraFields($this->db);
 		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
@@ -3673,7 +3677,7 @@ abstract class CommonObject
 			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled)) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
 
 			if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
 
@@ -3712,7 +3716,7 @@ abstract class CommonObject
 			print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
 
 			if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
 
@@ -3919,23 +3923,26 @@ abstract class CommonObject
 		$var = true;
 		$i	 = 0;
 
-		foreach ($this->lines as $line)
+		if (! empty($this->lines))
 		{
-			if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+			foreach ($this->lines as $line)
 			{
-				if (empty($line->fk_parent_line))
+				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
 				{
-					$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
-					$action='';
-					$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+					if (empty($line->fk_parent_line))
+					{
+						$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
+						$action='';
+						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+					}
+				}
+				else
+				{
+					$this->printOriginLine($line, $var, $restrictlist);
 				}
-			}
-			else
-			{
-				$this->printOriginLine($line, $var, $restrictlist);
-			}
 
-			$i++;
+				$i++;
+			}
 		}
 	}
 
@@ -4380,6 +4387,9 @@ abstract class CommonObject
 							$ecmfile->gen_or_uploaded = 'generated';
 							$ecmfile->description = '';    // indexed content
 							$ecmfile->keyword = '';        // keyword content
+							$ecmfile->src_object_type = $this->table_element;
+							$ecmfile->src_object_id   = $this->id;
+
 							$result = $ecmfile->create($user);
 							if ($result < 0)
 							{
@@ -4556,6 +4566,8 @@ abstract class CommonObject
 			return 0;
 		}
 
+		$this->array_options=array();
+
 		if (! is_array($optionsArray))
 		{
 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
@@ -4597,7 +4609,7 @@ abstract class CommonObject
 			$sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
 			$sql.= " WHERE fk_object = ".$rowid;
 
-			dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);
+			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -4789,6 +4801,10 @@ abstract class CommonObject
 						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
 						break;
 					case 'datetime':
+						// If data is a string instead of a timestamp, we convert it
+						if (! is_int($this->array_options[$key])) {
+							$this->array_options[$key] = strtotime($this->array_options[$key]);
+						}
 						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
 						break;
 		   			case 'link':
@@ -4895,14 +4911,14 @@ abstract class CommonObject
 	}
 
 	/**
-	 *	Update an exta field value for the current object.
+	 *	Update an extra field value for the current object.
 	 *  Data to describe values to update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
 	 *
 	 *  @param  string      $key    		Key of the extrafield (without starting 'options_')
 	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
 	 *  @param	User		$userused		Object user
 	 *  @return int                 		-1=error, O=did nothing, 1=OK
-	 *  @see setValueFrom
+	 *  @see setValueFrom, insertExtraFields
 	 */
 	function updateExtraField($key, $trigger, $userused)
 	{
@@ -5014,7 +5030,7 @@ abstract class CommonObject
 	 * @param  array   		$val	       Array of properties for field to show
 	 * @param  string  		$key           Key of attribute
 	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
-	 * @param  string  		$moreparam     To add more parametes on html input tag
+	 * @param  string  		$moreparam     To add more parameters on html input tag
 	 * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  string|int	$showsize      Value for css to define size. May also be a numeric.
@@ -5042,11 +5058,11 @@ abstract class CommonObject
 			$type = 'varchar';		// convert varchar(xx) int varchar
 			$size = $reg[1];
 		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
+		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) into varchar
+		elseif (preg_match('/double/', $type)) $type = 'double';		// convert double(xx) into double
 		if (is_array($val['arrayofkeyval'])) $type='select';
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
 
-		//$elementtype=$this->attribute_elementtype[$key];	// seems to not be used
 		$default=$val['default'];
 		$computed=$val['computed'];
 		$unique=$val['unique'];
@@ -5069,7 +5085,7 @@ abstract class CommonObject
 			else return '';
 		}
 
-		// Use in priorit showsize from parameters, then $val['css'] then autodefine
+		// Use in priority showsize from parameters, then $val['css'] then autodefine
 		if (empty($showsize) && ! empty($val['css']))
 		{
 			$showsize = $val['css'];
@@ -5117,7 +5133,6 @@ abstract class CommonObject
 			}
 		}
 		//var_dump($showsize.' '.$size);
-
 		if (in_array($type,array('date','datetime')))
 		{
 			$tmp=explode(',',$size);
@@ -5540,6 +5555,41 @@ abstract class CommonObject
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$showsize.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
 		}
+		elseif ($type == 'array')
+		{
+			$newval = $val;
+			$newval['type'] = 'varchar(256)';
+
+			$out='';
+
+			$inputs = array();
+			if(! empty($value)) {
+				foreach($value as $option) {
+					$out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+					$out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';
+				}
+			}
+
+			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+
+			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+			$newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';
+
+			if(! empty($conf->use_javascript_ajax)) {
+				$out.= '
+					<script type="text/javascript">
+					$(document).ready(function() {
+						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {
+							$("'.dol_escape_js($newInput).'").insertBefore(this);
+						});
+
+						$(document).on("click", "a.'.dol_escape_js($keyprefix.$key.$keysuffix).'_del", function() {
+							$(this).parent().remove();
+						});
+					});
+					</script>';
+			}
+		}
 		if (!empty($hidden)) {
 			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
 		}
@@ -5589,7 +5639,6 @@ abstract class CommonObject
 		if (is_array($val['arrayofkeyval'])) $type='select';
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
 
-		//$elementtype=$this->attribute_elementtype[$key];	// seems to not be used
 		$default=$val['default'];
 		$computed=$val['computed'];
 		$unique=$val['unique'];
@@ -5664,11 +5713,19 @@ abstract class CommonObject
 		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
 		elseif ($type == 'date')
 		{
-			$value=dol_print_date($value,'day');
+			if(! empty($value)) {
+				$value=dol_print_date($value,'day');
+			} else {
+				$value='';
+			}
 		}
 		elseif ($type == 'datetime')
 		{
-			$value=dol_print_date($value,'dayhour');
+			if(! empty($value)) {
+				$value=dol_print_date($value,'dayhour');
+			} else {
+				$value='';
+			}
 		}
 		elseif ($type == 'double')
 		{
@@ -5904,6 +5961,10 @@ abstract class CommonObject
 		{
 			$value=preg_replace('/./i','*',$value);
 		}
+		elseif ($type == 'array')
+		{
+			$value = implode('<br>', $value);
+		}
 
 		//print $type.'-'.$size;
 		$out=$value;
@@ -5929,17 +5990,29 @@ abstract class CommonObject
 
 		$out = '';
 
-		if (count($extrafields->attribute_label) > 0)
+		if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)
 		{
 			$out .= "\n";
 			$out .= '<!-- showOptionalsInput --> ';
 			$out .= "\n";
 
 			$e = 0;
-			foreach($extrafields->attribute_label as $key=>$label)
+			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 			{
-				if (empty($extrafields->attribute_list[$key])) continue;												// 0 = Never visible field
-				if (($mode == 'create' || $mode == 'edit') && abs($extrafields->attribute_list[$key]) != 1 && abs($extrafields->attribute_list[$key]) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+				$enabled = 1;
+				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))
+				{
+					$enabled = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);
+				}
+
+				$perms = 1;
+				if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))
+				{
+					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
+				}
+
+				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+				if (empty($perms)) continue;
 
 				// Load language if required
 				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
@@ -5970,18 +6043,18 @@ abstract class CommonObject
 						} else {
 							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.
 						}
+						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
 						break;
 				}
-				//var_dump($value);
 
-				if ($extrafields->attribute_type[$key] == 'separate')
+				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
 				{
-					$out .= $extrafields->showSeparator($key);
+					$out .= $extrafields->showSeparator($key, $this);
 				}
 				else
 				{
 					$csstyle='';
-					$class=(!empty($extrafields->attribute_hidden[$key]) ? 'hideobject ' : '');
+					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
 					if (is_array($params) && count($params)>0) {
 						if (array_key_exists('style',$params)) {
 							$csstyle=$params['style'];
@@ -5997,27 +6070,27 @@ abstract class CommonObject
 
 					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';
 
-					if ( !empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
+					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
 					{
 						if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan='0'; }
 					}
 
-					if($action == 'selectlines'){  $colspan++; }
+					if ($action == 'selectlines') { $colspan++; }
 
 					// Convert date into timestamp format (value in memory must be a timestamp)
-					if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))
 					{
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$this->db->jdate($this->array_options['options_'.$key]);
+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$this->db->jdate($this->array_options['options_'.$key]);
 					}
 					// Convert float submited string into real php numeric (value in memory must be a php numeric)
-					if (in_array($extrafields->attribute_type[$key],array('price','double')))
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('price','double')))
 					{
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix,'int',3)):$this->array_options['options_'.$key];
+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];
 					}
 
 					$labeltoshow = $langs->trans($label);
 
-					if($extrafields->attribute_required[$key])
+					if ($extrafields->attributes[$this->table_element]['required'][$key])
 					{
 						$labeltoshow = '<span'.($mode != 'view' ? ' class="fieldrequired"':'').'>'.$labeltoshow.'</span>';
 					}
@@ -6571,7 +6644,7 @@ abstract class CommonObject
 			{
 				if(empty($this->{$field}))
 				{
-					$queryarray[$field] = NULL;
+					$queryarray[$field] = null;
 				}
 				else
 				{
@@ -6580,7 +6653,14 @@ abstract class CommonObject
 			}
 			else if($this->isArray($info))
 			{
-				$queryarray[$field] = serialize($this->{$field});
+				if(! empty($this->{$field})) {
+					if(! is_array($this->{$field})) {
+						$this->{$field} = array($this->{$field});
+					}
+					$queryarray[$field] = serialize($this->{$field});
+				} else {
+					$queryarray[$field] = null;
+				}
 			}
 			else if($this->isInt($info))
 			{
@@ -6624,9 +6704,13 @@ abstract class CommonObject
 			}
 			elseif($this->isArray($info))
 			{
-				$this->{$field} = @unserialize($obj->{$field});
-				// Hack for data not in UTF8
-				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
+				if(! empty($obj->{$field})) {
+					$this->{$field} = @unserialize($obj->{$field});
+					// Hack for data not in UTF8
+					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+				} else {
+					$this->{$field} = array();
+				}
 			}
 			elseif($this->isInt($info))
 			{
@@ -6714,7 +6798,7 @@ abstract class CommonObject
 			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
-			if ($this->fields[$key]['notnull'] == 1 && ! isset($values[$key]))
+			if ($this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
 			{
 				$error++;
 				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
@@ -6784,14 +6868,16 @@ abstract class CommonObject
 	 */
 	public function fetchCommon($id, $ref = null, $morewhere = '')
 	{
-		if (empty($id) && empty($ref)) return false;
+		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
 		$sql = 'SELECT '.$this->getFieldList();
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id)) $sql.= ' WHERE rowid = '.$id;
-		else $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		if ($morewhere) $sql.=$morewhere;
+		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
+		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
+		if ($morewhere)   $sql.= $morewhere;
+		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
 		if ($res)
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index c4ccd6fe982..0ee73799bcb 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -97,7 +97,7 @@ class Conf
 		// First level object
 		// TODO Remove this part.
 		$this->expedition_bon	= new stdClass();
-		$this->livraison_bon		= new stdClass();
+		$this->livraison_bon	= new stdClass();
 		$this->fournisseur		= new stdClass();
 		$this->product			= new stdClass();
 		$this->service			= new stdClass();
@@ -107,12 +107,13 @@ class Conf
 		$this->propal			= new stdClass();
 		$this->facture			= new stdClass();
 		$this->contrat			= new stdClass();
-		$this->usergroup			= new stdClass();
+		$this->usergroup		= new stdClass();
 		$this->adherent			= new stdClass();
 		$this->bank				= new stdClass();
 		$this->notification		= new stdClass();
 		$this->mailing			= new stdClass();
-		$this->expensereport		= new stdClass();
+		$this->expensereport	= new stdClass();
+		$this->productbatch		= new stdClass();
 	}
 
 
@@ -346,6 +347,9 @@ class Conf
 			$this->fournisseur->facture=new stdClass();
 			$this->fournisseur->facture->dir_output =$rootfordata."/fournisseur/facture";
 			$this->fournisseur->facture->dir_temp   =$rootfordata."/fournisseur/facture/temp";
+			$this->supplierproposal=new stdClass();
+			$this->supplierproposal->dir_output=$rootfordata."/supplier_proposal";
+			$this->supplierproposal->dir_temp=$rootfordata."/supplier_proposal/temp";
 			$this->fournisseur->payment=new stdClass();
 			$this->fournisseur->payment->dir_output =$rootfordata."/fournisseur/payment";
 			$this->fournisseur->payment->dir_temp   =$rootfordata."/fournisseur/payment/temp";
@@ -361,6 +365,9 @@ class Conf
     			$this->supplier_invoice->enabled=1;
     			$this->supplier_invoice->dir_output=$rootfordata."/fournisseur/facture";
     			$this->supplier_invoice->dir_temp=$rootfordata."/fournisseur/facture/temp";
+    			$this->supplierproposal=new stdClass();
+    			$this->supplierproposal->dir_output=$rootfordata."/supplier_proposal";
+    			$this->supplierproposal->dir_temp=$rootfordata."/supplier_proposal/temp";
 			}
 		}
 
@@ -375,6 +382,10 @@ class Conf
 		$this->service->dir_output=$rootfordata."/produit";
 		$this->service->dir_temp  =$rootfordata."/produit/temp";
 
+		// Module productbatch
+		$this->productbatch->multidir_output=array($this->entity => $rootfordata."/produitlot");
+		$this->productbatch->multidir_temp  =array($this->entity => $rootfordata."/produitlot/temp");
+
 		// Module contrat
 		$this->contrat->dir_output=$rootfordata."/contracts";
 		$this->contrat->dir_temp  =$rootfordata."/contracts/temp";
@@ -505,7 +516,7 @@ class Conf
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog';	// '' means 'all'. Note that contact is added here as it should be a module later.
 
-		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list 
+		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
 		if (! empty($this->modules_parts['moduleforexternal']))
 			foreach($this->modules_parts['moduleforexternal'] as $key=>$value) $this->global->MAIN_MODULES_FOR_EXTERNAL.=",$key";
 
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
deleted file mode 100644
index 1d28861a44e..00000000000
--- a/htdocs/core/class/cookie.class.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/* Copyright (C) 2009-2015  Regis Houssin  <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/core/class/cookie.class.php
- *	\ingroup    core
- *	\brief      File of class to manage cookies
- */
-
-
-/**
- *	Class to manage cookies.
- *  This class is used by external module multicompany but will be removed soon only and must not be used by
- *
- *  @deprecated PHP already provide function to read/store a cookie. No need to use a dedicated class. Also storing sensitive information into cookie is forbidden, so encryption is useless.
- *  If a data is sensitive, it must be stored into database (if we need a long term retention) or into session.
- */
-class DolCookie
-{
-	private $_myKey;
-	private $_iv;
-
-	var $myCookie;
-	var $myValue;
-	var $myExpire;
-	var $myPath;
-	var $myDomain;
-	var	$mySecure;
-	var $cookie;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $key Personnal key
-	 * @deprecated
-	 */
-	function __construct($key = '')
-	{
-		$this->_myKey = hash('sha256', $key, TRUE);
-		$this->_iv = md5(md5($this->_myKey));
-		$this->cookie = "";
-		$this->myCookie = "";
-		$this->myValue = "";
-	}
-
-
-	/**
-	 * Encrypt en create the cookie
-	 *
-	 * @return	void
-	 */
-	private function _cryptCookie()
-	{
-		if (!empty($this->_myKey) && !empty($this->_iv))
-		{
-			$valuecrypt = base64_encode($this->myValue);
-			$this->cookie = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->_myKey, $valuecrypt, MCRYPT_MODE_CBC, $this->_iv));
-		}
-		else
-		{
-			$this->cookie = $this->myValue;
-		}
-
-		setcookie($this->myCookie, $this->cookie, $this->myExpire, $this->myPath, $this->myDomain, $this->mySecure);
-	}
-
-	/**
-	 * Decrypt the cookie
-	 *
-	 * @return	string
-	 */
-	private function _decryptCookie()
-	{
-		if (!empty($this->_myKey) && !empty($this->_iv))
-		{
-			$this->cookie = $_COOKIE[$this->myCookie];
-			$this->myValue = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->_myKey, base64_decode($this->cookie), MCRYPT_MODE_CBC, $this->_iv));
-
-			return(base64_decode($this->myValue));
-		}
-		else
-		{
-			return($_COOKIE[$this->myCookie]);
-		}
-	}
-
-	/**
-	 * Set and create the cookie
-	 *
-	 * @param  	string		$cookie  	Cookie name
-	 * @param  	string		$value   	Cookie value
-	 * @param	integer		$expire		Expiration
-	 * @param	string		$path		Path of cookie
-	 * @param	string		$domain		Domain name
-	 * @param	int			$secure		0 or 1
-	 * @return	void
-	 */
-	public function setCookie($cookie, $value, $expire=0, $path="/", $domain="", $secure=0)
-	{
-		$this->myCookie = $cookie;
-		$this->myValue = $value;
-		$this->myExpire = $expire;
-		$this->myPath = $path;
-		$this->myDomain = $domain;
-		$this->mySecure = $secure;
-
-		//print 'key='.$this->myKey.' name='.$this->myCookie.' value='.$this->myValue.' expire='.$this->myExpire;
-
-		$this->_cryptCookie();
-	}
-
-	/**
-	 *  Get the cookie
-	 *
-	 *  @param   	string		$cookie         Cookie name
-	 *  @return  	string						Decrypted value
-	 */
-	public function getCookie($cookie)
-	{
-		$this->myCookie = $cookie;
-
-		$decryptValue = $this->_decryptCookie();
-
-		return $decryptValue;
-	}
-
-}
-
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index aa500ab64df..860d89afea8 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -153,7 +153,7 @@ class DolEditor
     {
     	global $conf,$langs;
 
-    	$fullpage=False;
+    	$fullpage=false;
     	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
     	{
     	   $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index ba7a67be3cb..3ad22f87c03 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -674,7 +674,7 @@ class DolGraph
 		$group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
 		$group->legend->setSpace(0);
 		$group->legend->setPadding(2,2,2,2);
-		$group->legend->setPosition(NULL,0.1);
+		$group->legend->setPosition(null, 0.1);
 		$group->legend->setBackgroundColor($colorsemitrans);
 
 		if (is_array($this->bgcolorgrid)) $group->grid->setBackgroundColor($bgcolorgrid);
@@ -734,7 +734,7 @@ class DolGraph
 				$plot->barShadow->setSize($this->SetShading);
 				$plot->barShadow->setPosition(SHADOW_RIGHT_TOP);
 				$plot->barShadow->setColor(new Color(160, 160, 160, 50));
-				$plot->barShadow->smooth(TRUE);
+				$plot->barShadow->smooth(true);
 				//$plot->setSize(1, 0.96);
 				//$plot->setCenter(0.5, 0.52);
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index bf9bcf587f8..62fd4335315 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -39,38 +39,50 @@ class ExtraFields
 	var $db;
 
 	// type of element (for what object is the extrafield)
+	// @deprecated
 	var $attribute_elementtype;
-
 	// Array with type of the extra field
+	// @deprecated
 	var $attribute_type;
 	// Array with label of extra field
+	// @deprecated
 	var $attribute_label;
 	// Array with size of extra field
+	// @deprecated
 	var $attribute_size;
 	// array with list of possible values for some types of extra fields
+	// @deprecated
 	var $attribute_choice;
 	// Array to store compute formula for computed fields
+	// @deprecated
 	var $attribute_computed;
 	// Array to store default value
+	// @deprecated
 	var $attribute_default;
 	// Array to store if attribute is unique or not
+	// @deprecated
 	var $attribute_unique;
 	// Array to store if attribute is required or not
+	// @deprecated
 	var $attribute_required;
 	// Array to store parameters of attribute (used in select type)
+	// @deprecated
 	var $attribute_param;
 	// Array to store position of attribute
+	// @deprecated
 	var $attribute_pos;
 	// Array to store if attribute is editable regardless of the document status
+	// @deprecated
 	var $attribute_alwayseditable;
 	// Array to store permission to check
+	// @deprecated
 	var $attribute_perms;
 	// Array to store language file to translate label of values
+	// @deprecated
 	var $attribute_langfile;
 	// Array to store if field is visible by default on list
+	// @deprecated
 	var $attribute_list;
-	// Array to store if extra field is hidden
-	var $attribute_hidden;		// warning, do not rely on this. If your module need a hidden data, it must use its own table.
 
 	// New array to store extrafields definition
 	var $attributes;
@@ -126,7 +138,6 @@ class ExtraFields
 		$this->attribute_perms = array();
 		$this->attribute_langfile = array();
 		$this->attribute_list = array();
-		$this->attribute_hidden = array();
 	}
 
 	/**
@@ -137,14 +148,14 @@ class ExtraFields
 	 *  @param  int				$type               Type of attribute ('boolean','int','varchar','text','html','date','datehour','price','phone','mail','password','url','select','checkbox','separate',...)
 	 *  @param  int				$pos                Position of attribute
 	 *  @param  string			$size               Size/length of attribute
-	 *  @param  string			$elementtype        Element type ('member', 'product', 'thirdparty', ...)
+	 *  @param  string			$elementtype        Element type. Same value than object->table_element (Example 'member', 'product', 'thirdparty', ...)
 	 *  @param	int				$unique				Is field unique or not
 	 *  @param	int				$required			Is field required or not
 	 *  @param	string			$default_value		Defaulted value (In database. use the default_value feature for default value on screen. Example: '', '0', 'null', 'avalue')
 	 *  @param  array|string	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string			$perms				Permission to check
-	 *  @param	int				$list				Visibilty (0=never visible, 1=visible on list+forms, 2=list onyl, 3=form only)
+	 *  @param	string			$list				Visibilty ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')
 	 *  @param	int				$notused			Deprecated.
 	 *  @param  string  		$computed           Computed value
 	 *  @param  string  		$entity    		 	Entity of extrafields (for multicompany modules)
@@ -152,7 +163,7 @@ class ExtraFields
 	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
 	 *  @return int      							<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list=-1, $notused=0, $computed='', $entity='', $langfile='', $enabled='1')
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $notused=0, $computed='', $entity='', $langfile='', $enabled='1')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -198,11 +209,11 @@ class ExtraFields
 	 *  @param  string  $default_value		Default value for field (in database)
 	 *  @param  array	$param				Params for field  (ex for select list : array('options'=>array('value'=>'label of option'))
 	 *  @param	string	$perms				Permission
-	 *	@param	int		$list				Into list view by default
+	 *	@param	string	$list				Into list view by default
 	 *  @param  string  $computed           Computed value
 	 *  @return int      	           		<=0 if KO, >0 if OK
 	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list=0, $computed='')
+	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
@@ -288,7 +299,7 @@ class ExtraFields
 	 *  @param  array|string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
 	 *  @param	string			$perms			Permission to check
-	 *  @param	int				$list			Visibily
+	 *  @param	string			$list			Visibily
 	 *  @param	int				$notused		Deprecated.
 	 *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string          $computed       Computed value
@@ -297,7 +308,7 @@ class ExtraFields
 	 *  @param  string  		$enabled  		Condition to have the field enabled or not
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=-1, $notused=0, $default='', $computed='',$entity='', $langfile='', $enabled='1')
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $notused=0, $default='', $computed='',$entity='', $langfile='', $enabled='1')
 	{
 		global $conf,$user;
 
@@ -306,7 +317,7 @@ class ExtraFields
 
 		// Clean parameters
 		if (empty($pos)) $pos=0;
-		if (empty($list)) $list=0;
+		if (empty($list)) $list='0';
 		if (empty($required)) $required=0;
 		if (empty($unique)) $unique=0;
 		if (empty($alwayseditable)) $alwayseditable=0;
@@ -361,7 +372,7 @@ class ExtraFields
 			$sql.= " ".$alwayseditable.",";
 			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
 			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " ".$list.",";
+			$sql.= " '".$this->db->escape($list)."',";
 			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
 			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
 			$sql .= " " . $user->id . ",";
@@ -496,7 +507,7 @@ class ExtraFields
 	 *  @param  array	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
-	 *  @param	int		$list				Visibility
+	 *  @param	string	$list				Visibility
 	 *  @param	int		$notused			Deprecated.
 	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string  $computed           Computed value
@@ -605,7 +616,7 @@ class ExtraFields
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
-	 *  @param	int		$list				Visiblity
+	 *  @param	string	$list				Visiblity
 	 *  @param	int		$notused			Deprecated.
 	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string  $computed           Computed value
@@ -614,7 +625,7 @@ class ExtraFields
 	 *  @param  string  $enabled  			Condition to have the field enabled or not
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$notused=0,$default='',$computed='',$entity='',$langfile='',$enabled='1')
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$notused=0,$default='',$computed='',$entity='',$langfile='',$enabled='1')
 	{
 		global $conf, $user;
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$notused.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled);
@@ -624,7 +635,7 @@ class ExtraFields
 		if ($elementtype == 'contact') $elementtype='socpeople';
 
 		if (empty($pos)) $pos=0;
-		if (empty($list)) $list=0;
+		if (empty($list)) $list='0';
 		if (empty($required)) $required=0;
 		if (empty($unique)) $unique=0;
 		if (empty($alwayseditable)) $alwayseditable=0;
@@ -688,7 +699,7 @@ class ExtraFields
 			$sql.= " ".$pos.",";
 			$sql.= " '".$this->db->escape($alwayseditable)."',";
 			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " ".$list.", ";
+			$sql.= " '".$this->db->escape($list)."', ";
 			$sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
 			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
 			$sql .= " " . $user->id . ",";
@@ -729,7 +740,7 @@ class ExtraFields
 	{
 		global $conf;
 
-		if (empty($elementtype) ) return array();
+		if (empty($elementtype)) return array();
 
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
@@ -758,10 +769,10 @@ class ExtraFields
 		// We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
 		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
 
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,fielddefault,fieldcomputed,entity";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,fielddefault,fieldcomputed,entity,enabled";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
+		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
 		$sql.= " ORDER BY pos";
 
 		$resql=$this->db->query($sql);
@@ -812,6 +823,7 @@ class ExtraFields
 					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
 					$this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
 					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
+					$this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
 
 					$this->attributes[$tab->elementtype]['loaded']=1;
 				}
@@ -832,16 +844,17 @@ class ExtraFields
 	 * Return HTML string to put an input field into a page
 	 * Code very similar with showInputField of common object
 	 *
-	 * @param  string  $key            Key of attribute
-	 * @param  string  $value          Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
-	 * @param  string  $moreparam      To add more parametes on html input tag
-	 * @param  string  $keysuffix      Prefix string to add after name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $keyprefix      Suffix string to add before name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $morecss        More css (to defined size of field. Old behaviour: may also be a numeric)
-	 * @param  int     $objectid       Current object id
+	 * @param  string  $key            			Key of attribute
+	 * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+	 * @param  string  $moreparam      			To add more parametes on html input tag
+	 * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
+	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
+	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
+	 * @param  int     $objectid       			Current object id
+	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @return string
 	 */
-	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0)
+	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='')
 	{
 		global $conf,$langs,$form;
 
@@ -855,18 +868,36 @@ class ExtraFields
 
 		$keyprefix = $keyprefix.'options_';		// Because we work on extrafields
 
-		$label=$this->attribute_label[$key];
-		$type =$this->attribute_type[$key];
-		$size =$this->attribute_size[$key];
-		$elementtype=$this->attribute_elementtype[$key];	// Seems not used
-		$default=$this->attribute_default[$key];
-		$computed=$this->attribute_computed[$key];
-		$unique=$this->attribute_unique[$key];
-		$required=$this->attribute_required[$key];
-		$param=$this->attribute_param[$key];
-		$langfile=$this->attribute_langfile[$key];
-		$list=$this->attribute_list[$key];
-		$hidden=$this->attribute_hidden[$key];
+		if (! empty($extrafieldsobjectkey))
+		{
+			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
+			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
+			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
+			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
+			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
+			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
+			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		}
+		else	// Old usage
+		{
+			$label=$this->attribute_label[$key];
+			$type =$this->attribute_type[$key];
+			$size =$this->attribute_size[$key];
+			$elementtype=$this->attribute_elementtype[$key];	// Seems not used
+			$default=$this->attribute_default[$key];
+			$computed=$this->attribute_computed[$key];
+			$unique=$this->attribute_unique[$key];
+			$required=$this->attribute_required[$key];
+			$param=$this->attribute_param[$key];
+			$langfile=$this->attribute_langfile[$key];
+			$list=$this->attribute_list[$key];
+			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		}
 
 		if ($computed)
 		{
@@ -1008,7 +1039,10 @@ class ExtraFields
 				$out.='<option value="'.$key.'"';
 				$out.= (((string) $value == (string) $key)?' selected':'');
 				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>'.$val.'</option>';
+				$out.='>';
+				if ($langfile && $val) $out.=$langs->trans($val);
+				else $out.=$val;
+				$out.='</option>';
 			}
 			$out.='</select>';
 		}
@@ -1063,6 +1097,10 @@ class ExtraFields
 				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
 				if (!empty($InfoFieldList[4]))
 				{
+				    // can use curent entity filter
+				    if (strpos($InfoFieldList[4], '$ENTITY$')!==false) {
+				        $InfoFieldList[4]=str_replace('$ENTITY$',$conf->entity,$InfoFieldList[4]);
+				    }
 					// can use SELECT request
 					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
 						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
@@ -1371,7 +1409,7 @@ class ExtraFields
 	 * @param   string	$key            		Key of attribute
 	 * @param   string	$value          		Value to show
 	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
-	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
+	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @return	string							Formated value
 	 */
 	function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='')
@@ -1380,7 +1418,6 @@ class ExtraFields
 
 		if (! empty($extrafieldsobjectkey))
 		{
-			$elementtype=$this->attributes[$extrafieldsobjectkey]['elementtype'][$key];	// seems not used
 			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
 			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
 			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
@@ -1389,14 +1426,13 @@ class ExtraFields
 			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
 			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
 			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=$this->attributes[$extrafieldsobjectkey]['perms'][$key];
+			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
 			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=$this->attributes[$extrafieldsobjectkey]['list'][$key];
-			$hidden=(($list == 0) ? 1 : 0);		// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 		else	// Old usage
 		{
-			$elementtype=$this->attribute_elementtype[$key];	// seems not used
 			$label=$this->attribute_label[$key];
 			$type=$this->attribute_type[$key];
 			$size=$this->attribute_size[$key];
@@ -1405,10 +1441,10 @@ class ExtraFields
 			$unique=$this->attribute_unique[$key];
 			$required=$this->attribute_required[$key];
 			$param=$this->attribute_param[$key];
-			$perms=$this->attribute_perms[$key];
+			$perms=dol_eval($this->attribute_perms[$key], 1);
 			$langfile=$this->attribute_langfile[$key];
-			$list=$this->attribute_list[$key];
-			$hidden=(($list == 0) ? 1 : 0);		// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$list=dol_eval($this->attribute_list[$key], 1);
+			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
 		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
@@ -1468,7 +1504,8 @@ class ExtraFields
 		}
 		elseif ($type == 'select')
 		{
-			$value=$param['options'][$value];
+			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
+			else $value=$param['options'][$value];
 		}
 		elseif ($type == 'sellist')
 		{
@@ -1739,28 +1776,35 @@ class ExtraFields
 	 * Return HTML string to print separator extrafield
 	 *
 	 * @param   string	$key            Key of attribute
-	 * @return string
+	 * @param	string	$object			Object
+	 * @return 	string					HTML code with line for separator
 	 */
-	function showSeparator($key)
+	function showSeparator($key, $object)
 	{
-		$out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="4"><strong>'.$this->attribute_label[$key].'</strong></td></tr>';
+		global $langs;
+
+		$out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
+		$out.= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
+		$out.= '</strong></td></tr>';
 		return $out;
 	}
 
 	/**
 	 * Fill array_options property of object by extrafields value (using for data sent by forms)
 	 *
-	 * @param   array	$extralabels    $array of extrafields
+	 * @param   array	$extralabels    $array of extrafields (@deprecated)
 	 * @param   object	$object         Object
 	 * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
 	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
 	 */
-	function setOptionalsFromPost($extralabels,&$object,$onlykey='')
+	function setOptionalsFromPost($extralabels, &$object, $onlykey='')
 	{
 		global $_POST, $langs;
 		$nofillrequired='';// For error when required field left blank
 		$error_field_required = array();
 
+		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+
 		if (is_array($extralabels))
 		{
 			// Get extra fields
@@ -1768,11 +1812,27 @@ class ExtraFields
 			{
 				if (! empty($onlykey) && $key != $onlykey) continue;
 
-				$key_type = $this->attribute_type[$key];
-				if ($this->attribute_required[$key] && empty($_POST["options_".$key])) // Check if empty without GETPOST, value can be alpha, int, array, etc...
+				$key_type = $this->attributes[$object->table_element]['type'][$key];
+				if ($key_type == 'separate') continue;
+
+				$enabled = 1;
+				if (isset($this->attributes[$object->table_element]['list'][$key]))
 				{
+					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+				}
+				$perms = 1;
+				if (isset($this->attributes[$object->table_element]['perms'][$key]))
+				{
+					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+				}
+				if (empty($enabled)) continue;
+				if (empty($perms)) continue;
+
+				if ($this->attributes[$object->table_element]['required'][$key] && empty($_POST["options_".$key])) // Check if empty without GETPOST, value can be alpha, int, array, etc...
+				{
+					//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
 					$nofillrequired++;
-					$error_field_required[] = $value;
+					$error_field_required[] = $langs->transnoentitiesnoconv($value);
 				}
 
 				if (in_array($key_type,array('date')))
@@ -1798,13 +1858,14 @@ class ExtraFields
 				}
 				else if (in_array($key_type,array('price','double')))
 				{
-					$value_arr=GETPOST("options_".$key);
+					$value_arr=GETPOST("options_".$key, 'alpha');
 					$value_key=price2num($value_arr);
 				}
 				else
 				{
 					$value_key=GETPOST("options_".$key);
 				}
+
 				$object->array_options["options_".$key]=$value_key;
 			}
 
@@ -1825,7 +1886,7 @@ class ExtraFields
 	/**
 	 * return array_options array of data of extrafields value of object sent by a search form
 	 *
-	 * @param  array   $extralabels    $array of extrafields
+	 * @param  array   $extralabels    $array of extrafields (@deprecated)
 	 * @param  string  $keyprefix      Prefix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $keysuffix      Suffix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @return array|int               array_options set or 0 if no value
@@ -1834,13 +1895,15 @@ class ExtraFields
 	{
 		global $_POST;
 
+		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+
 		$array_options = array();
 		if (is_array($extralabels))
 		{
 			// Get extra fields
 			foreach ($extralabels as $key => $value)
 			{
-				$key_type = $this->attribute_type[$key];
+				$key_type = $this->attributes[$object->table_element]['type'][$key];
 
 				if (in_array($key_type,array('date','datetime')))
 				{
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index e25709fd303..c3a40599877 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -94,6 +94,9 @@ class FileUpload
 		elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
 		}
+		elseif ($element == 'productbatch') {
+			$dir_output = $conf->productbatch->multidir_output[$conf->entity];
+		}
 		elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename='actioncomm';
 			$dir_output=$conf->agenda->dir_output;
@@ -222,7 +225,7 @@ class FileUpload
 	 * getFileObject
 	 *
 	 * @param	string		$file_name		Filename
-	 * @return 	stdClass|NULL
+	 * @return 	stdClass|null
 	 */
 	protected function getFileObject($file_name)
 	{
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 8cc2c62bee7..cd33f1d8d02 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -80,28 +80,31 @@ class HookManager
 
 		$this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray));    // All contexts are concatenated
 
-		foreach($conf->modules_parts['hooks'] as $module => $hooks)
+		foreach($conf->modules_parts['hooks'] as $module => $hooks)	// Loop on each module that brings hooks
 		{
-			if ($conf->$module->enabled)
+			if (empty($conf->$module->enabled)) continue;
+
+			//dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
+			foreach($arraycontext as $context)
 			{
-				foreach($arraycontext as $context)
+				if (is_array($hooks)) $arrayhooks=$hooks;    // New system
+				else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
+
+				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module
 				{
-				    if (is_array($hooks)) $arrayhooks=$hooks;    // New system
-				    else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
-					if (in_array($context,$arrayhooks) || in_array('all',$arrayhooks))    // We instantiate action class only if hook is required
+					// Include actions class overwriting hooks
+					if (! is_object($this->hooks[$context][$module]))	// If set, class was already loaded
 					{
 						$path 		= '/'.$module.'/class/';
 						$actionfile = 'actions_'.$module.'.class.php';
-						$pathroot	= '';
 
-						// Include actions class overwriting hooks
-						dol_syslog('Loading hook:' . $actionfile, LOG_INFO);
+						dol_syslog(get_class($this).'::initHooks Loading hook class for context '.$context.": ".$actionfile, LOG_INFO);
 						$resaction=dol_include_once($path.$actionfile);
 						if ($resaction)
 						{
-    						$controlclassname = 'Actions'.ucfirst($module);
-    						$actionInstance = new $controlclassname($this->db);
-    						$this->hooks[$context][$module] = $actionInstance;
+							$controlclassname = 'Actions'.ucfirst($module);
+							$actionInstance = new $controlclassname($this->db);
+							$this->hooks[$context][$module] = $actionInstance;
 						}
 					}
 				}
@@ -117,7 +120,7 @@ class HookManager
      * 	    @param		array	$parameters		Array of parameters
      * 		@param		Object	$object			Object to use hooks on
      * 	    @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
-     * 		@return		mixed					For 'addreplace' hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+     * 		@return		mixed					For 'addreplace' hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
      * 											For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
      *                                          All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
      * 											$this->error or this->errors are also defined by class called by this function if error.
@@ -179,9 +182,11 @@ class HookManager
 				'printTabsHead',
 				'printObjectLine',
 				'printObjectSubLine',
+				'restrictedArea',
 				'sendMail',
 				'sendMailAfter',
-				'showLinkToObjectBlock'
+				'showLinkToObjectBlock',
+				'setContentSecurityPolicy'
 				)
 			)) $hooktype='addreplace';
 
@@ -213,20 +218,19 @@ class HookManager
 
                     $this->resNbOfHooks++;
 
-                    dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
-
                     $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
 
                     // Clean class (an error may have been set from a previous call of another method for same module/hook)
                     $actionclassinstance->error=0;
                     $actionclassinstance->errors=array();
 
+                    dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
+
                     // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
                     $parameters['currentcontext'] = $context;
                     // Hooks that must return int (hooks with type 'addreplace')
                     if ($hooktype == 'addreplace')
                     {
-                    	dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                     	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
                     	if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
                     	{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c7fa142daf1..642fe099593 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -16,6 +16,7 @@
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -642,16 +643,17 @@ class Form
 	/**
 	 *  Return combo list of activated countries, into language of user
 	 *
-	 *  @param	string	$selected       Id or Code or Label of preselected country
-	 *  @param  string	$htmlname       Name of html select object
-	 *  @param  string	$htmloption     Options html on select object
-	 *  @param	integer	$maxlength		Max length for labels (0=no limit)
-	 *  @param	string	$morecss		More css class
-	 *  @param	string	$usecodeaskey	'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
-	 *  @param	int		$showempty		Show empty choice
-	 *  @return string           		HTML string with select
+	 *  @param	string	$selected       	Id or Code or Label of preselected country
+	 *  @param  string	$htmlname       	Name of html select object
+	 *  @param  string	$htmloption     	Options html on select object
+	 *  @param	integer	$maxlength			Max length for labels (0=no limit)
+	 *  @param	string	$morecss			More css class
+	 *  @param	string	$usecodeaskey		'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
+	 *  @param	int		$showempty			Show empty choice
+	 *  @param	int		$disablefavorites	Disable favorites
+	 *  @return string           			HTML string with select
 	 */
-	function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1)
+	function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1, $disablefavorites=0)
 	{
 		global $conf,$langs;
 
@@ -692,13 +694,14 @@ class Form
 					$i++;
 				}
 
-				array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+				if (empty($disablefavorites)) array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+				else $countryArray = dol_sort_array($countryArray, 'label');
 
 				foreach ($countryArray as $row)
 				{
 					if (empty($showempty) && empty($row['rowid'])) continue;
 
-					if ($row['favorite'] && $row['code_iso']) $atleastonefavorite++;
+					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) $atleastonefavorite++;
 					if (empty($row['favorite']) && $atleastonefavorite)
 					{
 						$atleastonefavorite=0;
@@ -1330,7 +1333,7 @@ class Form
 		if ($showsoc > 0) $sql.= " , s.nom as company";
 		$sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp";
 		if ($showsoc > 0) $sql.= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc";
-		$sql.= " WHERE sp.entity IN (".getEntity('societe').")";
+		$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		if ($socid > 0) $sql.= " AND sp.fk_soc=".$socid;
 		if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut <> 0";
 		$sql.= " ORDER BY sp.lastname ASC";
@@ -2901,7 +2904,7 @@ class Form
 
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
-		print '<select class="flat" name="'.$htmlname.'">';
+		print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
 		if ($addempty) print '<option value="0">&nbsp;</option>';
 		foreach($this->cache_availability as $id => $arrayavailability)
 		{
@@ -3469,8 +3472,8 @@ class Form
 			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
 				$bankstatic=new Account($this->db);
-				$bankstatic->fetch($selected);
-				print $bankstatic->getNomUrl(1);
+				$result = $bankstatic->fetch($selected);
+				if ($result) print $bankstatic->getNomUrl(1);
 			} else {
 				print "&nbsp;";
 			}
@@ -4772,10 +4775,10 @@ class Form
 	 *            	- local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
 	 *            	- Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)
 	 *
-	 *	@param	timestamp	$set_time 		Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date (emptydate must be 0).
+	 *	@param	timestamp	$set_time 		Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
 	 *	@param	string		$prefix			Prefix for fields name
-	 *	@param	int			$h				1=Show also hours (-1 has same effect, but hour and minutes are prefilled with 23:59 if $set_time = -1)
-	 *	@param	int			$m				1=Show also minutes
+	 *	@param	int			$h				1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty
+	 *	@param	int			$m				1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty
 	 *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
 	 *	@param	string		$form_name 		Not used
 	 *	@param	int			$d				1=Show days, month, years
@@ -4810,7 +4813,7 @@ class Form
 		}
 
 		// Analysis of the pre-selection date
-		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/',$set_time,$reg))
+		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/',$set_time,$reg))	// deprecated usage
 		{
 			// Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
 			$syear	= (! empty($reg[1])?$reg[1]:'');
@@ -4848,6 +4851,8 @@ class Form
 			$smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_MIN;
 			$ssec = !isset($conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_SEC;
 		}
+		if ($h == 3) $shour = '';
+		if ($m == 3) $smin = '';
 
 		// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
 		$usecalendar='combo';
@@ -5335,7 +5340,8 @@ class Form
 		$sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX .$objecttmp->table_element." as t";
 		if ($objecttmp->ismultientitymanaged == 2)
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE t.entity IN (".getEntity($objecttmp->table_element).")";
+		$sql.= " WHERE 1=1";
+		if(! empty($objecttmp->ismultientitymanaged)) $sql.= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
 		if ($objecttmp->ismultientitymanaged == 1 && ! empty($user->societe_id))
 		{
 			if ($objecttmp->element == 'societe') $sql.= " AND t.rowid = ".$user->societe_id;
@@ -5536,7 +5542,7 @@ class Form
 
 
 	/**
-	 *	Return a HTML select string, built from an array of key+value but content returned into select come from an Ajax call of an URL.
+	 *	Return a HTML select string, built from an array of key+value, but content returned into select come from an Ajax call of an URL.
 	 *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
 	 *
 	 *	@param	string	$htmlname       		Name of html select area
@@ -5551,7 +5557,7 @@ class Form
 	 *  @param  string  $placeholder            String to use as placeholder
 	 *  @param  integer $acceptdelayedhtml      1 if caller request to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
 	 * 	@return	string   						HTML select string
-	 *  @see ajax_combobox in ajax.lib.php
+	 *  @see selectArrayFilter, ajax_combobox in ajax.lib.php
 	 */
 	static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
 	{
@@ -5612,7 +5618,7 @@ class Form
                 /* Code to execute a GET when we select a value */
                 $(".'.$htmlname.'").change(function() {
 			    	var selected = $(".'.$htmlname.'").val();
-                	console.log("We select "+selected)
+                	console.log("We select in selectArrayAjax the entry "+selected)
 			        $(".'.$htmlname.'").val("");  /* reset visible combo value */
     			    $.each( saveRemoteData, function( key, value ) {
     				        if (key == selected)
@@ -5638,7 +5644,7 @@ class Form
 	}
 
 	/**
-	 *	Return a HTML select string, built from an array of key+value but content returned into select come from an Ajax call of an URL.
+	 *	Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.
 	 *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
 	 *
 	 *	@param	string	$htmlname       		Name of html select area
@@ -5653,7 +5659,7 @@ class Form
 	 *  @param  string  $placeholder            String to use as placeholder
 	 *  @param  integer $acceptdelayedhtml      1 if caller request to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
 	 * 	@return	string   						HTML select string
-	 *  @see ajax_combobox in ajax.lib.php
+	 *  @see selectArrayAjax, ajax_combobox in ajax.lib.php
 	 */
 	static function selectArrayFilter($htmlname, $array, $id='', $moreparam='', $disableFiltering=0, $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
 	{
@@ -5702,8 +5708,9 @@ class Form
 
 						var urlBase = data.url;
 						var separ = urlBase.indexOf("?") >= 0 ? "&" : "?";
-
-						saveRemoteData[data.id].url = urlBase + separ + "sall=" + params.term;';
+						/* console.log("params.term="+params.term); */
+						/* console.log("params.term encoded="+encodeURIComponent(params.term)); */
+						saveRemoteData[data.id].url = urlBase + separ + "sall=" + encodeURIComponent(params.term);';
 		}
 
 		if(! $disableFiltering) {
@@ -5907,7 +5914,7 @@ class Form
             </a>
             <input type="hidden" class="'.$htmlname.'" name="'.$htmlname.'" value="'.$listcheckedstring.'">
             </dt>
-            <dd class="dropowndd">
+            <dd class="dropdowndd">
                 <div class="multiselectcheckbox'.$htmlname.'">
                     <ul class="ul'.$htmlname.'">
                     '.$lis.'
@@ -6031,13 +6038,13 @@ class Form
 			foreach($object->linkedObjects as $objecttype => $objects)
 			{
 				$tplpath = $element = $subelement = $objecttype;
-                
+
 				// to display inport button on tpl
 				$showImportButton=false;
 				if(!empty($compatibleImportElementsList) && in_array($element,$compatibleImportElementsList)){
 				    $showImportButton=true;
 				}
-				
+
 				if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
 				{
 					$element = $regs[1];
@@ -6097,7 +6104,7 @@ class Form
 						global $noMoreLinkedObjectBlockAfter;
 						$noMoreLinkedObjectBlockAfter=1;
 					}
-					
+
 					$res=@include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');
 					if ($res)
 					{
@@ -6113,13 +6120,13 @@ class Form
 			}
 
 			print '</table>';
-			
+
 			if(!empty($compatibleImportElementsList))
 			{
 			    $res=@include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
 			}
-			
-			
+
+
 			print '</div>';
 
 			return $nbofdifferenttypes;
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index a79f01352e8..17e437f5223 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -64,7 +64,7 @@ class FormAccounting extends Form
 	 */
 	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
 	{
-		global $conf;
+		global $conf,$langs;
 
 		$out = '';
 
@@ -93,9 +93,10 @@ class FormAccounting extends Form
 			}
 
     		$selected = 0;
+			$langs->load('accountancy');
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$label = $obj->code . ' - ' . $obj->label;
+				$label = $obj->code . ' - ' . $langs->trans($obj->label);
 
     			$select_value_in = $obj->rowid;
 				$select_value_out = $obj->rowid;
@@ -274,6 +275,7 @@ class FormAccounting extends Form
     		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
     		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
     		$sql .= " AND aa.active = 1";
+    		$sql .= " AND aa.entity=".$conf->entity;
     		$sql .= " ORDER BY aa.account_number";
 
     		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index f254fe44b9d..f4b4e010faf 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -194,16 +194,16 @@ class FormActions
             $projectid = $object->fk_project;
             if ($typeelement == 'project') $projectid = $object->id;
 
-            $buttontoaddnewevent='';
+            $newcardbutton='';
 			if (! empty($conf->agenda->enabled))
 			{
-				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">';
-				$buttontoaddnewevent.= $langs->trans("AddEvent");
-				$buttontoaddnewevent.= '</a>';
+				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">'.$langs->trans("AddEvent");
+				$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+				$newcardbutton.= '</a>';
 			}
 
         	print '<!-- formactions->showactions -->'."\n";
-        	print load_fiche_titre($title, $buttontoaddnewevent, '', 0, 0, '', $morehtmlright);
+        	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
 
         	$page=0; $param='';
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 0e125a7b944..ae2d88d2b6f 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -469,6 +469,15 @@ class FormFile
 					$modellist=ModelePDFProduct::liste_modeles($this->db);
 				}
 			}
+			elseif ($modulepart == 'product_batch')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
+					$modellist=ModelePDFProductBatch::liste_modeles($this->db);
+				}
+			}
 			elseif ($modulepart == 'export')
 			{
 				if (is_array($genallowed)) $modellist=$genallowed;
@@ -586,7 +595,7 @@ class FormFile
 					$file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
 					$res=include_once $file;
 				}
-				$class='Modele'.ucfirst($modulepart);
+				$class='ModelePDF'.ucfirst($modulepart);
 				if (class_exists($class))
 				{
 					$modellist=call_user_func($class.'::liste_modeles',$this->db);
@@ -740,7 +749,7 @@ class FormFile
 
 					// Show file size
 					$size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_size($size).'</td>';
+					$out.= '<td align="right" class="nowrap">'.dol_print_size($size,1,1).'</td>';
 
 					// Show file date
 					$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
@@ -858,7 +867,7 @@ class FormFile
 		}
 		else
 		{
-			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir).'$/', $filedir, $regs);
+			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir,'/').'$/', $filedir, $regs);
 			$entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : $conf->entity);
 		}
 
@@ -981,6 +990,10 @@ class FormFile
 		global $user, $conf, $langs, $hookmanager;
 		global $sortfield, $sortorder, $maxheightmini;
 		global $dolibarr_main_url_root;
+		global $form;
+
+		$disablecrop=1;
+		if (in_array($modulepart, array('societe','product','produit','service','expensereport','holiday','member','project','ticketsup','user'))) $disablecrop=0;
 
 		// Define relative path used to store the file
 		if (empty($relativepath))
@@ -1025,6 +1038,12 @@ class FormFile
 		}
 		else
 		{
+			if (! is_object($form))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';		// The compoent may be included into ajax page that does not include the Form class
+				$form=new Form($this->db);
+			}
+
 			if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
 			$relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
 			if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
@@ -1152,7 +1171,15 @@ class FormFile
 					print "</td>\n";
 
 					// Size
-					print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>';
+					$sizetoshow = dol_print_size($file['size'],1,1);
+					$sizetoshowbytes = dol_print_size($file['size'],0,1);
+
+					print '<td align="right" width="80px">';
+					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
+					else {
+						print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
+					}
+					print '</td>';
 
 					// Date
 					print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
@@ -1233,9 +1260,6 @@ class FormFile
 							$newmodulepart=$modulepart;
 							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
 
-							$disablecrop=1;
-							if (in_array($modulepart, array('societe','product','produit','service','expensereport','holiday','member','project','ticketsup','user'))) $disablecrop=0;
-
 							if (! $disablecrop && image_format_supported($file['name']) > 0)
 							{
 								if ($permtoeditline)
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index b9043626c51..555ad503693 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015-2017 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2015-2017 Nicolas ZABOURI        <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,6 +82,9 @@ class FormMail extends Form
 	var $substit_lines=array();
 	var $param=array();
 
+	public $withtouser=array();
+	public $withtoccuser=array();
+
 	var $error;
 
 	public $lines_model;
@@ -624,6 +628,28 @@ class FormMail extends Form
 				$out.= "</td></tr>\n";
 			}
 
+			// To User
+			if (! empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+			{
+				$out.= '<tr><td>';
+				$out.= $langs->trans("MailToSalaries");
+				$out.= '</td><td>';
+
+				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+				$tmparray = $this->withtouser;
+				foreach($tmparray as $key => $val)
+				{
+					$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+				}
+				$withtoselected=GETPOST("receiveruser",'none');     // Array of selected value
+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+				{
+					$withtoselected = array_keys($tmparray);
+				}
+				$out.= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+				$out.= "</td></tr>\n";
+			}
+
 			// withoptiononeemailperrecipient
 			if (! empty($this->withoptiononeemailperrecipient))
 			{
@@ -668,6 +694,28 @@ class FormMail extends Form
 				$out.= "</td></tr>\n";
 			}
 
+			// To User cc
+			if (! empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+			{
+				$out.= '<tr><td>';
+				$out.= $langs->trans("MailToCCSalaries");
+				$out.= '</td><td>';
+
+				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+				$tmparray = $this->withtoccuser;
+				foreach($tmparray as $key => $val)
+				{
+					$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+				}
+				$withtoselected=GETPOST("receiverccuser",'none');     // Array of selected value
+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+				{
+					$withtoselected = array_keys($tmparray);
+				}
+				$out.= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+				$out.= "</td></tr>\n";
+			}
+
 			// CCC
 			if (! empty($this->withtoccc) || is_array($this->withtoccc))
 			{
@@ -1063,7 +1111,8 @@ class FormMail extends Form
 				elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
 				elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
 				elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); }
-
+				elseif (!empty($type_template))				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+				
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;
 				$ret->topic = '';
@@ -1208,20 +1257,22 @@ class FormMail extends Form
 					'__QUANTITY__' => $line->qty,
 					'__SUBPRICE__' => price($line->subprice),
 					'__AMOUNT__' => price($line->total_ttc),
-					'__AMOUNT_EXCL_TAX__' => price($line->total_ht),
-					//'__PRODUCT_EXTRAFIELD_FIELD__' Done dinamically just after
+					'__AMOUNT_EXCL_TAX__' => price($line->total_ht)
 				);
 
 				// Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
 				if (!empty($line->fk_product))
 				{
-					$extrafields = new ExtraFields($this->db);
-					$extralabels = $extrafields->fetch_name_optionals_label('product', true);
+					if (! is_object($extrafields)) $extrafields = new ExtraFields($this->db);
+					$extrafields->fetch_name_optionals_label('product', true);
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
 					$product->fetch_optionals();
-					foreach ($extrafields->attribute_label as $key => $label) {
-						$substit_line['__PRODUCT_EXTRAFIELD_' . strtoupper($key) . '__'] = $product->array_options['options_' . $key];
+					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
+					{
+						foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) {
+							$substit_line['__PRODUCT_EXTRAFIELD_' . strtoupper($key) . '__'] = $product->array_options['options_' . $key];
+						}
 					}
 				}
 				$this->substit_lines[] = $substit_line;
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 3f07066bf2e..fcc2ddf049c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -867,7 +867,7 @@ class FormOther
      *  @param	string		$morecss		More CSS
      *  @return	string
      */
-    function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='')
+    function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='valignmiddle widthauto')
     {
         print $this->selectyear($selected,$htmlname,$useempty,$min_year,$max_year,$offset,$invert,$option,$morecss);
     }
@@ -886,7 +886,7 @@ class FormOther
      *  @param	string	$morecss		More css
      *  @return	string
      */
-    function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='')
+    function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='valignmiddle widthauto')
     {
         $out='';
 
diff --git a/htdocs/core/class/html.formticketsup.class.php b/htdocs/core/class/html.formticketsup.class.php
index b86ebc95442..82ce12b8a03 100644
--- a/htdocs/core/class/html.formticketsup.class.php
+++ b/htdocs/core/class/html.formticketsup.class.php
@@ -113,10 +113,10 @@ class FormTicketsup
     /**
      * Show the form to input ticket
      *
-     * @param  string $width Width of form
+     * @param  int	 $withdolfichehead			With dol_fiche_head
      * @return void
      */
-    public function showForm($width = '100%')
+    public function showForm($withdolfichehead=0)
     {
         global $conf, $langs, $user, $hookmanager;
 
@@ -140,7 +140,9 @@ class FormTicketsup
 
         print "\n<!-- Begin form TICKETSUP -->\n";
 
-        print '<form method="post" name="ticketsup" id="form_create_ticket" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '">';
+        if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, '');
+
+        print '<form method="POST" '.($withdolfichehead?'':'style="margin-bottom: 30px;" ').'name="ticketsup" id="form_create_ticket" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '">';
         print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
         print '<input type="hidden" name="action" value="' . $this->action . '">';
         foreach ($this->param as $key => $value) {
@@ -148,8 +150,8 @@ class FormTicketsup
         }
         print '<input type="hidden" name="fk_user_create" value="' . $this->fk_user_create . '">';
 
-        print '<div class="tabBar tabBarWithBottom">';
-        print '<table class="border"  width="' . $width . '">';
+        dol_fiche_head('');
+        print '<table class="tableticket centpercent">';
 
 
         if ($this->withref) {
@@ -181,7 +183,7 @@ class FormTicketsup
                 print '<tr><td class="titlefield">' . $langs->trans("ThirdParty") . '</td><td>';
                 $events = array();
                 $events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-                print $form->select_company($this->withfromsocid, 'socid', '', 1, 1, '', $events);
+                print $form->select_company($this->withfromsocid, 'socid', '', 1, 1, '', $events, 0, 'minwidth200');
                 print '</td></tr>';
                 if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
                     $htmlname = 'socid';
@@ -270,7 +272,7 @@ class FormTicketsup
             dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
             $classname = ucfirst($subelement);
             $objectsrc = new $classname($this->db);
-            $objectsrc->fetch(GETPOST('originid'));
+            $objectsrc->fetch(GETPOST('originid','int'));
 
             if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
                 $objectsrc->fetch_lines();
@@ -297,9 +299,12 @@ class FormTicketsup
         print '</td></tr>';
 
         // Notify thirdparty at creation
-        print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>';
-        print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>';
-        print '</td></tr>';
+        if (empty($this->ispublic))
+        {
+	        print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>';
+        	print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>';
+        	print '</td></tr>';
+        }
 
         // TITLE
         if ($this->withtitletopic) {
@@ -385,16 +390,17 @@ class FormTicketsup
         }
 
         // Other attributes
-        if ($this->withextrafields == 1) {
-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $action); // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && !empty($extrafields->attribute_label)) {
-                print $ticketstat->showOptionals($extrafields, 'edit');
-            }
+        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $action); // Note that $action and $object may have been modified by hook
+        if (empty($reshook))
+        {
+            print $ticketstat->showOptionals($extrafields, 'edit');
         }
 
         print '</table>';
         print '</div>';
 
+        if ($withdolfichehead) dol_fiche_end();
+
         print '<center>';
         print '<input class="button" type="submit" name="add_ticket" value="' . $langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")) . '" />';
 
@@ -437,7 +443,7 @@ class FormTicketsup
 
         $ticketstat->loadCacheTypesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat select_tickettype'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select' . $htmlname . '" class="flat minwidth100'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
@@ -537,7 +543,7 @@ class FormTicketsup
 
         $ticketstat->loadCacheCategoriesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat select_ticketcategory'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select' . $htmlname . '" class="flat minwidth100'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
@@ -638,7 +644,7 @@ class FormTicketsup
 
         $ticketstat->loadCacheSeveritiesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat select_ticketseverity'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select' . $htmlname . '" class="flat minwidth150'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
@@ -858,7 +864,7 @@ class FormTicketsup
             // Destinataires
             print '<tr class="email_line"><td>' . $langs->trans('MailRecipients') . '</td><td colspan="2">';
             $ticketstat = new Ticketsup($this->db);
-            $res = $ticketstat->fetch('', $this->track_id);
+            $res = $ticketstat->fetch('', '', $this->track_id);
             if ($res) {
                 // Retrieve email of all contacts (internal and external)
                 $contacts = $ticketstat->getInfosTicketInternalContact();
@@ -881,7 +887,7 @@ class FormTicketsup
                     $ticketstat->socid = $ticketstat->fk_soc;
                     $ticketstat->fetch_thirdparty();
 
-                    if (!in_array($ticketstat->thirdparty->email, $sendto)) {
+                    if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
                         $sendto[] = $ticketstat->thirdparty->email . '(' . $langs->trans('Customer') . ')';
                     }
                 }
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 8fcdf53b4a6..f54caacff8b 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -502,7 +502,7 @@ class Ldap
 	 *	@param	string		$newrdn			New RDN entry key (uid=qqq)
 	 *	@param	string		$newparent		New parent (ou=xxx,dc=aaa,dc=bbb)
 	 *	@param	User			$user			Objet user that modify
-	 *	@param	bool			$deleteoldrdn	If TRUE the old RDN value(s) is removed, else the old RDN value(s) is retained as non-distinguished values of the entry.
+	 *	@param	bool			$deleteoldrdn	If true the old RDN value(s) is removed, else the old RDN value(s) is retained as non-distinguished values of the entry.
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
 	function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index a96f62e8cbc..c123356f9ab 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -124,6 +124,9 @@ class Menubase
           else dol_print_error($this->db);
         }
 
+        // TODO
+        // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
+
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
         $sql.= "menu_handler,";
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 1d3af953375..32a5842d410 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -753,7 +753,7 @@ function xml2php($xml)
         {
             //If this element is already in the array we will create an indexed array
             $tmp = $array[$key];
-            $array[$key] = NULL;
+            $array[$key] = null;
             $array[$key][] = $tmp;
             $array[$key][] = $child;
             $tab = true;
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index c4176d2b81b..417f175422f 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -647,7 +647,7 @@ class SMTPs
 	{
 		/**
 		 * Returns constructed SELECT Object string or boolean upon failure
-		 * Default value is set at TRUE
+		 * Default value is set at true
 		 */
 		$_retVal = true;
 
@@ -655,7 +655,7 @@ class SMTPs
 		if ( ! empty ($_strConfigPath) )
 		{
 			// If the path is not valid, this will NOT generate an error,
-			// it will simply return FALSE.
+			// it will simply return false.
 			if ( ! @include ( $_strConfigPath ) )
 			{
 				$this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.');
@@ -1410,7 +1410,7 @@ class SMTPs
 			$content = 'Content-Type: ' . $_msgData['mimeType'] . '; charset="' . $this->getCharSet() . '"' . "\r\n"
 			. 'Content-Transfer-Encoding: ' . $this->getTransEncodeType() . "\r\n"
 			. 'Content-Disposition: inline'  . "\r\n"
-			. 'Content-Description: message' . "\r\n";
+			. 'Content-Description: Message' . "\r\n";
 
 			if ( $this->getMD5flag() )
 			$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
@@ -1459,7 +1459,7 @@ class SMTPs
 						.  'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n"
 						.  'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n"
 						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Description: File Attachment' . "\r\n";
+						.  'Content-Description: ' . $_data['fileName'] ."\r\n";
 
 						if ( $this->getMD5flag() )
 						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
@@ -1756,7 +1756,7 @@ class SMTPs
 	{
 		/**
 		 * Returns constructed SELECT Object string or boolean upon failure
-		 * Default value is set at TRUE
+		 * Default value is set at true
 		 */
 		$_retVal = true;
 
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 0df169a3c3e..3602ae427bd 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -542,7 +542,7 @@ class Translate
 	 */
 	private function getTradFromKey($key)
 	{
-		global $db;
+		global $conf, $db;
 
 		if (! is_string($key)) return 'ErrorBadValueForParamNotAString';	// Avoid multiple errors with code not using function correctly.
 
@@ -576,6 +576,9 @@ class Translate
         	// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
             //$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
         }
+
+        if ($conf->global->MAIN_FEATURES_LEVEL >= 2) dol_syslog(__METHOD__." missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);
+
         return $newstr;
 	}
 
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index c349d35a16d..ecc27bf88dc 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -221,8 +221,8 @@ abstract class DoliDB implements Database
 	/**
 	 * Define sort criteria of request
 	 *
-	 * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda, t2.fieldb'
-	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC, DESC';
+	 * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
+	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
 	 * @return	string						String to provide syntax of a sort sql string
 	 */
 	function order($sortfield=null,$sortorder=null)
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 5523708a3a0..34e32fa5f99 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -24,7 +24,7 @@
 
 /**
  * GetFolders
- * 
+ *
  * @param	string	$resourceType		Resource type
  * @param 	string 	$currentFolder		Current folder
  * @return 	void
@@ -145,7 +145,7 @@ function CreateFolder( $resourceType, $currentFolder )
 		$sNewFolderName = $_GET['NewFolderName'] ;
 		$sNewFolderName = SanitizeFolderName($sNewFolderName);
 
-		if (strpos($sNewFolderName, '..') !== FALSE)
+		if (strpos($sNewFolderName, '..') !== false)
 			$sErrorNumber = '102' ;		// Invalid folder name.
 		else
 		{
@@ -187,7 +187,7 @@ function CreateFolder( $resourceType, $currentFolder )
 //function FileUpload( $resourceType, $currentFolder, $sCommand )
 /**
  * FileUpload
- * 
+ *
  * @param	string	$resourceType	Resource type
  * @param 	string 	$currentFolder	Current folder
  * @param	string	$sCommand		Command
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 7b2c57b42e3..2f08a1d7d24 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -31,7 +31,6 @@ if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
 if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index 0d8301c3b3b..cc08af7431f 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -21,10 +21,7 @@
  * \brief      File that include javascript functions (included if option use_javascript activated)
  */
 
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
 if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
 if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
 if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
 if (! defined('NOLOGIN'))         define('NOLOGIN',1);
@@ -32,7 +29,7 @@ if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
-session_cache_limiter(FALSE);
+session_cache_limiter(false);
 
 require_once '../../main.inc.php';
 
@@ -131,16 +128,35 @@ if ($conf->browser->layout != 'phone')
            ' . "\n";
 }
 
+// Code to manage reposition
 print "\n/* JS CODE TO ENABLE reposition management (does not work if a redirect is done after action of submission) */\n";
 print '
 			jQuery(document).ready(function() {
 				/* If page_y set, we set scollbar with it */
-				page_y=getParameterByName(\'page_y\', 0); if (page_y > 0) $(\'html, body\').scrollTop(page_y);
-				/* Set handler to add page_y param on some a href links */
+				page_y=getParameterByName(\'page_y\', 0);				/* search in GET parameter */
+				if (page_y == 0) page_y = jQuery("#page_y").text();		/* search in POST parameter that is filed at bottom of page */
+				if (page_y > 0)
+				{
+					console.log("page_y found is "+page_y);
+					$(\'html, body\').scrollTop(page_y);
+				}
+
+				/* Set handler to add page_y param on output (click on href links or submit button) */
 				jQuery(".reposition").click(function() {
-  	           		var page_y = $(document).scrollTop();
-  	           		this.href=this.href+\'&page_y=\'+page_y;
-  	           		console.log("We click on tag with .reposition class. this.ref is now "+this.href)
-		 		});
+					var page_y = $(document).scrollTop();
+					if (page_y > 0)
+					{
+						if (this.href)
+						{
+							this.href=this.href+\'&page_y=\'+page_y;
+							console.log("We click on tag with .reposition class. this.ref is now "+this.href);
+						}
+						else
+						{
+							console.log("We click on tag with .reposition class but element is not an <a> html tag, so we try to update form field page_y with value "+page_y);
+							jQuery("input[type=hidden][name=page_y]").val(page_y);
+						}
+					}
+				});
 			});'."\n";
 
diff --git a/htdocs/core/js/lib_gravatar.js.php b/htdocs/core/js/lib_gravatar.js.php
index bb850be8d5d..485a57ede88 100644
--- a/htdocs/core/js/lib_gravatar.js.php
+++ b/htdocs/core/js/lib_gravatar.js.php
@@ -33,7 +33,7 @@ if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
-session_cache_limiter(FALSE);
+session_cache_limiter(false);
 
 require_once '../../main.inc.php';
 
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 15dbc62ffa7..1aa9c458e39 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -24,10 +24,7 @@
  * 				JQuery (providing object $) and JQuery-UI (providing $datepicker) libraries must be loaded before this file.
  */
 
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
 if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
 if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
 if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
 if (! defined('NOLOGIN'))         define('NOLOGIN',1);
@@ -35,7 +32,7 @@ if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
-session_cache_limiter(FALSE);
+session_cache_limiter(false);
 
 require_once '../../main.inc.php';
 
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index ba725d3e226..6900e9b03e7 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * Library javascript to enable Browser notifications
  */
 
@@ -34,17 +34,17 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
     global $langs, $conf;
 
     top_httphead('text/javascript; charset=UTF-8');
-    
+
     $nowtime = time();
     //$nowtimeprevious = floor($nowtime / 60) * 60;   // auto_check_events_not_before is rounded to previous minute
 
     // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when.
     /* session already started into main
-    session_cache_limiter(FALSE);
+    session_cache_limiter(false);
     header('Cache-Control: no-cache');
     session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
     session_start();*/
-    if (! isset($_SESSION['auto_check_events_not_before'])) 
+    if (! isset($_SESSION['auto_check_events_not_before']))
     {
         print 'console.log("_SESSION[auto_check_events_not_before] is not set");'."\n";
         // Round to eliminate the seconds
@@ -65,9 +65,9 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
 	/* Launch timer */
    	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
     var time_first_execution = (time_auto_update - (nowtime - time_js_next_test)) * 1000;	//need milliseconds
-    if (login != '') { 
+    if (login != '') {
     	console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" auto_check_events_not_before (val in session)= "+auto_check_events_not_before+" time_js_next_test (max now,auto_check_events_not_before) = "+time_js_next_test+" time_auto_update="+time_auto_update);
-    	setTimeout(first_execution, time_first_execution); 
+    	setTimeout(first_execution, time_first_execution);
     } //first run auto check
 
 
@@ -88,13 +88,13 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
                 success: function (result) {
                     var arr = JSON.parse(result);
                     if (arr.length > 0) {
-                    	var audio = null; 
+                    	var audio = null;
                         <?php
                         if (! empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
                             print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
                         }
                         ?>
-    
+
                         $.each(arr, function (index, value) {
                             var url="notdefined";
                             var title="Not defined";
@@ -102,7 +102,7 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
                             if (value['type'] == 'agenda' && value['location'] != null && value['location'] != '') {
                                 body += '\n' + value['location'];
                             }
-    
+
                             if (value['type'] == 'agenda')
                             {
                              	url = '<?php echo DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value['id'];
@@ -113,10 +113,10 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
                                 body: body,
                                 tag: value['id']
                             };
-    
+
                             // We release the notify
                             var noti = new Notification(title, extra);
-                            if (index==0 && audio) 
+                            if (index==0 && audio)
                             {
                             	audio.play();
                             }
@@ -140,5 +140,5 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
         time_js_next_test += time_auto_update;
 		console.log('Updated time_js_next_test. New value is '+time_js_next_test);
     }
-<?php 
+<?php
 }
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index 8342ac9e3ac..f93bb3410f2 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -21,10 +21,7 @@
  * \brief      File that include javascript functions for timepicker
  */
 
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
 if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
 if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
 if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
 if (! defined('NOLOGIN'))         define('NOLOGIN',1);
@@ -32,7 +29,7 @@ if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
-session_cache_limiter(FALSE);
+session_cache_limiter(false);
 
 require_once '../../main.inc.php';
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 845a758703e..3c308c2c12d 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -407,7 +407,8 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 					},
 					escapeMarkup: function(markup) {
 						return markup;
-					}
+					},
+					dropdownCssClass: \'ui-dialog\'
 				})';
 	if ($forcefocus) $msg.= '.select2(\'focus\')';
 	$msg.= ';'."\n";
diff --git a/htdocs/core/lib/assets.lib.php b/htdocs/core/lib/asset.lib.php
similarity index 83%
rename from htdocs/core/lib/assets.lib.php
rename to htdocs/core/lib/asset.lib.php
index cc9ea922854..460d368f2c4 100644
--- a/htdocs/core/lib/assets.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -17,7 +17,7 @@
 
 /**
  * \file    core/lib/assets.lib.php
- * \ingroup assets
+ * \ingroup asset
  * \brief   Library files with common functions for Assets
  */
 
@@ -35,7 +35,7 @@ function AssetsAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/assets/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
@@ -43,19 +43,19 @@ function AssetsAdminPrepareHead()
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	//$this->tabs = array(
-	//	'entity:+tabname:Title:@assets:/assets/mypage.php?id=__ID__'
+	//	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'
 	//); // to add new tab
 	//$this->tabs = array(
-	//	'entity:-tabname:Title:@assets:/assets/mypage.php?id=__ID__'
+	//	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
 	//); // to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin');
 
-	$head[$h][0] = DOL_URL_ROOT . '/assets/admin/assets_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/assets/admin/assets_type_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_type_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
 	$head[$h][2] = 'attributes_type';
 	$h++;
@@ -74,7 +74,7 @@ function AssetsPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/assets/card.php';
+	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php';
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -94,7 +94,7 @@ function AssetsPrepareHead()
 	$upload_dir = $conf->assets->dir_output . '/' . get_exdir($filename,2,0,1,$object,'assets'). '/'. dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
 	$nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/assets/document.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
 	$head[$h][2] = 'documents';
@@ -103,18 +103,18 @@ function AssetsPrepareHead()
 	$nbNote = 0;
 	if(!empty($object->note_private)) $nbNote++;
 	if(!empty($object->note_public)) $nbNote++;
-	$head[$h][0] = DOL_URL_ROOT.'/assets/note.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Notes");
 	if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 	$head[$h][2] = 'note';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/assets/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/asset/info.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'asset', 'remove');
 
 	return $head;
 }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 320b8cc1b63..ea91c4796d2 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2015       Frederic France         <frederic.france@free.fr>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2017       Rui Strecht			    <rui.strecht@aliartalentos.com>
+ * Copyright (C) 2018       Ferran Marcet		    <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -724,17 +725,16 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
     {
         $langs->load("projects");
 
-        $buttoncreate='';
+        $newcardbutton='';
         if (! empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink))
         {
-            //$buttoncreate='<a class="butAction" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
-			$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject");
-			if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($langs->trans("AddProject"),'filenew');
-			$buttoncreate.='</a>'."\n";
+			$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject");
+			$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+			$newcardbutton.= '</a>';
         }
 
         print "\n";
-        print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $buttoncreate.$morehtmlright, '');
+        print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $newcardbutton.$morehtmlright, '');
         print '<div class="div-table-responsive">';
         print "\n".'<table class="noborder" width=100%>';
 
@@ -921,18 +921,19 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     $contactstatic->fields = dol_sort_array($contactstatic->fields, 'position');
     $arrayfields = dol_sort_array($arrayfields, 'position');
 
-    $buttoncreate='';
+    $newcardbutton='';
     if ($user->rights->societe->contact->creer)
     {
     	$addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
-		$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$addcontact;
-		$buttoncreate.='</a>'."\n";
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$addcontact;
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
     }
 
     print "\n";
 
     $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));
-    print load_fiche_titre($title, $buttoncreate,'');
+    print load_fiche_titre($title, $newcardbutton,'');
 
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -953,6 +954,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     if ($search_name != '')   $param.='&search_name='.urlencode($search_name);
     if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
     // Add $param from extra fields
+    $extrafieldsobjectkey=$contactstatic->table_element;
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
     $sql = "SELECT t.rowid, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste, t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.skype, t.statut, t.photo,";
@@ -963,6 +965,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     if ($search_status!='' && $search_status != '-1') $sql .= " AND t.statut = ".$db->escape($search_status);
     if ($search_name) $sql .= natural_search(array('t.lastname', 't.firstname'), $search_name);
     // Add where from extra fields
+    $extrafieldsobjectkey=$contactstatic->table_element;
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
     if ($sortfield == "t.name") $sql.=" ORDER BY t.lastname $sortorder, t.firstname $sortorder";
     else $sql.= " ORDER BY $sortfield $sortorder";
@@ -991,6 +994,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     	}
     }
     // Extra fields
+    $extrafieldsobjectkey=$contactstatic->table_element;
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
     // Fields from hook
@@ -1017,9 +1021,10 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
     }
     // Extra fields
+    $extrafieldsobjectkey=$contactstatic->table_element;
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
     // Hook fields
-    $parameters=array('arrayfields'=>$arrayfields);
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
     $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],'','','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
@@ -1110,7 +1115,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             }
 
             // Extra fields
-            $extrafieldsobjectkey='socpeople';
+            $extrafieldsobjectkey=$contactstatic->table_element;
             include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
             // Actions
@@ -1171,14 +1176,16 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 	$addressstatic = new Address($db);
 	$num = $addressstatic->fetch_lines($object->id);
 
-	$buttoncreate='';
+	$newcardbutton='';
 	if ($user->rights->societe->creer)
 	{
-		$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/comm/address.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddAddress").' '.img_picto($langs->trans("AddAddress"),'filenew').'</a>'."\n";
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/address.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddAddress");
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	print "\n";
-	print load_fiche_titre($langs->trans("AddressesForCompany"),$buttoncreate,'');
+	print load_fiche_titre($langs->trans("AddressesForCompany"),$newcardbutton,'');
 
 	print "\n".'<table class="noborder" width="100%">'."\n";
 
@@ -1545,7 +1552,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 		$out.=getTitleFieldOfList($langs->trans("Label"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
         $out.=getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);
 		$out.=getTitleFieldOfList('');
-		$out.=getTitleFieldOfList('');
+		$out.=getTitleFieldOfList($langs->trans("ActionOnContact"), 0, $_SERVER["PHP_SELF"], 'a.fk_contact', '', $param, '', $sortfield, $sortorder);
 		$out.=getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);
 		$out.=getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
 		$out.='</tr>';
@@ -1693,7 +1700,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             $out.='</td>';
 
             // Contact pour cette action
-            if (! empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
+            if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
             {
                 $contactstatic->lastname=$histo[$key]['lastname'];
                 $contactstatic->firstname=$histo[$key]['firstname'];
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 264bb748762..ee3b575d5d1 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -583,56 +583,70 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $
 		{
 			$countryfound=1;
 
-			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1)   $ferie=true; // 1er janvier
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1er mai
-			if($jour == 8 && $mois == 5)   $ferie=true; // 5 mai
-			if($jour == 14 && $mois == 7)  $ferie=true; // 14 juillet
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 aout
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 novembre
-			if($jour == 11 && $mois == 11) $ferie=true; // 11 novembre
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
+			// Definition of fixed working days
+			if($jour == 1 && $mois == 1)   $ferie=true; // 1er january
+			if($jour == 1 && $mois == 5)   $ferie=true; // 1er may
+			if($jour == 8 && $mois == 5)   $ferie=true; // 5 may
+			if($jour == 14 && $mois == 7)  $ferie=true; // 14 july
+			if($jour == 15 && $mois == 8)  $ferie=true; // 15 august
+			if($jour == 1 && $mois == 11)  $ferie=true; // 1 november
+			if($jour == 11 && $mois == 11) $ferie=true; // 11 november
+			if($jour == 25 && $mois == 12) $ferie=true; // 25 december
 
-			// Calcul du jour de paques
+			// Calculation for easter date
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
 			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
-			// Paques
+			// Pâques
 
-			// Calcul du jour de l ascension (38 jours apres Paques)
+			// Calculation for the monday of easter date
+            $date_lundi_paques = mktime(
+                date("H", $date_paques),
+                date("i", $date_paques),
+                date("s", $date_paques),
+                date("m", $date_paques),
+                date("d", $date_paques) + 1,
+                date("Y", $date_paques)
+            );
+			$jour_lundi_ascension = date("d", $date_lundi_paques);
+			$mois_lundi_ascension = date("m", $date_lundi_paques);
+			if($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie=true;
+			// Lundi de Pâques
+
+			// Calcul du jour de l'ascension (38 days after easter day)
             $date_ascension = mktime(
                 date("H", $date_paques),
                 date("i", $date_paques),
                 date("s", $date_paques),
                 date("m", $date_paques),
-                date("d", $date_paques) + 38,
+                date("d", $date_paques) + 39,
                 date("Y", $date_paques)
             );
 			$jour_ascension = date("d", $date_ascension);
 			$mois_ascension = date("m", $date_ascension);
 			if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
-			//Ascension
+			// Ascension
 
-			// Calcul de Pentecote (11 jours apres Paques)
+			// Calculation of "Pentecote" (11 days after easter day)
             $date_pentecote = mktime(
-                date("H", $date_ascension),
-                date("i", $date_ascension),
-                date("s", $date_ascension),
-                date("m", $date_ascension),
-                date("d", $date_ascension) + 11,
-                date("Y", $date_ascension)
+                date("H", $date_paques),
+                date("i", $date_paques),
+                date("s", $date_paques),
+                date("m", $date_paques),
+                date("d", $date_paques) + 49,
+                date("Y", $date_paques)
             );
 			$jour_pentecote = date("d", $date_pentecote);
 			$mois_pentecote = date("m", $date_pentecote);
 			if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
-			//Pentecote
+			// "Pentecote"
 
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
 			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
-			//Samedi (6) et dimanche (0)
+			// Samedi (6) et dimanche (0)
 		}
 
 		// Pentecoste and Ascensione in Italy go to the sunday after: isn't holiday.
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 6ea633f1f1d..744a1326e69 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -454,6 +454,18 @@ function dol_is_file($pathoffile)
 	return is_file($newpathoffile);
 }
 
+/**
+ * Return if path is a symbolic link
+ *
+ * @param   string		$pathoffile		Path of file
+ * @return  boolean     			    True or false
+ */
+function dol_is_link($pathoffile)
+{
+	$newpathoffile=dol_osencode($pathoffile);
+	return is_link($newpathoffile);
+}
+
 /**
  * Return if path is an URL
  *
@@ -1139,7 +1151,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 	if (preg_match('/\.\./',$file) || preg_match('/[<>|]/',$file))
 	{
 		dol_syslog("Refused to delete file ".$file, LOG_WARNING);
-		return False;
+		return false;
 	}
 
 	if (empty($nohook))
@@ -1238,7 +1250,7 @@ function dol_delete_dir($dir,$nophperrors=0)
 	if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
 	{
 		dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
-		return False;
+		return false;
 	}
 
 	$dir_osencoded=dol_osencode($dir);
@@ -1949,7 +1961,7 @@ function dol_uncompress($inputfile,$outputdir)
 		dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
 		$zip = new ZipArchive;
 		$res = $zip->open($inputfile);
-		if ($res === TRUE)
+		if ($res === true)
 		{
 			$zip->extractTo($outputdir.'/');
 			$zip->close();
@@ -2625,6 +2637,17 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
 	}
 
+	// Wrapping pour les lots produits
+	else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
+	{
+		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+	}
+
 	// Wrapping pour les contrats
 	else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a1b9c2d2c2c..123334eee25 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) 2000-2007	Rodolphe Quiedeville			<rodolphe@quiedeville.org>
  * Copyright (C) 2003		Jean-Louis Bergamo			<jlb@j1b.org>
- * Copyright (C) 2004-2013	Laurent Destailleur			<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2018	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Sebastien Di Cintio			<sdicintio@ressource-toi.org>
  * Copyright (C) 2004		Benoit Mortier				<benoit.mortier@opensides.be>
  * Copyright (C) 2004		Christophe Combelles			<ccomb@free.fr>
  * Copyright (C) 2005-2017	Regis Houssin				<regis.houssin@capnetworks.com>
  * Copyright (C) 2008		Raphael Bertrand (Resultic)	<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2016	Juanjo Menent				<jmenent@2byte.es>
+ * Copyright (C) 2010-2018	Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2013		Cédric Salvador				<csalvador@gpcsolutions.fr>
  * Copyright (C) 2013-2017	Alexandre Spangaro			<aspangaro@zendsi.com>
  * Copyright (C) 2014		Cédric GROSS					<c.gross@kreiz-it.fr>
@@ -272,7 +272,7 @@ function GETPOSTISSET($paramname)
  *  @param	string	$noreplace	 Force disable of replacement of __xxx__ strings.
  *  @return string|string[]      Value found (string or array), or '' if check fails
  */
-function GETPOST($paramname, $check='none', $method=0, $filter=NULL, $options=NULL, $noreplace=0)
+function GETPOST($paramname, $check='none', $method=0, $filter=null, $options=null, $noreplace=0)
 {
 	global $mysoc,$user,$conf;
 
@@ -542,6 +542,13 @@ function GETPOST($paramname, $check='none', $method=0, $filter=NULL, $options=NU
 				if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
 			}
 			break;
+		case 'aZ09comma':		// great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh
+			if (! is_array($out))
+			{
+				$out=trim($out);
+				if (preg_match('/[^a-z0-9_\-\.,]+/i',$out)) $out='';
+			}
+			break;
 		case 'array':
 			if (! is_array($out) || empty($out)) $out=array();
 			break;
@@ -574,12 +581,12 @@ function GETPOST($paramname, $check='none', $method=0, $filter=NULL, $options=NU
 		{
 			//var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]);
 
-			// We save search key only if:
-			// - not empty, or
-			// - if value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
+			// We save search key only if $out not empty that means:
+			// - posted value not empty, or
+			// - if posted value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
 
 			//if (! empty($out) || ! empty($user->default_values[$relativepathstring]['filters'][$paramname]))
-			if (! empty($out))
+			if ($out != '')		// $out = '0' like 'abc' is a search criteria to keep
 			{
 				$user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
 			}
@@ -939,7 +946,7 @@ function dol_escape_js($stringtoescape, $mode=0, $noescapebackslashn=0)
  *  @param		int			$keepb				1=Preserve b tags (otherwise, remove them)
  *  @param      int         $keepn              1=Preserve \r\n strings (otherwise, replace them with escaped value)
  *  @return     string     				 		Escaped string
- *  @see		dol_string_nohtmltag
+ *  @see		dol_string_nohtmltag, dol_string_nospecial, dol_string_unaccent
  */
 function dol_escape_htmltag($stringtoescape, $keepb=0, $keepn=0)
 {
@@ -2015,7 +2022,7 @@ function dol_now($mode='gmt')
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$tzsecond=getServerTimeZoneInt('now');    // Contains tz+dayling saving time
-		$ret=(int) dol_now('gmt')+($tzsecond*3600);
+		$ret=(int) (dol_now('gmt')+($tzsecond*3600));
 	}
 	/*else if ($mode == 'tzref')				// Time for now with parent company timezone is added
 	{
@@ -2028,7 +2035,7 @@ function dol_now($mode='gmt')
 		//print 'time: '.time().'-'.mktime().'-'.gmmktime();
 		$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
 		$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
-		$ret=(int) dol_now('gmt')+($offsettz+$offsetdst);
+		$ret=(int) (dol_now('gmt')+($offsettz+$offsetdst));
 	}
 
 	return $ret;
@@ -2040,7 +2047,7 @@ function dol_now($mode='gmt')
  *
  * @param	int		$size		Size to print
  * @param	int		$shortvalue	Tell if we want long value to use another unit (Ex: 1.5Kb instead of 1500b)
- * @param	int		$shortunit	Use short value of size unit
+ * @param	int		$shortunit	Use short label of size unit (for example 'b' instead of 'bytes')
  * @return	string				Link
  */
 function dol_print_size($size,$shortvalue=0,$shortunit=0)
@@ -3089,7 +3096,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		$pictowithoutext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
 
 		//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
-		if (empty($srconly) && in_array($pictowithoutext, array('bank', 'delete', 'edit', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'switch_off', 'switch_on', 'unlink', 'uparrow'))) {
+		if (empty($srconly) && in_array($pictowithoutext, array(
+				'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
+				'switch_off', 'switch_on', 'unlink', 'uparrow')
+			)) {
 			$fakey = $pictowithoutext;
 			$facolor = '';
 			$fasize = '';
@@ -3115,6 +3125,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				$fakey = 'fa-bank';
 				$facolor = '#444';
 			}
+			elseif ($pictowithoutext == 'close_title') {
+				$fakey = 'fa-window-close';
+			}
 			elseif ($pictowithoutext == 'delete') {
 				$fakey = 'fa-trash';
 				$facolor = '#444';
@@ -3123,6 +3136,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				$fakey = 'fa-pencil';
 				$facolor = '#444';
 			}
+			elseif ($pictowithoutext == 'filter') {
+				$fakey = 'fa-'.$pictowithoutext;
+			}
+			elseif ($pictowithoutext == 'grip_title' || $pictowithoutext == 'grip') {
+				$fakey = 'fa-arrows';
+			}
 			elseif ($pictowithoutext == 'printer') {
 				$fakey = 'fa-print';
 				$fasize = '1.2em';
@@ -3894,16 +3913,20 @@ function dol_print_error($db='',$error='',$errors=null)
  * @param   string  $errormessage   Complete error message
  * @param	array	$errormessages	Array of error messages
  * @param	string	$morecss		More css
+ * @param	string	$email			Email
  * @return	void
  */
-function dol_print_error_email($prefixcode, $errormessage='', $errormessages=array(), $morecss='error')
+function dol_print_error_email($prefixcode, $errormessage='', $errormessages=array(), $morecss='error', $email='')
 {
 	global $langs,$conf;
 
+	if (empty($email)) $email=$conf->global->MAIN_INFO_SOCIETE_MAIL;
+
 	$langs->load("errors");
 	$now=dol_now();
+
 	print '<br><div class="center login_main_message"><div class="'.$morecss.'">';
-	print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d'));
+	print $langs->trans("ErrorContactEMail", $email, $prefixcode.dol_print_date($now,'%Y%m%d'));
 	if ($errormessage) print '<br><br>'.$errormessage;
 	if (is_array($errormessages) && count($errormessages))
 	{
@@ -3941,7 +3964,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
  *	@param	string	$name        		Translation key of field
  *	@param	int		$thead		 		0=To use with standard table format, 1=To use inside <thead><tr>, 2=To use with <div>
  *	@param	string	$file        		Url used when we click on sort picto
- *	@param	string	$field       		Field to use for new sorting. Empty if this field is not sortable.
+ *	@param	string	$field       		Field to use for new sorting. Empty if this field is not sortable. Example "t.abc" or "t.abc,t.def"
  *	@param	string	$begin       		("" by defaut)
  *	@param	string	$moreparam   		Add more parameters on sort url links ("" by default)
  *	@param  string	$moreattrib  		Add more attributes on th ("" by defaut, example: 'align="center"'). To add more css class, use param $prefix.
@@ -3982,16 +4005,31 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 		$options=preg_replace('/&+/i','&',$options);
 		if (! preg_match('/^&/',$options)) $options='&'.$options;
 
-		if ($field1 != $sortfield1) // We are on another field
+		$sortordertouseinlink='';
+		if ($field1 != $sortfield1) // We are on another field than current sorted field
 		{
-			if (preg_match('/^DESC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-			else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+			if (preg_match('/^DESC/i', $sortorder))
+			{
+				$sortordertouseinlink.=str_repeat('desc,', count(explode(',',$field)));
+			}
+			else		// We reverse the var $sortordertouseinlink
+			{
+				$sortordertouseinlink.=str_repeat('asc,', count(explode(',',$field)));
+			}
 		}
-		else                      // We are of first sorting criteria
+		else                        // We are on field that is the first current sorting criteria
 		{
-			if (preg_match('/^ASC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
-			else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
+			if (preg_match('/^ASC/i', $sortorder))	// We reverse the var $sortordertouseinlink
+			{
+				$sortordertouseinlink.=str_repeat('desc,', count(explode(',',$field)));
+			}
+			else
+			{
+				$sortordertouseinlink.=str_repeat('asc,', count(explode(',',$field)));
+			}
 		}
+		$sortordertouseinlink=preg_replace('/,$/', '', $sortordertouseinlink);
+		$out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'">';
 	}
 
 	if ($tooltip) $out.=$form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
@@ -4092,12 +4130,11 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
 
 	$return='';
 
-	if ($picto == 'setup') $picto='title.png';
-	if (($conf->browser->name == 'ie') && $picto=='title.png') $picto='title.gif';
+	if ($picto == 'setup') $picto='title_generic.png';
 
 	$return.= "\n";
 	$return.= '<table '.($id?'id="'.$id.'" ':'').'summary="" class="centpercent notopnoleftnoright'.($morecssontable?' '.$morecssontable:'').'" style="margin-bottom: 2px;"><tr>';
-	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'class="valignmiddle widthpictotitle" id="pictotitle"', $pictoisfullpath).'</td>';
+	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">'.img_picto('',$picto, 'class="valignmiddle widthpictotitle" id="pictotitle"', $pictoisfullpath).'</td>';
 	$return.= '<td class="nobordernopadding" valign="middle">';
 	$return.= '<div class="titre">'.$titre.'</div>';
 	$return.= '</td>';
@@ -4163,7 +4200,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	// Left
 	//if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
 	print '<td class="nobordernopadding valignmiddle">';
-	if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
+	if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh widthpictotitle" id="pictotitle"', $pictoisfullpath);
 	print '<div class="titre inline-block">'.$titre;
 	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print ' ('.$totalnboflines.')';
 	print '</div></td>';
@@ -4635,7 +4672,8 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 
 		if ($local == 2)
 		{
-			if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
+			//if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
+			if (! $mysoc->localtax2_assuj) return 0;		// If main vat is 0, IRPF may be different than 0.
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (! $thirdparty_buyer->localtax2_assuj) return 0;
@@ -4690,7 +4728,11 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 			}
 			else  // i am the seller
 			{
-				if (!isOnlyOneLocalTax($local))  // This is for spain only, we don't return value found into datbase even if there is only one locatax vat.
+				if (in_array($mysoc->country_code, array('ES')))
+				{
+					return $thirdparty_buyer->localtax2_value;
+				}
+				else
 				{
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
 				}
@@ -4872,50 +4914,16 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		$obj = $db->fetch_object($resql);
 		if ($local == 1)
 		{
-			if (! isOnlyOneLocalTax(1))
-			{
-				return array($obj->localtax1_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-			}
-			else
-			{
-				return array($obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
-			}
+			return array($obj->localtax1_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 		}
 		elseif ($local == 2)
 		{
-			if (! isOnlyOneLocalTax(2))
-			{
-				return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller),$obj->accountancy_code_sell, $obj->accountancy_code_buy);
-			}
-			else
-			{
-				return array($obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
-			}
+			return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller),$obj->accountancy_code_sell, $obj->accountancy_code_buy);
 		}
 		else
 		{
-			if(! isOnlyOneLocalTax(1))
-			{
-				if(! isOnlyOneLocalTax(2))
-				{
-					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell,$obj->accountancy_code_buy);
-				}
-				else
-				{
-					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-				}
-			}
-			else
-			{
-				if(! isOnlyOneLocalTax(2))
-				{
-					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-				}
-				else
-				{
-					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-				}
-			}
+			return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell,$obj->accountancy_code_buy);
+
 		}
 	}
 
@@ -5311,7 +5319,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 		// TODO
 		// We will enhance here a common way of forging path for document storage
 		// Here, object->id, object->ref and modulepart are required.
-		if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice','shipment')))
+		if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice','shipment','expensereport')))
 		{
 			$path=($object->ref?$object->ref:$object->id);
 		}
@@ -5792,7 +5800,7 @@ function dol_concatdesc($text1,$text2,$forxml=false)
  */
 function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $object=null)
 {
-	global $db, $conf, $mysoc, $user;
+	global $db, $conf, $mysoc, $user, $extrafields;
 
 	$substitutionarray=array();
 
@@ -5964,11 +5972,17 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 			// Create dynamic tags for __EXTRAFIELD_FIELD__
 			if ($object->table_element && $object->id > 0)
 			{
-				$extrafieldstmp = new ExtraFields($db);
-				$extralabels = $extrafieldstmp->fetch_name_optionals_label($object->table_element, true);
-				$object->fetch_optionals();
-				foreach ($extrafieldstmp->attribute_label as $key => $label) {
-					$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
+				if (! is_object($extrafields)) $extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($object->table_element, true);
+
+				if ($object->fetch_optionals() > 0)
+				{
+					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
+					{
+						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
+							$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
+						}
+					}
 				}
 			}
 
@@ -6002,14 +6016,15 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 		$substitutionarray['__AMOUNT__']          = is_object($object)?$object->total_ttc:'';
 		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object)?$object->total_ht:'';
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
- 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object)?($object->total_localtax1?$object->total_localtax1:$object->total_localtax1):'';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object)?($object->total_localtax2?$object->total_localtax2:$object->total_localtax2):'';
-
-		/* TODO Add key for multicurrency
+ 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object)?$object->total_localtax1:'';
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object)?$object->total_localtax2:'';
     	$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object)?price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
 		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object)?price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
         $substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object)?($object->total_vat?price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency_code):price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency_code)):'';
-		*/
+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object)?price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object)?price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
+        // TODO Add keys for foreign multicurrency
+
 		// For backward compatibility
 		if ($onlykey != 2)
 		{
@@ -6167,7 +6182,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 			{
 				$module=$reg[1];
 
-				dol_syslog("Library functions_".$substitfile['name']." found into ".$dir);
+				dol_syslog("Library ".$substitfile['name']." found into ".$dir);
 				// Include the user's functions file
 				require_once $dir.$substitfile['name'];
 				// Call the user's function, and only if it is defined
@@ -6240,7 +6255,7 @@ function dolGetFirstLastname($firstname,$lastname,$nameorder=-1)
 
 	$ret='';
 	// If order not defined, we use the setup
-	if ($nameorder < 0) $nameorder=(empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION));
+	if ($nameorder < 0) $nameorder=$conf->global->MAIN_FIRSTNAME_NAME_POSITION;
 	if ($nameorder && ((string) $nameorder != '2'))
 	{
 		$ret.=$firstname;
@@ -6542,7 +6557,7 @@ function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensiti
 			else
 			{
 				($case_sensitive) ? natsort($temp) : natcasesort($temp);
-				if($order!='asc') $temp=array_reverse($temp,TRUE);
+				if($order!='asc') $temp=array_reverse($temp, true);
 			}
 
 			$sorted = array();
@@ -6896,6 +6911,10 @@ function printCommonFooter($zone='private')
 	if ($zone == 'private') print "\n".'<!-- Common footer for private page -->'."\n";
 	else print "\n".'<!-- Common footer for public page -->'."\n";
 
+	// A div to store page_y POST parameter so we can read it using javascript
+	print "\n<!-- A div to store page_y POST paramater -->\n";
+	print '<div id="page_y" style="display: none;">'.$_POST['page_y'].'</div>'."\n";
+
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printCommonFooter',$parameters);    // Note that $action and $object may have been modified by some hooks
 	if (empty($reshook))
@@ -7144,6 +7163,28 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 					$i2++;	// a criteria was added to string
 				}
 			}
+			else if ($mode == 4)
+			{
+			    $tmparray=explode(',',trim($crit));
+
+			    if (count($tmparray))
+			    {
+			        $listofcodes='';
+
+			        foreach($tmparray as $val)
+			        {
+			            if ($val)
+			            {
+			                $newres .= ($i2 > 0 ? ' OR (' : '(') . $field . ' LIKE \'' . $db->escape(trim($val)) . ',%\'';
+			                $newres .= ' OR '. $field . ' = \'' . $db->escape(trim($val)) . '\'';
+			                $newres .= ' OR '. $field . ' LIKE \'%,' . $db->escape(trim($val)) . '\'';
+			                $newres .= ' OR '. $field . ' LIKE \'%,' . $db->escape(trim($val)) . ',%\'';
+					$newres .= ')';
+			                $i2++;
+			            }
+			        }
+			    }
+			}
 			else    // $mode=0
 			{
 				$textcrit = '';
@@ -7201,10 +7242,10 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 }
 
 /**
- * Return string with full Url
+ * Return string with full Url. The file qualified is the one defined by relative path in $object->last_main_doc
  *
- * @param   Object	$object		Object
- * @return	string				Url string
+ * @param   Object	$object				Object
+ * @return	string						Url string
  */
 function showDirectDownloadLink($object)
 {
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index dc223f58ec3..0b8d42f3a9e 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2268,6 +2268,9 @@ function getModuleDirForApiClass($module)
     elseif ($module == 'ficheinter' || $module == 'interventions') {
     	$moduledirforclass = 'fichinter';
     }
+    elseif ($module == 'tickets') {
+    	$moduledirforclass = 'ticketsup';
+    }
 
     return $moduledirforclass;
 }
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 2a45a71c4c9..418cc1418b5 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -65,8 +65,8 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
     //turning off the server and peer verification(TrustManager Concept).
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
     curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
     curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 1fec9c1b024..8187c15f684 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -63,7 +63,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir='
     		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
     		return -2;
     	}
-    	if (! preg_match('/^(integer|date|timestamp|varchar|double)/', $addfieldentry['type']))
+    	if (! preg_match('/^(integer|date|timestamp|varchar|double|html|price)/', $addfieldentry['type']))
     	{
     		setEventMessages($langs->trans('BadFormatForType', $objectname), null, 'errors');
     		return -2;
@@ -260,6 +260,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='',
             $type = $val['type'];
             $type = preg_replace('/:.*$/', '', $type);		// For case type = 'integer:Societe:societe/class/societe.class.php'
             if ($type == 'html') $type = 'text';            // html modulebuilder type is a text type in database
+            if ($type == 'price') $type = 'double';            // html modulebuilder type is a text type in database
             $texttoinsert.= "\t".$key." ".$type;
             if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
             if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 43f5aaaf579..b0cda2ecd6a 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -119,23 +119,21 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 		define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
 	}
 
-	if (! empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->MAIN_DISABLE_FPDI))
-		return "Error MAIN_USE_FPDF and MAIN_DISABLE_FPDI can't be set together";
+	// Load TCPDF
+	require_once TCPDF_PATH.'tcpdf.php';
 
-	// We use by default TCPDF else FPDF
-	if (empty($conf->global->MAIN_USE_FPDF)) require_once TCPDF_PATH.'tcpdf.php';
-	else require_once FPDF_PATH.'fpdf.php';
-
-	// We need to instantiate tcpdi or fpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
-    if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
-	else if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once FPDI_PATH.'fpdi.php';
+	// We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
+	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
 
 	//$arrayformat=pdf_getFormat();
 	//$format=array($arrayformat['width'],$arrayformat['height']);
 	//$metric=$arrayformat['unit'];
 
+	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format);
+	else $pdf = new TCPDF($pagetype,$metric,$format);
+
 	// Protection and encryption of pdf
-	if (empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->PDF_SECURITY_ENCRYPTION))
+	if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
 	{
 		/* Permission supported by TCPDF
 		- print : Print the document;
@@ -148,81 +146,48 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 		- print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.
 		- owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.
 		*/
-		if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format);
-		else if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
-		else $pdf = new TCPDF($pagetype,$metric,$format);
+
 		// For TCPDF, we specify permission we want to block
-		$pdfrights = array('modify','copy');
+		$pdfrights = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true):array('modify','copy')); // Json format in llx_const
 
-		$pdfuserpass = ''; // Password for the end user
-		$pdfownerpass = NULL; // Password of the owner, created randomly if not defined
-		$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass);
-	}
-	else
-	{
-		if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format);
-		else if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
-		else $pdf = new TCPDF($pagetype,$metric,$format);
-	}
+		// Password for the end user
+		$pdfuserpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_USERPASS:'');
 
-	// If we use FPDF class, we may need to add method writeHTMLCell
-	if (! empty($conf->global->MAIN_USE_FPDF) && ! method_exists($pdf, 'writeHTMLCell'))
-	{
-		// Declare here a class to overwrite FPDI to add method writeHTMLCell
-		/**
-		 *	This class is an enhanced FPDI class that support method writeHTMLCell
-		 */
-		class FPDI_DolExtended extends FPDI
-        {
-			/**
-			 * __call
-			 *
-			 * @param 	string	$method		Method
-			 * @param 	mixed	$args		Arguments
-			 * @return 	void
-			 */
-			public function __call($method, $args)
-			{
-				if (isset($this->$method)) {
-					$func = $this->$method;
-					$func($args);
-				}
-			}
+		// Password of the owner, created randomly if not defined
+		$pdfownerpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS:null);
 
-			/**
-			 * writeHTMLCell
-			 *
-			 * @param	int		$w				Width
-			 * @param 	int		$h				Height
-			 * @param 	int		$x				X
-			 * @param 	int		$y				Y
-			 * @param 	string	$html			Html
-			 * @param 	int		$border			Border
-			 * @param 	int		$ln				Ln
-			 * @param 	boolean	$fill			Fill
-			 * @param 	boolean	$reseth			Reseth
-			 * @param 	string	$align			Align
-			 * @param 	boolean	$autopadding	Autopadding
-			 * @return 	void
-			 */
-			public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true)
-			{
-				$this->SetXY($x,$y);
-				$val=str_replace('<br>',"\n",$html);
-				//$val=dol_string_nohtmltag($val,false,'ISO-8859-1');
-				$val=dol_string_nohtmltag($val,false,'UTF-8');
-				$this->MultiCell($w,$h,$val,$border,$align,$fill);
-			}
-		}
+		// For encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit
+		$encstrength = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH)?$conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH:0);
 
-		$pdf2=new FPDI_DolExtended($pagetype,$metric,$format);
-		unset($pdf);
-		$pdf=$pdf2;
+		// Array of recipients containing public-key certificates ('c') and permissions ('p').
+		// For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
+		$pubkeys = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true):null); // Json format in llx_const
+
+		$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass,$encstrength,$pubkeys);
 	}
 
 	return $pdf;
 }
 
+/**
+ * Return if pdf file is protected/encrypted
+ *
+ * @param	TCPDF		$pdf			PDF initialized object
+ * @param   string		$pathoffile		Path of file
+ * @return  boolean     			    True or false
+ */
+function pdf_getEncryption(&$pdf, $pathoffile)
+{
+	$isencrypted = false;
+
+	$pdfparser = $pdf->_getPdfParser($pathoffile);
+	$data = $pdfparser->getParsedData();
+	if (isset($data[0]['trailer'][1]['/Encrypt'])) {
+		$isencrypted = true;
+	}
+
+	return $isencrypted;
+}
 
 /**
  *      Return font name to use for PDF generation
@@ -362,7 +327,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
 	} elseif ($thirdparty instanceof Contact) {
 		$socname = $thirdparty->socname;
 	} else {
-		throw new InvalidArgumentException('Parameter 1=$thirdparty is not a Societe nor Contact');
+		throw new InvalidArgumentException('Parameter 1 $thirdparty is not a Societe nor Contact');
 	}
 
 	return $outputlangs->convToOutputCharset($socname);
@@ -1076,8 +1041,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	{
 		$pdf->SetXY($dims['wk']-$dims['rm']-15, -$posy);
 		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
-		if (empty($conf->global->MAIN_USE_FPDF)) $pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-		else $pdf->MultiCell(15, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0);
+		$pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
 	}
 
 	return $marginwithfooter;
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index eb332b44611..de5379f46ec 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -155,11 +155,22 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	}
 
 	// pu calculation from pu_devise if pu empty
-	if(empty($pu) && !empty($pu_devise)) {
-		$pu = $pu_devise / $multicurrency_tx;
+	if (empty($pu) && !empty($pu_devise)) {
+		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
+		else
+		{
+			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
+			return array();
+		}
 	}
-	if(empty($pu_devise) && !empty($multicurrency_tx)) {
-		$pu_devise = $pu * $multicurrency_tx;
+	// pu_devise calculation from pu
+	if (empty($pu_devise) && !empty($multicurrency_tx)) {
+		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
+		else
+		{
+			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
+			return array();
+		}
 	}
 
 	// initialize total (may be HT or TTC depending on price_base_type)
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 8d40f11d472..731f8859eba 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -97,7 +97,7 @@ function product_prepare_head($object)
 	$head[$h][2] = 'referers';
 	$h++;
 
-	if (!empty($conf->variants->enabled) && $object->isProduct()) {
+	if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 
 		global $db;
 
@@ -199,7 +199,19 @@ function productlot_prepare_head($object)
     $head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'card';
-    $h++;
+	$h++;
+	
+	// Attachments
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+    $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $nbLinks=Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_document.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("Documents");
+	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+	$h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index c82839d8499..6a8ef760a04 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -104,10 +104,10 @@ function project_prepare_head($object)
 		$head[$h][2] = 'tasks';
 		$h++;
 
-		$head[$h][0] = DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Gantt");
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
-		$head[$h][2] = 'gantt';
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
+		$head[$h][1] = $langs->trans("TimeSpent");
+		//if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		$head[$h][2] = 'timespent';
 		$h++;
 	}
 
@@ -893,8 +893,9 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
 					print '<tr class="oddeven trforbreak">'."\n";
-					print '<td colspan="11">';
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print '<td colspan="9">';
+					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
+					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -916,14 +917,14 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				*/
 
 				// Project
-				print "<td>";
+				/*print "<td>";
 				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-				print "</td>";
+				print "</td>";*/
 
 				// Thirdparty
-				print '<td class="tdoverflowmax100">';
+				/*print '<td class="tdoverflowmax100">';
 				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
-				print '</td>';
+				print '</td>';*/
 
 				// Ref
 				print '<td>';
@@ -1176,8 +1177,9 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
 					print '<tr class="oddeven trforbreak">'."\n";
-					print '<td colspan="15">';
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print '<td colspan="13">';
+					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
+					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -1199,14 +1201,14 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				*/
 
 				// Project
-				print '<td class="nowrap">';
+				/*print '<td class="nowrap">';
 				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-				print "</td>";
+				print "</td>";*/
 
 				// Thirdparty
-				print '<td class="tdoverflowmax100">';
+				/*print '<td class="tdoverflowmax100">';
 				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
-				print '</td>';
+				print '</td>';*/
 
 				// Ref
 				print '<td class="nowrap">';
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index a367579e1cd..502f962dede 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -27,44 +27,75 @@
 
 
 /**
- *	Encode a string with base 64 algorithm + specific change
- *	Code of this function is useless and we should use base64_encode only instead
+ *	Encode a string with base 64 algorithm + specific delta change.
  *
  *	@param   string		$chain		string to encode
+ *	@param   string		$key		rule to use for delta ('0', '1' or 'myownkey')
  *	@return  string					encoded string
+ *  @see dol_decode
  */
-function dol_encode($chain)
+function dol_encode($chain, $key='1')
 {
-    $strlength=dol_strlen($chain);
-	for ($i=0; $i < $strlength; $i++)
+	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
 	{
-		$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
+	    $strlength=dol_strlen($chain);
+		for ($i=0; $i < $strlength; $i++)
+		{
+			$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
+		}
+		$chain = implode("",$output_tab);
+	}
+	elseif ($key)
+	{
+		$result='';
+		$strlength=dol_strlen($chain);
+		for ($i=0; $i < $strlength; $i++)
+		{
+			$keychar = substr($key, ($i % strlen($key))-1, 1);
+			$result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
+		}
+		$chain=$result;
 	}
 
-	$string_coded = base64_encode(implode("",$output_tab));
-	return $string_coded;
+	return base64_encode($chain);
 }
 
 /**
- *	Decode a base 64 encoded + specific string.
+ *	Decode a base 64 encoded + specific delta change.
  *  This function is called by filefunc.inc.php at each page call.
- *	Code of this function is useless and we should use base64_decode only instead
  *
  *	@param   string		$chain		string to decode
+ *	@param   string		$key		rule to use for delta ('0', '1' or 'myownkey')
  *	@return  string					decoded string
+ *  @see dol_encode
  */
-function dol_decode($chain)
+function dol_decode($chain, $key='1')
 {
 	$chain = base64_decode($chain);
 
-	$strlength=dol_strlen($chain);
-	for($i=0; $i < $strlength;$i++)
+	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
 	{
-		$output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
+		$strlength=dol_strlen($chain);
+		for ($i=0; $i < $strlength;$i++)
+		{
+			$output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
+		}
+
+		$chain = implode("",$output_tab);
+	}
+	elseif ($key)
+	{
+		$result='';
+		$strlength=dol_strlen($chain);
+		for ($i=0; $i < $strlength; $i++)
+		{
+			$keychar = substr($key, ($i % strlen($key))-1, 1);
+			$result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
+		}
+		$chain=$result;
 	}
 
-	$string_decoded = implode("",$output_tab);
-	return $string_decoded;
+	return $chain;
 }
 
 
@@ -74,7 +105,7 @@ function dol_decode($chain)
  *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorightm is something else than 'password_hash').
  *
  * 	@param 		string		$chain		String to hash
- * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO then md5, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
+ * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
  * 	@return		string					Hash of string
  *  @getRandomPassword
  */
@@ -147,22 +178,23 @@ function dol_verifyHash($chain, $hash, $type='0')
  */
 function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $objcanvas=null)
 {
-    global $db, $conf;
+	global $db, $conf;
+	global $hookmanager;
 
     //dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename,$feature2,$dbt_socfield,$dbt_select");
     //print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
     //print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
     //print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
 
-    // If we use canvas, we try to use function that overlod restrictarea if provided with canvas
-    if (is_object($objcanvas))
-    {
-        if (method_exists($objcanvas->control,'restrictedArea')) return $objcanvas->control->restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
-    }
+	// Get more permissions checks from hooks
+	$parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
+	$reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
+	if (! empty($hookmanager->resArray['result'])) return true;
+	if ($reshook > 0) return false;
 
-    if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
 
-    // Features/modules to check
+	// Features/modules to check
     $featuresarray = array($features);
     if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
     else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
@@ -300,7 +332,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
 
     // Check create user permission
     $createuserok=1;
-    if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm") == 'yes')
+    if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
     {
         if (! $user->rights->user->user->creer) $createuserok=0;
 
@@ -310,7 +342,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
 
     // Check delete permission from module
     $deleteok=1; $nbko=0;
-    if ((GETPOST('action','aZ09')  == 'confirm_delete' && GETPOST("confirm") == 'yes') || GETPOST('action','aZ09')  == 'delete')
+    if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
     {
         foreach ($featuresarray as $feature)
         {
@@ -377,8 +409,8 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
     // is linked to a company allowed to $user.
     if (! empty($objectid) && $objectid > 0)
     {
-    	$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
-		return $ok ? 1 : accessforbidden();
+        $ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
+        return $ok ? 1 : accessforbidden();
     }
 
     return 1;
@@ -416,7 +448,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 		if ($feature == 'project') $feature='projet';
 		if ($feature == 'task')    $feature='projet_task';
 
-		$check = array('adherent','banque','don','user','usergroup','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe');	 // Test for societe object
 		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet','project'); // Test for project object
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 2a9f79b8399..71c287f7119 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -241,11 +241,10 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 			}
 			print "</tr>\n";
 
-			$var=True;
 			while ($i < $num)
 			{
-
 				$objp = $db->fetch_object($resql);
+
 				print '<tr class="oddeven">';
 
 				// Sending id
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 26c31a4eee0..0d46503c51b 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -77,107 +77,467 @@ function tax_prepare_head(ChargeSociales $object)
 /**
  *  Look for collectable VAT clients in the chosen year (and month)
  *
+ *  @param	string	$type          	Tax type, either 'vat', 'localtax1' or 'localtax2'
  *  @param	DoliDB	$db          	Database handle
  *  @param  int		$y           	Year
  *  @param  string	$date_start  	Start date
  *  @param  string	$date_end    	End date
- *  @param  int		$modetax     	0 or 1 (option vat on debit, 1 => $modecompta = 'CREANCES-DETTES')
+ *  @param  int		$modetax     	Not used
  *  @param  string	$direction   	'sell' or 'buy'
  *  @param  int		$m				Month
- *  @return array       			List of customers third parties with vat, -1 if no accountancy module, -2 if not yet developped, -3 if error
+ *  @param  int		$q           	Quarter
+ *  @return array       			Array with details of VATs (per third parties), -1 if no accountancy module, -2 if not yet developped, -3 if error
  */
-function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction, $m=0)
+function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m=0, $q=0)
 {
     global $conf;
 
-    $list=array();
+    // If we use date_start and date_end, we must not use $y, $m, $q
+    if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
+    {
+    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+    }
 
+    $list=array();
     if ($direction == 'sell')
     {
-        $invoicetable='facture';
-        $total_ht='total';
-        $total_tva='tva';
+    	$invoicetable='facture';
+    	$invoicedettable='facturedet';
+    	$fk_facture='fk_facture';
+    	$fk_facture2='fk_facture';
+    	$fk_payment='fk_paiement';
+    	$total_tva='total_tva';
+    	$paymenttable='paiement';
+    	$paymentfacturetable='paiement_facture';
+    	$invoicefieldref='facnumber';
     }
     if ($direction == 'buy')
     {
-        $invoicetable='facture_fourn';
-        $total_ht='total_ht';
-        $total_tva='total_tva';
+    	$invoicetable='facture_fourn';
+    	$invoicedettable='facture_fourn_det';
+    	$fk_facture='fk_facture_fourn';
+    	$fk_facture2='fk_facturefourn';
+    	$fk_payment='fk_paiementfourn';
+    	$total_tva='tva';
+    	$paymenttable='paiementfourn';
+    	$paymentfacturetable='paiementfourn_facturefourn';
+    	$invoicefieldref='ref';
     }
 
+    if ( strpos( $type, 'localtax' ) === 0 ) {
+    	$f_rate = $type . '_tx';
+    } else {
+    	$f_rate = 'tva_tx';
+    }
+
+    $total_localtax1='total_localtax1';
+    $total_localtax2='total_localtax2';
+
+
+    // CAS DES BIENS/PRODUITS
+
     // Define sql request
     $sql='';
-    if ($modetax == 1)
+    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
     {
-        // If vat paid on due invoices (non draft)
-        $sql = "SELECT s.rowid as socid, s.nom as name, s.tva_intra as tva_intra, s.tva_assuj as assuj,";
-        $sql.= " sum(f.$total_ht) as amount, sum(f.".$total_tva.") as tva,";
-        $sql.= " sum(f.localtax1) as localtax1,";
-        $sql.= " sum(f.localtax2) as localtax2";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql.= " ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE f.entity = " . $conf->entity;
-        $sql.= " AND f.fk_statut in (1,2)"; // Validated or 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)";
-        if ($y && $m)
-        {
-            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-        }
-        else if ($y)
-        {
-            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-        }
-        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-        $sql.= " AND s.rowid = f.fk_soc";
-        $sql.= " GROUP BY s.rowid, s.nom, s.tva_intra, s.tva_assuj";
+    	// Count on delivery date (use invoice date as delivery is unknown)
+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql.= " 0 as payment_id, 0 as payment_amount";
+    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql.= " WHERE f.entity = " . $conf->entity;
+    	$sql.= " AND f.fk_statut in (1,2)"; // Validated or 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 s.rowid = f.fk_soc";
+    	if ($y && $m)
+    	{
+    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    	}
+    	else if ($y)
+    	{
+    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    	}
+    	if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+    	if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+    	$sql.= " AND (d.product_type = 0";                              // Limit to products
+    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+    	$sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
-        // Tva sur factures payes (should be on payment)
-/*      $sql = "SELECT s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj,";
-        $sql.= " sum(fd.total_ht) as amount, sum(".$total_tva.") as tva";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f, ".MAIN_DB_PREFIX.$invoicetable." as fd, ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE ";
-        $sql.= " f.fk_statut in (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)";
-        if ($y && $m)
-        {
-            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-        }
-        else if ($y)
-        {
-            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-        }
-        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-        $sql.= " AND s.rowid = f.fk_soc AND f.rowid = fd.".$fk_facture;
-        $sql.= " GROUP BY s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj";
-*/
+    	// Count on payments date
+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+    	$sql.= " pa.datep as datep";
+    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql.= " WHERE f.entity = " . $conf->entity;
+    	$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 s.rowid = f.fk_soc";
+    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
+    	$sql.= " AND pa.rowid = pf.".$fk_payment;
+    	if ($y && $m)
+    	{
+    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    	}
+    	else if ($y)
+    	{
+    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    	}
+    	if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
+    	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+    	$sql.= " AND (d.product_type = 0";                              // Limit to products
+    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+    	$sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql) return -1;
-
-    dol_syslog("Tax.lib:thirdparty", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
+    if ($sql == 'TODO') return -2;
+    if ($sql != 'TODO')
     {
-        while($assoc = $db->fetch_object($resql))
-        {
-            $list[] = $assoc;
-        }
-        $db->free($resql);
-        return $list;
+    	dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
+
+    	$resql = $db->query($sql);
+    	if ($resql)
+    	{
+    		$company_id = -1;
+    		$oldrowid='';
+    		while($assoc = $db->fetch_array($resql))
+    		{
+    			if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
+    			if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
+    			if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
+    			if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+
+    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+    			{
+    				$oldrowid=$assoc['rowid'];
+    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
+    				$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];
+    				$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
+    			}
+    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
+    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+    			$list[$assoc['company_id']]['localtax2_list'][]  = $assoc['total_localtax2'];
+
+    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+
+    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+    			$company_id = $assoc['company_id'];
+    		}
+    	}
+    	else
+    	{
+    		dol_print_error($db);
+    		return -3;
+    	}
+    }
+
+
+    // CAS DES SERVICES
+
+    // Define sql request
+    $sql='';
+    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
+    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+    {
+    	// Count on invoice date
+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql.= " 0 as payment_id, 0 as payment_amount";
+    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql.= " WHERE f.entity = " . $conf->entity;
+    	$sql.= " AND f.fk_statut in (1,2)"; // Validated or 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 s.rowid = f.fk_soc";
+    	if ($y && $m)
+    	{
+    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    	}
+    	else if ($y)
+    	{
+    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    	}
+    	if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+    	if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+    	$sql.= " AND (d.product_type = 1";                              // Limit to services
+    	$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+    	$sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
-        dol_print_error($db);
-        return -3;
+    	// Count on payments date
+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+    	$sql.= " pa.datep as datep";
+    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql.= " WHERE f.entity = " . $conf->entity;
+    	$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 s.rowid = f.fk_soc";
+    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
+    	$sql.= " AND pa.rowid = pf.".$fk_payment;
+    	if ($y && $m)
+    	{
+    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    	}
+    	else if ($y)
+    	{
+    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    	}
+    	if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
+    	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+    	$sql.= " AND (d.product_type = 1";                              		// Limit to services
+    	$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+    	$sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
+
+    if (! $sql)
+    {
+    	dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
+    	return -1;  // -1 = Not accountancy module enabled
+    }
+    if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+    if ($sql != 'TODO')
+    {
+    	dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+    	$resql = $db->query($sql);
+    	if ($resql)
+    	{
+    		$company_id = -1;
+    		$oldrowid='';
+    		while($assoc = $db->fetch_array($resql))
+    		{
+    			if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
+    			if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
+    			if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
+    			if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+
+    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+    			{
+    				$oldrowid=$assoc['rowid'];
+    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
+    				$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
+    				$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+    			}
+    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
+    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+
+    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+    			$company_id = $assoc['company_id'];
+    		}
+    	}
+    	else
+    	{
+    		dol_print_error($db);
+    		return -3;
+    	}
+    }
+
+
+    // CASE OF EXPENSE REPORT
+
+    if ($direction == 'buy')		// buy only for expense reports
+    {
+    	// Define sql request
+    	$sql='';
+
+    	// Count on payments date
+    	$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
+    	$sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+    	$sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+    	$sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+    	$sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+    	$sql.= " WHERE e.entity = " . $conf->entity;
+    	$sql.= " AND e.fk_statut in (6)";
+    	if ($y && $m)
+    	{
+    		$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+    		$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    	}
+    	else if ($y)
+    	{
+    		$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+    		$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    	}
+    	if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
+    	if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+    	$sql.= " AND (d.product_type = -1";
+    	$sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
+    	$sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+    	$sql.= " ORDER BY e.rowid";
+
+    	if (! $sql)
+    	{
+    		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
+    		return -1;  // -1 = Not accountancy module enabled
+    	}
+    	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+    	if ($sql != 'TODO')
+    	{
+    		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+    		$resql = $db->query($sql);
+    		if ($resql)
+    		{
+    			$company_id = -1;
+    			$oldrowid='';
+    			while($assoc = $db->fetch_array($resql))
+    			{
+    				if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
+    				if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
+    				if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
+    				if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+
+    				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+    				{
+    					$oldrowid=$assoc['rowid'];
+    					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+    					$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
+    					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
+    					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+    				}
+
+    				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+    				$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
+    				$list[$assoc['company_id']]['datef'][] = $assoc['datef'];
+    				$list[$assoc['company_id']]['company_name'][] = '';
+    				$list[$assoc['company_id']]['company_id'][] = '';
+    				$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
+    				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+    				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+    				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+    				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+    				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+    				$list[$assoc['company_id']]['type'][] = $assoc['type'];
+    				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+    				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+    				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+    				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+    				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+    				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+    				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+    				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+    				$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
+
+    				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+    				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+    				$company_id = $assoc['company_id'];
+    			}
+    		}
+    		else
+    		{
+    			dol_print_error($db);
+    			return -3;
+    		}
+    	}
+    }
+
+    return $list;
 }
 
 /**
@@ -191,19 +551,19 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
  *  @param  int		$q           	Quarter
  *  @param  string	$date_start  	Start date
  *  @param  string	$date_end    	End date
- *  @param  int		$modetax     	0 or 1 (option vat on debit)
+ *  @param  int		$modetax     	Not used
  *  @param  int		$direction   	'sell' (customer invoice) or 'buy' (supplier invoices)
  *  @param  int		$m           	Month
- *  @return array       			List of quarters with vat
+ *  @return array       			Array with details of VATs (per rate), -1 if no accountancy module, -2 if not yet developped, -3 if error
  */
-function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m=0)
+function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m=0)
 {
     global $conf;
 
     // If we use date_start and date_end, we must not use $y, $m, $q
     if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
     {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_date');
+    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
     }
 
     $list=array();
@@ -242,6 +602,7 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	$total_localtax1='total_localtax1';
 	$total_localtax2='total_localtax2';
 
+
     // CAS DES BIENS/PRODUITS
 
     // Define sql request
@@ -280,6 +641,7 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
         $sql.= " AND (d.product_type = 0";                              // Limit to products
         $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+        $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
@@ -320,15 +682,15 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
     	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
     	$sql.= " AND (d.product_type = 0";                              // Limit to products
     	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+    	$sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
-    //print $sql.'<br>';
     if (! $sql) return -1;
     if ($sql == 'TODO') return -2;
     if ($sql != 'TODO')
     {
-        dol_syslog("Tax.lib.php::tax_by_date", LOG_DEBUG);
+        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
 
         $resql = $db->query($sql);
         if ($resql)
@@ -337,18 +699,19 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
             $oldrowid='';
             while($assoc = $db->fetch_array($resql))
             {
-                if (! isset($list[$assoc['rate']]['totalht']))  $list[$assoc['rate']]['totalht']=0;
-                if (! isset($list[$assoc['rate']]['vat']))      $list[$assoc['rate']]['vat']=0;
-                if (! isset($list[$assoc['rate']]['localtax1']))      $list[$assoc['rate']]['localtax1']=0;
-                if (! isset($list[$assoc['rate']]['localtax2']))      $list[$assoc['rate']]['localtax2']=0;
+            	// Code to avoid warnings when array entry not defined
+            	if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+                if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
+                if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
+                if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
 
                 if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
                 {
                     $oldrowid=$assoc['rowid'];
-                    $list[$assoc['rate']]['totalht']  += $assoc['total_ht'];
-                    $list[$assoc['rate']]['vat']      += $assoc['total_vat'];
-                    $list[$assoc['rate']]['localtax1']      += $assoc['total_localtax1'];
-                    $list[$assoc['rate']]['localtax2']      += $assoc['total_localtax2'];
+                    $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+                    $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
+                    $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+                    $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
                 }
                 $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
                 $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
@@ -368,7 +731,7 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
                 $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
                 $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
                 $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-                $list[$assoc['rate']]['localtax2_list'][]  = $assoc['total_localtax2'];
+                $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
 
                 $list[$assoc['rate']]['pid'][] = $assoc['pid'];
                 $list[$assoc['rate']]['pref'][] = $assoc['pref'];
@@ -426,6 +789,7 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
         $sql.= " AND (d.product_type = 1";                              // Limit to services
         $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+        $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
@@ -466,18 +830,19 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
         $sql.= " AND (d.product_type = 1";                              		// Limit to services
         $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+        $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql)
     {
-        dol_syslog("Tax.lib.php::tax_by_date no accountancy module enabled".$sql,LOG_ERR);
+        dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
         return -1;  // -1 = Not accountancy module enabled
     }
     if ($sql == 'TODO') return -2; // -2 = Feature not yet available
     if ($sql != 'TODO')
     {
-        dol_syslog("Tax.lib.php::tax_by_date", LOG_DEBUG);
+        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql)
         {
@@ -485,18 +850,19 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
             $oldrowid='';
             while($assoc = $db->fetch_array($resql))
             {
-                if (! isset($list[$assoc['rate']]['totalht']))  $list[$assoc['rate']]['totalht']=0;
-                if (! isset($list[$assoc['rate']]['vat']))      $list[$assoc['rate']]['vat']=0;
-				if (! isset($list[$assoc['rate']]['localtax1']))      $list[$assoc['rate']]['localtax1']=0;
-                if (! isset($list[$assoc['rate']]['localtax2']))      $list[$assoc['rate']]['localtax2']=0;
+            	// Code to avoid warnings when array entry not defined
+            	if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+                if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
+				if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
+                if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
 
                 if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
                 {
                     $oldrowid=$assoc['rowid'];
-                    $list[$assoc['rate']]['totalht']  += $assoc['total_ht'];
-                    $list[$assoc['rate']]['vat']      += $assoc['total_vat'];
-                    $list[$assoc['rate']]['localtax1']	 += $assoc['total_localtax1'];
-                    $list[$assoc['rate']]['localtax2']	 += $assoc['total_localtax2'];
+                    $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+                    $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
+                    $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+                    $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
                 }
                 $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
                 $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
@@ -535,8 +901,10 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         }
     }
 
-    // Expense Report
-	if ($direction == 'buy')
+
+    // CASE OF EXPENSE REPORT
+
+	if ($direction == 'buy')		// buy only for expense reports
 	{
 		// Define sql request
 		$sql='';
@@ -544,7 +912,7 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		// Count on payments date
 		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
 		$sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-		$sql.= " e.date_debut as date_start, e.date_fin as date_end,";
+		$sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
 		$sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
 		$sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
@@ -566,17 +934,18 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 		$sql.= " AND (d.product_type = -1";
 		$sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
+		$sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
 		$sql.= " ORDER BY e.rowid";
 
 		if (! $sql)
 		{
-			dol_syslog("Tax.lib.php::tax_by_date no accountancy module enabled".$sql,LOG_ERR);
+			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
 			return -1;  // -1 = Not accountancy module enabled
 		}
 		if ($sql == 'TODO') return -2; // -2 = Feature not yet available
 		if ($sql != 'TODO')
 		{
-			dol_syslog("Tax.lib.php::tax_by_date", LOG_DEBUG);
+			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
 			$resql = $db->query($sql);
 			if ($resql)
 			{
@@ -584,18 +953,19 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 				$oldrowid='';
 				while($assoc = $db->fetch_array($resql))
 				{
-					if (! isset($list[$assoc['rate']]['totalht']))  $list[$assoc['rate']]['totalht']=0;
-					if (! isset($list[$assoc['rate']]['vat']))      $list[$assoc['rate']]['vat']=0;
-					if (! isset($list[$assoc['rate']]['localtax1']))      $list[$assoc['rate']]['localtax1']=0;
-					if (! isset($list[$assoc['rate']]['localtax2']))      $list[$assoc['rate']]['localtax2']=0;
+					// Code to avoid warnings when array entry not defined
+					if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+					if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
+					if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
+					if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
 
 					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
 					{
 						$oldrowid=$assoc['rowid'];
-						$list[$assoc['rate']]['totalht']  += $assoc['total_ht'];
-                        $list[$assoc['rate']]['vat'] += $assoc['total_vat'];
-						$list[$assoc['rate']]['localtax1']	 += $assoc['total_localtax1'];
-						$list[$assoc['rate']]['localtax2']	 += $assoc['total_localtax2'];
+						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+                        $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
+						$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+						$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
 					}
 
 					$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
@@ -603,6 +973,7 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 					$list[$assoc['rate']]['datef'][] = $assoc['datef'];
 					$list[$assoc['rate']]['company_name'][] = '';
 					$list[$assoc['rate']]['company_id'][] = '';
+					$list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author'];
 					$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
 					$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
diff --git a/htdocs/core/lib/ticketsup.lib.php b/htdocs/core/lib/ticketsup.lib.php
index 040dad6c656..e377fb5e064 100644
--- a/htdocs/core/lib/ticketsup.lib.php
+++ b/htdocs/core/lib/ticketsup.lib.php
@@ -195,7 +195,7 @@ function showlogo()
         $urllogo = DOL_URL_ROOT . '/theme/dolibarr_logo.png';
     }
     print '<center>';
-    print '<a href="' . ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE : dol_buildpath('/ticketsup/public/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
+    print '<a href="' . ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticketsup/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
     print '<strong>' . ($conf->global->TICKETS_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKETS_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
     print '</center><br>';
 }
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index b8833e42543..7a62470e2da 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -455,8 +455,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 		{
 			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
 		}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 	}
 
@@ -500,8 +501,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 	   	}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong>ffffff</strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>ffffff</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 	}
 
@@ -547,8 +549,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 	   	}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 	}
 
@@ -594,12 +597,13 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 		}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 	}
 
-	// TextTitleColor
+	// TextTitleColor for title of Pages
 	if ($foruserprofile)
 	{
 
@@ -618,9 +622,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 		{
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #643c14">643c14</span></strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #643c14">643c14</span></strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-
+		print '</span>';
 		print '</td>';
 
 		print '</tr>';
@@ -645,8 +649,36 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	   	{
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
+		print '</td>';
+
+		print '</tr>';
+	}
+
+	// TextTitleColor
+	if ($foruserprofile)
+	{
+
+
+	}
+	else
+	{
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE,array()),''),'THEME_ELDY_TEXTTITLE','formcolor',1).' ';
+		}
+		else
+		{
+			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
+		}
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #000000">000000</span></strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 
 		print '</tr>';
@@ -675,8 +707,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 		}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 	}
 
@@ -703,8 +736,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 		}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 	}
 
@@ -752,8 +786,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 				print $langs->trans("Default");
 			}
 		}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 	}
 
@@ -795,8 +830,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			}
 			else print $langs->trans("None");
 		}
-		print ' &nbsp; ('.$langs->trans("Default").': <strong>edf4fb</strong>) ';
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>edf4fb</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
 		print '</td>';
 		print '</tr>';
 	}
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 807bd3f0125..76973a1571c 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -14,7 +14,7 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|contrat|ficheinter', '$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial',  '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('facture|don|tax|salaries|loan|banque', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled || $conf->banque->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'billing', '', 0, '/compta/index.php?mainmenu=billing&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read || $user->rights->banque->lire', '', 2, 50, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 52, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|assets', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->assets->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled || $conf->banque->enabled', 9__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'Accountancy', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire || $user->rights->assets->read', '', 2, 54, __ENTITY__);
+insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|assets', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->accounting->assets', 9__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'Accountancy', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire || $user->rights->assets->read', '', 2, 54, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project',     '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools',       '', 0, '/core/tools.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '', '', 2, 90, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 110, __ENTITY__);
@@ -101,7 +101,10 @@ 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', 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->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->productbatch->enabled', __HANDLER__, 'left', 2806__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/stock/productlot_list.php', 'LotSerial', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->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->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0', 'Statistics', 1, 'main', '$user->rights->produit->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->variants->enabled', __HANDLER__, 'left', 2807__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/variants/list.php', 'VariantAttributes', 1, 'products', '$user->rights->produit->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->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 8, __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&amp;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&amp;action=create&amp;type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 2, 0, __ENTITY__);
@@ -276,10 +279,10 @@ 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->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2715__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2716__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 -- Assets
-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->assets->enabled', __HANDLER__, 'left', 2800__+MAX_llx_menu__, 'accountancy', 'assets', 10__+MAX_llx_menu__, '/assets/list.php?leftmenu=assets&amp;mainmenu=accountancy', 'MenuAssets', 0, 'assets', '$user->rights->assets->read', '', 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->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'accountancy', '', 2800__+MAX_llx_menu__, '/assets/card.php?leftmenu=assets&amp;mainmenu=accountancy&amp;action=create', 'MenuNewAsset', 1, 'assets', '$user->rights->assets->write', '', 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->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'accountancy', '', 2800__+MAX_llx_menu__, '/assets/type.php?leftmenu=assets&amp;mainmenu=accountancy&amp;action=create', 'MenuTypeAssets', 1, 'assets', '$user->rights->assets->write', '', 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->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 2803__+MAX_llx_menu__, 'accountancy', '', 2800__+MAX_llx_menu__, '/assets/list.php?leftmenu=assets&amp;mainmenu=accountancy', 'MenuListAssets', 1, 'assets', '$user->rights->assets->read', '', 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->assets->enabled', __HANDLER__, 'left', 3000__+MAX_llx_menu__, 'accountancy', 'assets', 10__+MAX_llx_menu__, '/assets/list.php?leftmenu=assets&amp;mainmenu=accountancy', 'MenuAssets', 0, 'assets', '$user->rights->assets->read', '', 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->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 3001__+MAX_llx_menu__, 'accountancy', '', 3000__+MAX_llx_menu__, '/assets/card.php?leftmenu=assets&amp;mainmenu=accountancy&amp;action=create', 'MenuNewAsset', 1, 'assets', '$user->rights->assets->write', '', 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->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 3002__+MAX_llx_menu__, 'accountancy', '', 3000__+MAX_llx_menu__, '/assets/type.php?leftmenu=assets&amp;mainmenu=accountancy&amp;action=create', 'MenuTypeAssets', 1, 'assets', '$user->rights->assets->write', '', 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->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 3003__+MAX_llx_menu__, 'accountancy', '', 3000__+MAX_llx_menu__, '/assets/list.php?leftmenu=assets&amp;mainmenu=accountancy', 'MenuListAssets', 1, 'assets', '$user->rights->assets->read', '', 2, 1, __ENTITY__);
 -- Check deposit
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __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 ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index d66f916bb78..6a77e4661d5 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -188,10 +188,10 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	$menuqualified=0;
 	if (! empty($conf->comptabilite->enabled)) $menuqualified++;
 	if (! empty($conf->accounting->enabled)) $menuqualified++;
-	if (! empty($conf->assets->enabled)) $menuqualified++;
+	if (! empty($conf->asset->enabled)) $menuqualified++;
 	$tmpentry=array(
 	'enabled'=>$menuqualified,
-	'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->mouvements->lire) || ! empty($user->rights->assets->read)),
+	'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->mouvements->lire) || ! empty($user->rights->asset->read)),
 	'module'=>'comptabilite|accounting');
 	$showmode=isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -699,7 +699,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
 			}
-
 		}
 
 		/*
@@ -903,7 +902,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
 						global $mysoc;
 
-						//Local Taxes
 						//Local Taxes 1
 						if($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj=="1"))
 						{
@@ -1059,17 +1057,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 								if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
 								if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
 								if ($objp->nature == 1) $nature="various";
+								if ($objp->nature == 8) $nature="inventory";
 								if ($objp->nature == 9) $nature="hasnew";
 
 								// To enable when page exists
 								if ($conf->global->MAIN_FEATURES_LEVEL < 2)
 								{
-									if ($nature == 'various' || $nature == 'hasnew') $nature='';
+									if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature='';
 								}
 
 								if ($nature)
 								{
-									$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, dol_trunc($objp->label,25), 2, $user->rights->accounting->comptarapport->lire);
+								    $langs->load('accountancy');
+									$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $langs->trans($objp->label), 2, $user->rights->accounting->comptarapport->lire);
 								}
 								$i++;
 							}
@@ -1102,6 +1102,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report",$langs->trans("ByCompanies"),3,$user->rights->accounting->comptarapport->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report",$langs->trans("ByUsers"),3,$user->rights->accounting->comptarapport->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report", $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);
 			}
 
 			// Accountancy (simple)
@@ -1130,6 +1131,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/casoc.php?leftmenu=report",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"),2,$user->rights->compta->resultat->lire);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"),2,$user->rights->compta->resultat->lire);
 
 				// Journaux
 				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
@@ -1138,15 +1140,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 
 			// Assets
-			if (! empty($conf->assets->enabled))
+			if (! empty($conf->asset->enabled))
 			{
 				$langs->load("assets");
-				$newmenu->add("/assets/list.php?leftmenu=assets&amp;mainmenu=accountancy",$langs->trans("MenuAssets"), 0, $user->rights->assets->read, '', $mainmenu, 'assets');
-				$newmenu->add("/assets/card.php?leftmenu=assets&amp;action=create",$langs->trans("MenuNewAsset"), 1, $user->rights->assets->write);
-				$newmenu->add("/assets/type.php?leftmenu=assets",$langs->trans("MenuTypeAssets"), 1, $user->rights->assets->read, '', $mainmenu, 'assets_type');
-				$newmenu->add("/assets/type.php?leftmenu=assets_type&amp;action=create",$langs->trans("MenuNewTypeAssets"), 1, $user->rights->assets->write);
-				$newmenu->add("/assets/type.php?leftmenu=assets_type",$langs->trans("MenuListTypeAssets"), 1, $user->rights->assets->read);
-				$newmenu->add("/assets/list.php?leftmenu=assets",$langs->trans("MenuListAssets"), 1, $user->rights->assets->read);
+				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy",$langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset');
+				$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create",$langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);
+				$newmenu->add("/asset/type.php?leftmenu=asset",$langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');
+				$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create",$langs->trans("MenuNewTypeAssets"), 1, $user->rights->asset->write);
+				$newmenu->add("/asset/type.php?leftmenu=asset_type",$langs->trans("MenuListTypeAssets"), 1, $user->rights->asset->read);
+				$newmenu->add("/asset/list.php?leftmenu=asset",$langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
 			}
 		}
 
@@ -1231,6 +1233,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/product/reassortlot.php?type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 					$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 				}
+				if (! empty($conf->variants->enabled))
+				{
+					$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);
+				}
 				if (! empty($conf->propal->enabled) || ! empty($conf->commande->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled) || ! empty($conf->supplier_proposal->enabled))
 				{
 					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
@@ -1277,18 +1283,18 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
     			if (! empty($conf->stock->enabled))
     			{
     				$langs->load("stocks");
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-				{
-    					$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
-    					$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
-    					$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
-				}
-				else
-				{
-					$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->advance_inventory->read, '', $mainmenu, 'stock');
-    					$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->advance_inventory->write);
-    					$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->advance_inventory->read);
-				}
+					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+					{
+						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
+						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+					}
+					else
+					{
+						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');
+						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
+						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
+					}
     			}
 			}
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 7fb9f76119b..a5211b11b5e 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -158,14 +158,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	 *      // Set this to relative path of js file if module must load a js on all pages
 	 *      'js' => '/mymodule/js/mymodule.js',
 	 *      // Set here all hooks context managed by module
-	 *      'hooks' => array('hookcontext1','hookcontext2'),
-	 *      // Set here all workflow context managed by module
-	 *      'workflow' => array(
-	 *          'WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2' = >array(
-	 *              'enabled' => '! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)',
-	 *              'picto'=>'yourpicto@mymodule'
-	 *          )
-	 *      )
+	 *      'hooks' => array('hookcontext1','hookcontext2')
 	 *  )
 	 */
 	public $module_parts = array();
@@ -960,7 +953,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 		$sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
 		$sql.= " AND entity IN (0, ".$entity.")";
 
-		dol_syslog(get_class($this)."::_active", LOG_DEBUG);
+		dol_syslog(get_class($this)."::_active delect activation constant", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if (! $resql) $err++;
 
@@ -972,7 +965,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 		$sql.= ", 0, ".$entity;
 		$sql.= ", '".$this->db->escape($note)."')";
 
-		dol_syslog(get_class($this)."::_active", LOG_DEBUG);
+		dol_syslog(get_class($this)."::_active insert activation constant", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if (! $resql) $err++;
 
@@ -1140,6 +1133,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 
 		if (is_array($this->boxes))
 		{
+			dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
+
 			$pos_name = InfoBox::getListOfPagesForBoxes();
 
 			foreach ($this->boxes as $key => $value)
@@ -1157,7 +1152,6 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 				$sql.= " AND entity = ".$conf->entity;
 				if ($note) $sql.=" AND note ='".$this->db->escape($note)."'";
 
-				dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
 				$result=$this->db->query($sql);
 				if ($result)
 				{
@@ -1311,6 +1305,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 
 		if (is_array($this->cronjobs))
 		{
+			dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
+
 			foreach ($this->cronjobs as $key => $value)
 			{
 				$entity  = isset($this->cronjobs[$key]['entity'])?$this->cronjobs[$key]['entity']:$conf->entity;
@@ -1339,7 +1335,6 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 
 				$now=dol_now();
 
-				dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
 				$result=$this->db->query($sql);
 				if ($result)
 				{
@@ -1376,7 +1371,6 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 							$sql.= "'".$this->db->escape($test)."'";
 							$sql.= ")";
 
-							dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
 							$resql=$this->db->query($sql);
 							if (! $resql) $err++;
 
@@ -1473,6 +1467,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 
 		if (! empty($this->tabs))
 		{
+			dol_syslog(get_class($this)."::insert_tabs", LOG_DEBUG);
+
 			$i=0;
 			foreach ($this->tabs as $key => $value)
 			{
@@ -1506,7 +1502,6 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					$sql.= ", ".$entity;
 					$sql.= ")";
 
-					dol_syslog(get_class($this)."::insert_tabs", LOG_DEBUG);
 					$resql = $this->db->query($sql);
 					if (! $resql)
 					{
@@ -1539,6 +1534,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 
 		if (empty($this->const)) return 0;
 
+		dol_syslog(get_class($this)."::insert_const", LOG_DEBUG);
+
 		foreach ($this->const as $key => $value)
 		{
 			$name      = $this->const[$key][0];
@@ -1574,8 +1571,6 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					$sql.= ",".$entity;
 					$sql.= ")";
 
-
-					dol_syslog(get_class($this)."::insert_const", LOG_DEBUG);
 					if (! $this->db->query($sql) )
 					{
 						$err++;
@@ -1645,13 +1640,14 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 		$err=0;
 		$entity=(! empty($force_entity) ? $force_entity : $conf->entity);
 
+		dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
+
 		// Test if module is activated
 		$sql_del = "SELECT ".$this->db->decrypt('value')." as value";
 		$sql_del.= " FROM ".MAIN_DB_PREFIX."const";
 		$sql_del.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
 		$sql_del.= " AND entity IN (0,".$entity.")";
 
-		dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
 		$resql=$this->db->query($sql_del);
 
 		if ($resql)
@@ -1809,6 +1805,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 
 		require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
 
+		dol_syslog(get_class($this)."::insert_menus", LOG_DEBUG);
+
 		$err=0;
 
 		$this->db->begin();
@@ -2083,7 +2081,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 				if (is_array($value))
 				{
 					// Can defined other parameters
-					if (is_array($value['data']) && ! empty($value['data']))
+					// Example when $key='hooks', then $value is an array('data'=>array('hookcontext1','hookcontext2'), 'entity'=>X)
+					if (isset($value['data']) && is_array($value['data']))
 					{
 						$newvalue = json_encode($value['data']);
 						if (isset($value['entity'])) $entity = $value['entity'];
@@ -2093,7 +2092,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 						$newvalue = $value['data'];
 						if (isset($value['entity'])) $entity = $value['entity'];
 					}
-					else
+					else	// when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
 					{
 						$newvalue = json_encode($value);
 					}
@@ -2116,7 +2115,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 				$sql.= ", ".$entity;
 				$sql.= ")";
 
-				dol_syslog(get_class($this)."::insert_const_".$key."", LOG_DEBUG);
+				dol_syslog(get_class($this)."::insert_module_parts for key=".$this->const_name."_".strtoupper($key), LOG_DEBUG);
+
 				$resql=$this->db->query($sql,1);
 				if (! $resql)
 				{
@@ -2127,7 +2127,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					}
 					else
 					{
-						dol_syslog(get_class($this)."::insert_const_".$key." Record already exists.", LOG_WARNING);
+						dol_syslog(get_class($this)."::insert_module_parts for ".$this->const_name."_".strtoupper($key)." Record already exists.", LOG_WARNING);
 					}
 				}
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 738a49fe81e..06f129299e4 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -97,7 +97,7 @@ class pdf_einstein extends ModelePDFCommandes
 	public function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "bills", "products"));
 
@@ -189,7 +189,7 @@ class pdf_einstein extends ModelePDFCommandes
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 
@@ -252,7 +252,7 @@ class pdf_einstein extends ModelePDFCommandes
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
@@ -1209,7 +1209,7 @@ class pdf_einstein extends ModelePDFCommandes
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey="PdfOrderTitle")
 	{
 		global $conf,$langs,$hookmanager;
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
 
@@ -1308,7 +1308,7 @@ class pdf_einstein extends ModelePDFCommandes
 		{
 			$top_shift = $pdf->getY() - $current_y;
 		}
-		
+
 		if ($showaddress)
 		{
 			// Sender properties
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 62501d4881e..aed6a7f8205 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -183,7 +183,7 @@ class pdf_strato extends ModelePDFContract
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php
index 14045f20d11..4949cce94e1 100644
--- a/htdocs/core/modules/dons/modules_don.php
+++ b/htdocs/core/modules/dons/modules_don.php
@@ -139,114 +139,3 @@ abstract class ModeleNumRefDons
     }
 }
 
-
-/**
- *	Cree un don sur disque en fonction du modele de DON_ADDON_PDF
- *
- *	@param	DoliDB		$db  			Databse handler
- *	@param	int			$id				Id donation
- *	@param	string		$message		Message
- *	@param	string		$modele			Force le modele a utiliser ('' par defaut)
- *	@param	Translate	$outputlangs	Object langs
- *  @param  int			$hidedetails    Hide details of lines
- *  @param  int			$hidedesc       Hide description
- *  @param  int			$hideref        Hide ref
- *	@return int         				0 if KO, 1 if OK
- */
-function don_create($db, $id, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-    global $conf, $langs;
-    $langs->load("bills");
-
-    $eror=0;
-
-    // Increase limit for PDF build
-    $err=error_reporting();
-    error_reporting(0);
-    @set_time_limit(120);
-    error_reporting($err);
-
-    $srctemplatepath='';
-
-    // Set template to use
-    if (! dol_strlen($modele))
-    {
-        if (! empty($conf->global->DON_ADDON_MODEL))
-        {
-            $modele = $conf->global->DON_ADDON_MODEL;
-        }
-        else
-        {
-            print $langs->trans("Error")." ".$langs->trans("Error_DON_ADDON_MODEL_NotDefined");
-            return 0;
-        }
-    }
-
-    // If selected modele is a filename template (then $modele="modelname:filename")
-    $tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-    	$modele=$tmp[0];
-    	$srctemplatepath=$tmp[1];
-    }
-
-    // Search template files
-    $file=''; $classname=''; $filefound=0;
-    $dirmodels=array('/');
-    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-    foreach($dirmodels as $reldir)
-    {
-    	foreach(array('html','doc','pdf') as $prefix)
-    	{
-    		$file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php";
-
-    		// On verifie l'emplacement du modele
-    		$file=dol_buildpath($reldir."core/modules/dons/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-    // Charge le modele
-	if ($filefound)
-	{
-        require_once $file;
-
-        $object=new Don($db);
-        $object->fetch($id);
-
-        $classname = $modele;
-        $obj = new $classname($db);
-
-        // We save charset_output to restore it because write_file can change it if needed for
-        // output format that does not support UTF8.
-        $sav_charset_output=$outputlangs->charset_output;
-        if ($obj->write_file($object,$outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-        {
-            $outputlangs->charset_output=$sav_charset_output;
-
-			// we delete preview files
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            dol_delete_preview($object);
-            return 1;
-        }
-        else
-        {
-            $outputlangs->charset_output=$sav_charset_output;
-            dol_syslog("Erreur dans don_create");
-            dol_print_error($db,$obj->error);
-            return 0;
-        }
-    }
-    else
-    {
-        print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-        return 0;
-    }
-}
-
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 1609ef8283f..9a496cb5589 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -165,7 +165,7 @@ class pdf_merou extends ModelePdfExpedition
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 1b7c1edcd7b..683a5e13124 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -228,7 +228,7 @@ class pdf_rouget extends ModelePdfExpedition
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 32fe36044b3..3244bb25340 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -226,7 +226,7 @@ class pdf_standard extends ModeleExpenseReport
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
 			    // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index 8cbb3850c2b..5d7e0ecac84 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -54,7 +54,6 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 		$handle=opendir($dir);
 
 		// Recherche des fichiers drivers exports disponibles
-		$var=True;
 		$i=0;
         if (is_resource($handle))
         {
@@ -72,7 +71,7 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
     				if (class_exists($classname))
     				{
         				$module = new $classname($db);
-    
+
         				// Picto
         				$this->picto[$module->id]=$module->picto;
         				// Driver properties
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 17b652ed2db..2afdd21c82f 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -108,7 +108,7 @@ class pdf_crabe extends ModelePDFFactures
 	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
 
@@ -182,7 +182,7 @@ class pdf_crabe extends ModelePDFFactures
 		$this->localtax2=array();
 		$this->atleastoneratenotnull=0;
 		$this->atleastonediscount=0;
-		$this->situationinvoice=False;
+		$this->situationinvoice=false;
 	}
 
 
@@ -204,7 +204,7 @@ class pdf_crabe extends ModelePDFFactures
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
 
@@ -301,7 +301,7 @@ class pdf_crabe extends ModelePDFFactures
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
 				    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 				    $tplidx = $pdf->importPage(1);
@@ -342,7 +342,7 @@ class pdf_crabe extends ModelePDFFactures
 				// Situation invoice handling
 				if ($object->situation_cycle_ref)
 				{
-					$this->situationinvoice = True;
+					$this->situationinvoice = true;
 					$progress_width = 18;
 					$this->posxtva -= $progress_width;
 					$this->posxup -= $progress_width;
@@ -1543,7 +1543,7 @@ class pdf_crabe extends ModelePDFFactures
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf, $langs;
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
 
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 26cdc3f5dfc..aa7ed05070b 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -173,7 +173,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
 				{
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index cd70a3456bb..548bb128193 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -59,7 +59,7 @@ class ModeleImports
 	{
 	}
 
-	
+
 	/**
 	 * getDriverId
 	 *
@@ -69,7 +69,7 @@ class ModeleImports
 	{
 	    return $this->id;
 	}
-	
+
 	/**
 	 *	getDriverLabel
 	 *
@@ -79,7 +79,7 @@ class ModeleImports
 	{
 	    return $this->label;
 	}
-	
+
 	/**
 	 *	getDriverDesc
 	 *
@@ -89,7 +89,7 @@ class ModeleImports
 	{
 	    return $this->desc;
 	}
-	
+
 	/**
 	 * getDriverExtension
 	 *
@@ -99,7 +99,7 @@ class ModeleImports
 	{
 	    return $this->extension;
 	}
-	
+
 	/**
 	 *	getDriverVersion
 	 *
@@ -109,7 +109,7 @@ class ModeleImports
 	{
 	    return $this->version;
 	}
-	
+
 	/**
 	 *	getDriverLabel
 	 *
@@ -119,7 +119,7 @@ class ModeleImports
 	{
 	    return $this->label_lib;
 	}
-	
+
 	/**
 	 * getLibVersion
 	 *
@@ -129,8 +129,8 @@ class ModeleImports
 	{
 	    return $this->version_lib;
 	}
-	
-	
+
+
 	/**
 	 *  Charge en memoire et renvoie la liste des modeles actifs
 	 *
@@ -146,7 +146,6 @@ class ModeleImports
 		$handle=opendir($dir);
 
 		// Recherche des fichiers drivers imports disponibles
-		$var=True;
 		$i=0;
         if (is_resource($handle))
         {
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index 6c37a706064..6b0bb759a19 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -197,7 +197,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index e6f0255b9d9..38636396da5 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -122,7 +122,7 @@ class mailing_advthirdparties extends MailingTargets
 			{
 				$sql= "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
 				$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
-				$sql.= " WHERE socp.entity IN (".getEntity('societe').")";
+				$sql.= " WHERE socp.entity IN (".getEntity('socpeople').")";
 				if (count($contactid)>0) {
 					$sql.= " AND socp.rowid IN (".implode(',',$contactid).")";
 				}
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 8aae15b9cc8..90d81dca4a5 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -71,7 +71,7 @@ class mailing_contacts1 extends MailingTargets
 		$statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label,";
 		$statssql[0].= " count(distinct(c.email)) as nb";
 		$statssql[0].= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$statssql[0].= " WHERE c.entity IN (".getEntity('societe').")";
+		$statssql[0].= " WHERE c.entity IN (".getEntity('socpeople').")";
 		$statssql[0].= " AND c.email != ''";      // Note that null != '' is false
 		$statssql[0].= " AND c.no_email = 0";
 		$statssql[0].= " AND c.statut = 1";
@@ -95,7 +95,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql  = "SELECT count(distinct(c.email)) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-		$sql.= " WHERE c.entity IN (".getEntity('societe').")";
+		$sql.= " WHERE c.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND c.email != ''"; // Note that null != '' is false
 		$sql.= " AND c.no_email = 0";
 		$sql.= " AND c.statut = 1";
@@ -123,7 +123,7 @@ class mailing_contacts1 extends MailingTargets
 		// Add filter on job position
 		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		$sql.= " WHERE sp.entity IN (".getEntity('societe').")";
+		$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		/*$sql.= " AND sp.email != ''";    // Note that null != '' is false
 		 $sql.= " AND sp.no_email = 0";
 		 $sql.= " AND sp.statut = 1";*/
@@ -161,7 +161,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
 		//$sql.= " AND sp.no_email = 0";
 		//$sql.= " AND sp.email != ''";
-		//$sql.= " AND sp.entity IN (".getEntity('societe').")";
+		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND cs.fk_categorie = c.rowid";
 		$sql.= " AND cs.fk_socpeople = sp.rowid";
 		$sql.= " GROUP BY c.label";
@@ -236,7 +236,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
 		//$sql.= " AND sp.no_email = 0";
 		//$sql.= " AND sp.email != ''";
-		//$sql.= " AND sp.entity IN (".getEntity('societe').")";
+		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND cs.fk_categorie = c.rowid";
 		$sql.= " AND cs.fk_soc = sp.fk_soc";
 		$sql.= " GROUP BY c.label";
@@ -278,7 +278,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
 		//$sql.= " AND sp.no_email = 0";
 		//$sql.= " AND sp.email != ''";
-		//$sql.= " AND sp.entity IN (".getEntity('societe').")";
+		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND cs.fk_categorie = c.rowid";
 		$sql.= " AND cs.fk_soc = sp.fk_soc";
 		$sql.= " GROUP BY c.label";
@@ -374,7 +374,7 @@ class mailing_contacts1 extends MailingTargets
     	if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
     	if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c3";
     	if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
-    	$sql.= " WHERE sp.entity IN (".getEntity('societe').")";
+    	$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND sp.email <> ''";
 		$sql.= " AND sp.no_email = 0";
 		$sql.= " AND sp.statut = 1";
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index d8365776d9c..6b1d57051b6 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -240,11 +240,11 @@ class modAccounting extends DolibarrModules
         $r++;
         $this->export_code[$r]=$this->rights_class.'_'.$r;
         $this->export_label[$r]='Chartofaccounts';
-        $this->export_icon[$r]='accounting';
+        $this->export_icon[$r]='Accounting';
 		$this->export_permission[$r]=array(array("accounting","chartofaccount"));
         $this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
         $this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
-        $this->export_entities_array[$r]=array('ac.rowid'=>"accounting",'ac.pcg_version'=>"accounting",'aa.rowid'=>'accounting','aa.account_number'=>"accounting",'aa.label'=>"accounting",'aa.accountparent'=>"accounting",'aa.pcg_type'=>"accounting",'aa.pcgsubtype'=>"accounting",'aa_active'=>"accounting");
+        $this->export_entities_array[$r]=array('ac.rowid'=>"Accounting",'ac.pcg_version'=>"Accounting",'aa.rowid'=>'Accounting','aa.account_number'=>"Accounting",'aa.label'=>"Accounting",'aa.accountparent'=>"Accounting",'aa.pcg_type'=>"Accounting",'aa.pcgsubtype'=>"Accounting",'aa_active'=>"Accounting");
 
         $this->export_sql_start[$r]='SELECT DISTINCT ';
         $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 01aa8896c35..5078f81ad05 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -245,7 +245,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'Agenda',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda',
+													'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda',
 													'langs'=>'agenda',
 													'position'=>140,
 													'perms'=>'$user->rights->agenda->myactions->read',
@@ -257,7 +257,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'MenuToDoMyActions',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
+													'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
 													'langs'=>'agenda',
 													'position'=>141,
 													'perms'=>'$user->rights->agenda->myactions->read',
@@ -269,7 +269,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'MenuDoneMyActions',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
+													'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
 													'langs'=>'agenda',
 													'position'=>142,
 													'perms'=>'$user->rights->agenda->myactions->read',
@@ -281,7 +281,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'MenuToDoActions',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
+													'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
 													'langs'=>'agenda',
 													'position'=>143,
 													'perms'=>'$user->rights->agenda->allactions->read',
@@ -293,15 +293,16 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'MenuDoneActions',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
+													'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
 													'langs'=>'agenda',
 													'position'=>144,
 													'perms'=>'$user->rights->agenda->allactions->read',
 													'enabled'=>'$user->rights->agenda->allactions->read',
 													'target'=>'',
 													'user'=>2);
-		$r++;
+
 		// List
+		$r++;
 		$this->menu[$r]=array('fk_menu'=>'r=1',
 													'type'=>'left',
 													'titre'=>'List',
diff --git a/htdocs/core/modules/modAssets.class.php b/htdocs/core/modules/modAsset.class.php
similarity index 88%
rename from htdocs/core/modules/modAssets.class.php
rename to htdocs/core/modules/modAsset.class.php
index 84aed4669a2..6b7985a0e23 100644
--- a/htdocs/core/modules/modAssets.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -17,11 +17,11 @@
  */
 
 /**
- * 	\defgroup   assets     Module Assets
- *  \brief      Assets module descriptor.
+ * 	\defgroup   asset     Module Assets
+ *  \brief      Asset module descriptor.
  *
- *  \file       htdocs/core/modules/modAssets.class.php
- *  \ingroup    assets
+ *  \file       htdocs/core/modules/modAsset.class.php
+ *  \ingroup    asset
  *  \brief      Description and activation file for module Assets
  */
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
@@ -33,7 +33,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 /**
  *  Description and activation class for module FixedAssets
  */
-class modAssets extends DolibarrModules
+class modAsset extends DolibarrModules
 {
 	// @codingStandardsIgnoreEnd
 	/**
@@ -51,7 +51,7 @@ class modAssets extends DolibarrModules
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
 		$this->numero = 51000;		// TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
 		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'assets';
+		$this->rights_class = 'asset';
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
 		// It is used to group modules by family in module setup page
@@ -78,17 +78,17 @@ class modAssets extends DolibarrModules
 		$this->picto='generic';
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /assets/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /assets/core/modules/barcode)
-		// for specific css file (eg: /assets/css/assets.css.php)
+		// for default path (eg: /asset/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /asset/core/modules/barcode)
+		// for specific css file (eg: /asset/css/assets.css.php)
 		$this->module_parts = array();
 
 		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/assets/temp","/assets/subdir");
+		// Example: this->dirs = array("/asset/temp","/asset/subdir");
 		$this->dirs = array();
 
 		// Config pages. Put here list of php page, stored into assets/admin directory, to use to setup module.
-		$this->config_page_url = array("setup.php@assets");
+		$this->config_page_url = array("setup.php@asset");
 
 		// Dependencies
 		$this->hidden = false;			// A condition to hide module
@@ -109,14 +109,14 @@ class modAssets extends DolibarrModules
 		//                             1=>array('ASSETS_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
 		// );
 		$this->const = array(
-			1=>array('ASSETS_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+			1=>array('ASSET_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
 		);
 
 
-		if (! isset($conf->assets) || ! isset($conf->assets->enabled))
+		if (! isset($conf->asset) || ! isset($conf->asset->enabled))
 		{
-			$conf->assets=new stdClass();
-			$conf->assets->enabled=0;
+			$conf->asset=new stdClass();
+			$conf->asset->enabled=0;
 		}
 
 
@@ -170,16 +170,16 @@ class modAssets extends DolibarrModules
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in assets/core/boxes that contains class to show a widget.
 		$this->boxes = array(
-			//0=>array('file'=>'assetswidget1.php@assets','note'=>'Widget provided by Assets','enabledbydefaulton'=>'Home'),
-			//1=>array('file'=>'assetswidget2.php@assets','note'=>'Widget provided by Assets'),
-			//2=>array('file'=>'assetswidget3.php@assets','note'=>'Widget provided by Assets')
+			//0=>array('file'=>'assetswidget1.php@asset','note'=>'Widget provided by Assets','enabledbydefaulton'=>'Home'),
+			//1=>array('file'=>'assetswidget2.php@asset','note'=>'Widget provided by Assets'),
+			//2=>array('file'=>'assetswidget3.php@asset','note'=>'Widget provided by Assets')
 		);
 
 
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
 		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
 		$this->cronjobs = array(
-			0=>array('label'=>'MyJob label', 'jobtype'=>'method', 'class'=>'/assets/class/assets.class.php', 'objectname'=>'Assets', 'method'=>'doScheduledJob', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true)
+			0=>array('label'=>'MyJob label', 'jobtype'=>'method', 'class'=>'/asset/class/asset.class.php', 'objectname'=>'Asset', 'method'=>'doScheduledJob', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true)
 		);
 		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
 		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
@@ -193,22 +193,22 @@ class modAssets extends DolibarrModules
 		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read assets';		// Permission label
 		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->assets->level1->level2)
-		$this->rights[$r][5] = '';					// In php code, permission will be checked by test if ($user->rights->assets->level1->level2)
+		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][5] = '';					// In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/Update assets';	// Permission label
 		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->assets->level1->level2)
-		$this->rights[$r][5] = '';					// In php code, permission will be checked by test if ($user->rights->assets->level1->level2)
+		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][5] = '';					// In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Delete assets';		// Permission label
 		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'delete';			// In php code, permission will be checked by test if ($user->rights->assets->level1->level2)
-		$this->rights[$r][5] = '';					// In php code, permission will be checked by test if ($user->rights->assets->level1->level2)
+		$this->rights[$r][4] = 'delete';			// In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][5] = '';					// In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
 
 		// Main menu entries
diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php
index cede86796a0..77c3f8feef7 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -65,7 +65,7 @@ class modDav extends DolibarrModules
 		// Module description, used if translation string 'ModuledavDesc' not found (MyModue is name of module).
 		$this->description = "davDescription";
 		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "davDescription (Long)";
+		$this->descriptionlong = "davDescription";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = 'experimental';
@@ -80,23 +80,11 @@ class modDav extends DolibarrModules
 		// for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
 		// for specific path of parts (eg: /dav/core/modules/barcode)
 		// for specific css file (eg: /dav/css/dav.css.php)
-		$this->module_parts = array(
-		                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-									'login' => 0,                                    	// Set this to 1 if module has its own login method file (core/login)
-									'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-									'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-									'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-									'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-									'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-									'css' => array(),	// Set this to relative path of css file if module has its own css file
-	 								'js' => array(),    // Set this to relative path of js file if module must load a js on all pages
-									'hooks' => array() 	// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
-		                        );
+		$this->module_parts = array();
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/dav/temp","/dav/subdir");
-		$this->dirs = array("/dav/temp","/dav/public");
+		$this->dirs = array("/dav/temp","/dav/public","/dav/private");
 
 		// Config pages. Put here list of php page, stored into dav/admin directory, to use to setup module.
 		$this->config_page_url = array("dav.php");
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 69e749a4c92..cfac00e14c1 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -165,14 +165,6 @@ class modFournisseur extends DolibarrModules
 		$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';
@@ -205,6 +197,24 @@ class modFournisseur extends DolibarrModules
 		$this->rights[$r][4] = 'commande';
 		$this->rights[$r][5] = 'supprimer';
 
+		if (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
+		{
+			$r++;
+			$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] = 'commande';
+			$this->rights[$r][5] = 'approve2';
+		}
+
+		$r++;
+		$this->rights[$r][0] = 1191;
+		$this->rights[$r][1] = 'Exporter les commande fournisseurs, attributs';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'export';
 
 		$r++;
 		$this->rights[$r][0] = 1231;
@@ -254,25 +264,6 @@ class modFournisseur extends DolibarrModules
 		$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 (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
-	    {
-			$r++;
-		    $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] = 'commande';
-			$this->rights[$r][5] = 'approve2';
-	    }
-
 
 	    // Menus
 	    //-------
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 3fd056b525e..e60be690ce4 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -108,42 +108,49 @@ class modHoliday extends DolibarrModules
 		$r=0;
 
 		$this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read your own holidays';	// Permission label
+		$this->rights[$r][1] = 'Read your own leave requests';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify your own holidays';	// Permission label
+		$this->rights[$r][1] = 'Create/modify your own leave requests';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20003; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Delete holidays';	// Permission label
+		$this->rights[$r][1] = 'Delete leave requests';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
+		$this->rights[$r][0] = 20007;
+		$this->rights[$r][1] = 'Approve leave requests';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'approve';
+		$r++;
+
 		$this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read holidays for everybody';	// Permission label
+		$this->rights[$r][1] = 'Read leave requests for everybody';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'read_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify holidays for everybody';	// Permission label
+		$this->rights[$r][1] = 'Create/modify leave requests for everybody';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Setup holidays of users (setup and update balance)';	// Permission label
+		$this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 7908f203c69..7c87ef35a53 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -74,21 +74,6 @@ class modMultiCurrency extends DolibarrModules
 		// for default path (eg: /multicurrency/core/xxxxx) (0=disable, 1=enable)
 		// for specific path of parts (eg: /multicurrency/core/modules/barcode)
 		// for specific css file (eg: /multicurrency/css/multicurrency.css.php)
-		//$this->module_parts = array(
-		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/multicurrency/css/multicurrency.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/multicurrency/js/multicurrency.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2')  	// Set here all hooks context managed by module
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@multicurrency')) // Set here all workflow context managed by module
-		//                        );
 		$this->module_parts = array();
 
 		// Data directories to create when module is enabled.
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index f90323cda0e..bfbc28d8321 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -103,28 +103,28 @@ class modProduct extends DolibarrModules
 		$r=0;
 
 		$this->rights[$r][0] = 31; // id de la permission
-		$this->rights[$r][1] = 'Lire les produits'; // libelle de la permission
+		$this->rights[$r][1] = 'Read products'; // libelle de la permission
 		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'lire';
 		$r++;
 
 		$this->rights[$r][0] = 32; // id de la permission
-		$this->rights[$r][1] = 'Creer/modifier les produits'; // libelle de la permission
+		$this->rights[$r][1] = 'Create/modify products'; // libelle de la permission
 		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'creer';
 		$r++;
 
 		$this->rights[$r][0] = 34; // id de la permission
-		$this->rights[$r][1] = 'Supprimer les produits'; // libelle de la permission
+		$this->rights[$r][1] = 'Delete products'; // libelle de la permission
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'supprimer';
         $r++;
 
 		$this->rights[$r][0] = 38;	// Must be same permission than in service module
-		$this->rights[$r][1] = 'Exporter les produits';
+		$this->rights[$r][1] = 'Export products';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'export';
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index ab837803349..d38fc743de1 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -352,15 +352,14 @@ class modProjet extends DolibarrModules
 			}
 		}
 
-		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'project' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','project',".$conf->entity.")",
-		);
-
-		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'task' AND entity = ".$conf->entity,
-			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','task',".$conf->entity.")"
-		);
+		$sql = array();
+		$sql[] ="DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'task' AND entity = ".$conf->entity;
+		$sql[] ="INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','task',".$conf->entity.")";
+		$sql[] ="DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'beluga' AND type = 'project' AND entity = ".$conf->entity;
+		$sql[] ="INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('beluga','project',".$conf->entity.")";
+		$sql[] ="DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'baleine' AND type = 'project' AND entity = ".$conf->entity;
+		$sql[] ="INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('baleine','project',".$conf->entity.")";
+		
 
 		return $this->_init($sql,$options);
 	}
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 0cf19ec31e2..15b414947ef 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -79,26 +79,7 @@ class modResource extends DolibarrModules
 		// for default path (eg: /resource/core/xxxxx) (0=disable, 1=enable)
 		// for specific path of parts (eg: /resource/core/modules/barcode)
 		// for specific css file (eg: /resource/css/resource.css.php)
-		$this->module_parts = array(
-			// Set this to 1 if module has its own trigger directory
-			//'triggers' => 1,
-			// Set this to 1 if module has its own login method directory
-			//'login' => 0,
-			// Set this to 1 if module has its own substitution function file
-			//'substitutions' => 0,
-			// Set this to 1 if module has its own menus handler directory
-			//'menus' => 0,
-			// Set this to 1 if module has its own barcode directory
-			//'barcode' => 0,
-			// Set this to 1 if module has its own models directory
-			//'models' => 0,
-			// Set this to relative path of css if module has its own css file
-			//'css' => '/resource/css/resource.css.php',
-			// Set here all hooks context managed by module
-			// 'hooks' => array('actioncard','actioncommdao','resource_card','element_resource')
-			// Set here all workflow context managed by module
-			//'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
-		);
+		$this->module_parts = array();
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/resource/temp");
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 20261e98ca6..dc7b6512d51 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -85,28 +85,28 @@ class modService extends DolibarrModules
 		$r=0;
 
 		$this->rights[$r][0] = 531; // id de la permission
-		$this->rights[$r][1] = 'Lire les services'; // libelle de la permission
+		$this->rights[$r][1] = 'Read services'; // libelle de la permission
 		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'lire';
         $r++;
 
 		$this->rights[$r][0] = 532; // id de la permission
-		$this->rights[$r][1] = 'Creer/modifier les services'; // libelle de la permission
+		$this->rights[$r][1] = 'Create/modify services'; // libelle de la permission
 		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'creer';
         $r++;
 
 		$this->rights[$r][0] = 534; // id de la permission
-		$this->rights[$r][1] = 'Supprimer les services'; // libelle de la permission
+		$this->rights[$r][1] = 'Delete les services'; // libelle de la permission
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'supprimer';
         $r++;
 
 		$this->rights[$r][0] = 538;	// Must be same permission than in product module
-		$this->rights[$r][1] = 'Exporter les services';
+		$this->rights[$r][1] = 'Export services';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'export';
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 711e2ead71c..8df1bb4a8bb 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -322,7 +322,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON c.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
-		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity('societe').')';
+		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity('socpeople').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
 			if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index ca518ed8851..e70c37f3c5d 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -60,7 +60,7 @@ class modStock extends DolibarrModules
 		$this->picto='stock';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/stock/temp");
 
 		$this->config_page_url = array("stock.php");
 
@@ -70,9 +70,38 @@ class modStock extends DolibarrModules
 		$this->langfiles = array("stocks");
 
 		// Constants
-		$this->const = array(
-			0=>array('STOCK_ALLOW_NEGATIVE_TRANSFER','chaine','1','',1)
-		);
+		$this->const = array();
+		$r=0;
+		
+		$this->const[$r] = array('STOCK_ALLOW_NEGATIVE_TRANSFER','chaine','1','',1);
+		
+		$r++;
+		$this->const[$r][0] = "STOCK_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "Standard";
+		$this->const[$r][3] = 'Name of PDF model of stock';
+		$this->const[$r][4] = 0;
+
+		$r++;
+		$this->const[$r][0] = "MOUVEMENT_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "StdMouvement";
+		$this->const[$r][3] = 'Name of PDF model of stock mouvement';
+		$this->const[$r][4] = 0;
+
+		$r++;
+		$this->const[$r][0] = "STOCK_ADDON_PDF_ODT_PATH";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/stocks";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+
+		$r++;
+		$this->const[$r][0] = "MOUVEMENT_ADDON_PDF_ODT_PATH";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/stocks/mouvements";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
 
 		// Boxes
 		$this->boxes = array();
@@ -121,25 +150,25 @@ class modStock extends DolibarrModules
 		$this->rights[5][0] = 1011;
 		$this->rights[5][1] = 'inventoryReadPermission';	// Permission label
 		$this->rights[5][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[5][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[5][4] = 'inventory_advance';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[5][5] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
 		$this->rights[6][0] = 1012;
 		$this->rights[6][1] = 'inventoryCreatePermission';	// Permission label
 		$this->rights[6][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[6][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[6][4] = 'inventory_advance';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[6][5] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
 		$this->rights[8][0] = 1014;
 		$this->rights[8][1] = 'inventoryValidatePermission';	// Permission label
 		$this->rights[8][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[8][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[8][4] = 'inventory_advance';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[8][5] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
 		$this->rights[9][0] = 1015;
 		$this->rights[9][1] = 'inventoryChangePMPPermission';	// Permission label
 		$this->rights[9][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[9][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[9][4] = 'inventory_advance';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[9][5] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
 		}
@@ -266,4 +295,50 @@ class modStock extends DolibarrModules
 		);
 
 	}
+	
+	
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	function init($options='')
+	{
+		global $conf,$langs;
+
+		// Permissions
+		$this->remove($options);
+
+		//ODT template
+		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/stock/template_stock.odt';
+		$dirodt=DOL_DATA_ROOT.'/doctemplates/stock';
+		$dest=$dirodt.'/template_stock.odt';
+
+		if (file_exists($src) && ! file_exists($dest))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result=dol_copy($src,$dest,0,0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+				return 0;
+			}
+		}
+
+		$sql = array();
+
+		$sql = array(
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'stock' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','stock',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[2][2])."' AND type = 'mouvement' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[2][2])."','mouvement',".$conf->entity.")",
+		);
+
+		return $this->_init($sql,$options);
+	}
 }
diff --git a/htdocs/core/modules/modTicketsup.class.php b/htdocs/core/modules/modTicketsup.class.php
index 3dcd3a3423f..594835dad4a 100644
--- a/htdocs/core/modules/modTicketsup.class.php
+++ b/htdocs/core/modules/modTicketsup.class.php
@@ -82,22 +82,8 @@ class modTicketsup extends DolibarrModules
         $this->module_parts = array(
             // Set this to 1 if module has its own trigger directory
             'triggers' => 1,
-            // Set this to 1 if module has its own login method directory
-            //'login' => 0,
-            // Set this to 1 if module has its own substitution function file
-            //'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory
-            //'menus' => 0,
-            // Set this to 1 if module has its own barcode directory
-            //'barcode' => 0,
             // Set this to 1 if module has its own models directory
             'models' => 1,
-            // Set this to relative path of css if module has its own css file
-            //'css' => '',
-            // Set here all hooks context managed by module
-            'hooks' => array('admin')
-            // Set here all workflow context managed by module
-            //'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
         );
 
         // Data directories to create when module is enabled.
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index 87a2e2ce491..c56f5c0e49a 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -75,9 +75,7 @@ class modVariants extends DolibarrModules
 		$this->dirs = array();
 
 		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
-		$this->config_page_url = array(
-			'admin.php@variants'
-		);
+		$this->config_page_url = array('admin.php@variants');
 
 		// Dependencies
 		$this->hidden = false;			// A condition to hide module
@@ -112,24 +110,6 @@ class modVariants extends DolibarrModules
 
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
-
-		// Main menu entries
-		$this->menu = array(
-			array(
-				'fk_menu' => 'fk_mainmenu=products,fk_leftmenu=product',
-				'type' => 'left',
-				'titre' => 'VariantAttributes',
-				'mainmenu' => 'products',
-				'leftmenu' => 'product',
-				'url' => '/variants/list.php',
-				'langs' => 'products',
-				'position' => 100,
-				'enabled' => '$conf->product->enabled',
-				'perms' => 1,
-				'target' => '',
-				'user' => 0
-			)
-		);			// List of menus to add
 	}
 }
 
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 6e007b22b55..d2db656a6f2 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -461,15 +461,14 @@ class printing_printgcp extends PrintingDriver
         $html .= '<td>'.$langs->trans("Status").'</td>';
         $html .= '<td>'.$langs->trans("Cancel").'</td>';
         $html .= '</tr>'."\n";
-        $var = True;
+
         $jobs = $responsedata['jobs'];
         //$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
         if (is_array($jobs))
         {
             foreach ($jobs as $value)
             {
-                $var = !$var;
-                $html .= '<tr '.$bc[$var].'>';
+                $html .= '<tr class="oddeven">';
                 $html .= '<td>'.$value['id'].'</td>';
                 $dates=dol_print_date((int) substr($value['createTime'], 0, 10), 'dayhour');
                 $html .= '<td>'.$dates.'</td>';
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 2c7a3cb2a05..3fc0d505e70 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -287,12 +287,11 @@ class printing_printipp extends PrintingDriver
         $html .= '<td>Cancel</td>';
         $html .= '</tr>'."\n";
         $jobs = $ipp->jobs_attributes;
-        $var = True;
+
         //$html .= '<pre>'.print_r($jobs,true).'</pre>';
         foreach ($jobs as $value )
         {
-            $var = !$var;
-            $html .= '<tr '.$bc[$var].'>';
+            $html .= '<tr class="oddeven">';
             $html .= '<td>'.$value->job_id->_value0.'</td>';
             $html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
             $html .= '<td>'.$value->printer_uri->_value0.'</td>';
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index a4b65bbe38a..032f75f0d65 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -203,7 +203,7 @@ class pdf_standard extends ModelePDFProduct
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/theme/common/octicons/index.html b/htdocs/core/modules/product_batch/index.html
similarity index 100%
rename from htdocs/theme/common/octicons/index.html
rename to htdocs/core/modules/product_batch/index.html
diff --git a/htdocs/core/modules/product_batch/modules_product_batch.class.php b/htdocs/core/modules/product_batch/modules_product_batch.class.php
new file mode 100644
index 00000000000..94818d17531
--- /dev/null
+++ b/htdocs/core/modules/product_batch/modules_product_batch.class.php
@@ -0,0 +1,63 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+
+/**
+ *	    \class      ModeleProductCode
+ *		\brief  	Parent class for product code generators
+ */
+ 
+/**
+ *  \file       htdocs/core/modules/contract/modules_contract.php
+ *  \ingroup    contract
+ *  \brief      File with parent class for generating contracts to PDF and File of class to manage contract numbering
+ */
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+ 
+/**
+ *	Parent class to manage intervention document templates
+ */
+abstract class ModelePDFProductBatch extends CommonDocGenerator
+{
+	var $error='';
+
+
+	/**
+	 *	Return list of active generation modules
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='product_batch';
+		$liste=array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		return $liste;
+	}
+}
+
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 4b6273388ad..baa38e8ad2d 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -161,7 +161,7 @@ class pdf_baleine extends ModelePDFProjects
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 959cc152a0f..4f1d9179aa1 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -179,7 +179,7 @@ class pdf_beluga extends ModelePDFProjects
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 6843e9c5a33..c7f23df52e3 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -160,7 +160,7 @@ class pdf_timespent extends ModelePDFProjects
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c27b8a7008e..51de90f3c7c 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -283,7 +283,7 @@ class pdf_azur extends ModelePDFPropales
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
@@ -1624,6 +1624,7 @@ class pdf_azur extends ModelePDFPropales
 	 */
 	function _signature_area(&$pdf, $object, $posy, $outputlangs)
 	{
+		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 		$tab_top = $posy + 4;
 		$tab_hl = 4;
@@ -1640,6 +1641,9 @@ class pdf_azur extends ModelePDFPropales
 
 		$pdf->SetXY($posx, $tab_top + $tab_hl);
 		$pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
+		if (! empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
+			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl*3);
+		}
 
 		return ($tab_hl*7);
 	}
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 2594a4a0b6a..a645b105610 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -248,13 +248,11 @@ class pdf_paiement
 		{
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			$var=True;
 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($result);
 
-
 				$lines[$i][0] = $objp->facnumber;
 				$lines[$i][1] = dol_print_date($this->db->jdate($objp->dp),"day",false,$outputlangs,true);
 				$lines[$i][2] = $langs->transnoentities("PaymentTypeShort".$objp->paiement_code);
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index bdc5f901ec8..c237be0f91c 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -74,7 +74,13 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		$texte.= '<table class="nobordernopadding" width="100%">';
 		$s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
 		$s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
-		$texte.= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->name,$s1,$s2)."<br>\n";
+		$texte.= '<tr><td>';
+		$texte.=$langs->trans("ModuleCompanyCodeCustomer".$this->name,$s2)."<br>\n";
+		$texte.=$langs->trans("ModuleCompanyCodeSupplier".$this->name,$s1)."<br>\n";
+		$texte.="<br>\n";
+		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
+		//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
+		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
 		$texte.= '</td>';
 		$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
         $texte.= '</tr></table>';
@@ -93,7 +99,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	function getExample($langs,$objsoc=0,$type=-1)
 	{
-	    return $this->prefixsupplieraccountancycode.'SUPPCODE'."<br>\n".$this->prefixcustomeraccountancycode.'CUSTCODE';
+		$s='';
+		$s.=$this->prefixcustomeraccountancycode.'CUSTCODE';
+	    $s.="<br>\n";
+	    $s.=$this->prefixsupplieraccountancycode.'SUPPCODE';
+	    return $s;
 	}
 
 
@@ -107,24 +117,43 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	function get_code($db, $societe, $type='')
 	{
+		global $conf;
+
 		$i = 0;
 		$this->db = $db;
 
 		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
 
 		// Regle gestion compte compta
-		$codetouse='';
 		if ($type == 'customer')
 		{
-			$codetouse = $this->prefixcustomeraccountancycode;
-			$codetouse.= (! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
+			$codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
+			$prefix = $this->prefixcustomeraccountancycode;
 		}
 		else if ($type == 'supplier')
 		{
-			$codetouse = $this->prefixsupplieraccountancycode;
-			$codetouse.= (! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
+			$codetouse=(! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
+			$prefix = $this->prefixsupplieraccountancycode;
 		}
-		$codetouse=strtoupper(preg_replace('/([^a-z0-9])/i','',$codetouse));
+		else
+		{
+			$this->error = 'Bad value for parameter type';
+			return -1;
+		}
+
+		//$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+
+		// Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
+		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse=preg_replace('/([^a-z0-9])/i','',$codetouse);
+		// Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
+		if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse=preg_replace('/([a-z])/i','',$codetouse);
+		// Apply a regex replacement pattern if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
+		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+		{
+			$codetouse=preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/','\1\2\3',$codetouse);
+		}
+
+		$codetouse=$prefix.strtoupper($codetouse);
 
 		$is_dispo = $this->verif($db, $codetouse, $societe, $type);
 		if (! $is_dispo)
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
new file mode 100644
index 00000000000..0cadf3362d4
--- /dev/null
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -0,0 +1,503 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@stocks.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* 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 <http://www.gnu.org/licenses/>.
+* or see http://www.gnu.org/
+*/
+
+/**
+ *	\file       htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build ODT documents for stocks/services
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/stock/class/stock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_stock_odt extends ModelePDFStock
+{
+	var $emetteur;	// Objet societe qui emet
+
+	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'STOCK_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+		// Dimension page pour format A4
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=0;
+		$this->marge_droite=0;
+		$this->marge_haute=0;
+		$this->marge_basse=0;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 0;                     // Gere option tva STOCK_TVAOPTION
+		$this->option_modereg = 0;                 // Affiche mode reglement
+		$this->option_condreg = 0;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 0;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 0;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 0;             // Support credit notes
+		$this->option_freetext = 1;				   // Support add of a personalised text
+		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	function info($langs)
+	{
+		global $conf,$langs;
+
+		$langs->load("companies");
+		$langs->load("errors");
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte.= '<input type="hidden" name="param1" value="STOCK_ADDON_PDF_ODT_PATH">';
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+		{
+			$texte.= '<input type="hidden" name="param2" value="STOCK_ADDON_PDF_ODT_DEFAULT">';
+			$texte.= '<input type="hidden" name="param3" value="STOCK_ADDON_PDF_ODT_TOBILL">';
+			$texte.= '<input type="hidden" name="param4" value="STOCK_ADDON_PDF_ODT_CLOSED">';
+		}
+		$texte.= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte.= '<tr><td>';
+		$texttitle=$langs->trans("ListOfDirectories");
+		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->STOCK_ADDON_PDF_ODT_PATH)));
+		$listoffiles=array();
+		foreach($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir=trim($tmpdir);
+			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+			if (! $tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			else
+			{
+				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+			}
+		}
+		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte.= '<textarea class="flat" cols="60" name="value1">';
+		$texte.=$conf->global->STOCK_ADDON_PDF_ODT_PATH;
+		$texte.= '</textarea>';
+		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '<br></div></div>';
+
+		// Scan directories
+		if (count($listofdir))
+		{
+			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+
+			/*if ($conf->global->MAIN_STOCK_CHOOSE_ODT_DOCUMENT > 0)
+			{
+				// Model for creation
+				$liste=ModelePDFStock::liste_modeles($this->db);
+				$texte.= '<table width="50%;">';
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value2',$liste,$conf->global->STOCK_ADDON_PDF_ODT_DEFAULT);
+				$texte.= "</td></tr>";
+
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value3',$liste,$conf->global->STOCK_ADDON_PDF_ODT_TOBILL);
+				$texte.= "</td></tr>";
+				$texte.= '<tr>';
+
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value4',$liste,$conf->global->STOCK_ADDON_PDF_ODT_CLOSED);
+				$texte.= "</td></tr>";
+				$texte.= '</table>';
+			}*/
+		}
+
+		$texte.= '</td>';
+
+		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte.= '</td>';
+		$texte.= '</tr>';
+
+		$texte.= '</table>';
+		$texte.= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Stock		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $stock,$langs,$conf,$mysoc,$hookmanager,$user;
+
+		if (empty($srctemplatepath))
+		{
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		$sav_charset_output=$outputlangs->charset_output;
+		$outputlangs->charset_output='UTF-8';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+		if ($conf->produit->dir_output)
+		{
+			// If $object is id instead of object
+			if (! is_object($object))
+			{
+				$id = $object;
+				$object = new Stock($this->db);
+				$result=$object->fetch($id);
+				if ($result < 0)
+				{
+					dol_print_error($this->db,$object->error);
+					return -1;
+				}
+			}
+			$stockFournisseur = new StockFournisseur($this->db);
+			$supplierprices = $stockFournisseur->list_stock_fournisseur_price($object->id);
+			$object->supplierprices = $supplierprices;
+
+			$dir = $conf->produit->dir_output;
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			$file = $dir . "/" . $objectref . ".odt";
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile=basename($srctemplatepath);
+				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
+				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+
+				$newfiletmp=$objectref.'_'.$newfiletmp;
+
+				// Get extension (ods or odt)
+				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				{
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				}
+				else
+				{
+					$filename=$newfiletmp.'.'.$newfileformat;
+				}
+				$file=$dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->produit->dir_temp=".$conf->produit->dir_temp;
+
+				dol_mkdir($conf->produit->dir_temp);
+
+
+				// If CUSTOMER contact defined on stock, we use it
+				$usecontact=false;
+				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				if (count($arrayidcontact) > 0)
+				{
+					$usecontact=true;
+					$result=$object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				if (! empty($usecontact))
+				{
+					// On peut utiliser le nom de la societe du contact
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					else {
+                        			$socobject = $object->thirdparty;
+                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+                        			$contactobject = $object->contact;
+                    			}
+				}
+				else
+				{
+					$socobject=$object->thirdparty;
+				}
+				// Make substitution
+				$substitutionarray=array(
+				'__FROM_NAME__' => $this->emetteur->name,
+				'__FROM_EMAIL__' => $this->emetteur->email,
+				'__TOTAL_TTC__' => $object->total_ttc,
+				'__TOTAL_HT__' => $object->total_ht,
+				'__TOTAL_VAT__' => $object->total_vat
+				);
+				complete_substitutions_array($substitutionarray, $langs, $object);
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Line of free text
+				$newfreetext='';
+				$paramfreetext='stock_FREE_TEXT';
+				if (! empty($conf->global->$paramfreetext))
+				{
+					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+						'PATH_TO_TMP'	  => $conf->produit->dir_temp,
+						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'DELIMITER_LEFT'  => '{',
+						'DELIMITER_RIGHT' => '}'
+						)
+					);
+				}
+				catch(Exception $e)
+				{
+					$this->error=$e->getMessage();
+					return -1;
+				}
+				// After construction $odfHandler->contentXml contains content and
+				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+				// [!-- BEGIN lines --]*[!-- END lines --]
+				//print html_entity_decode($odfHandler->__toString());
+				//print exit;
+
+				$object->fetch_optionals();
+
+				// Make substitutions into odt of freetext
+				try {
+					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
+				}
+				catch(OdfException $e)
+				{
+				}
+
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				//$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
+				// retrieve contact information for use in stock as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/',$key)) // Image
+						{
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else    // Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				// Replace tags of lines
+				try
+				{
+					$listlines = $odfHandler->setSegment('supplierprices');
+					if(!empty($object->supplierprices)){
+						foreach ($object->supplierprices as $supplierprice)
+						{
+							$array_lines = $this->get_substitutionarray_each_var_object($supplierprice, $outputlangs);
+							complete_substitutions_array($array_lines, $outputlangs, $object, $supplierprice, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$array_lines,'line'=>$supplierprice);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($array_lines as $key => $val)
+							{
+								try
+								{
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
+								}
+							}
+							$listlines->merge();
+						}
+					}
+					$odfHandler->mergeSegment($listlines);
+				}
+				catch(OdfException $e)
+				{
+					$this->error=$e->getMessage();
+					dol_syslog($this->error, LOG_WARNING);
+					return -1;
+				}
+
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+
+				// Call the beforeODTSave hook
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+				else {
+					try {
+					$odfHandler->saveToDisk($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler=null;	// Destroy object
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1;   // Success
+			}
+			else
+			{
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+
+}
+
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
new file mode 100644
index 00000000000..5825bd693f5
--- /dev/null
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -0,0 +1,1158 @@
+<?php
+/* Copyright (C) 2017 	Laurent Destailleur <eldy@stocks.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/stock/doc/pdf_standard.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build PDF documents for stocks/services
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class pdf_standard extends ModelePDFStock
+{
+    /**
+     * @var DoliDb Database handler
+     */
+    public $db;
+
+	/**
+     * @var string model name
+     */
+    public $name;
+
+	/**
+     * @var string model description (short text)
+     */
+    public $description;
+
+	/**
+     * @var string document type
+     */
+    public $type;
+
+	/**
+     * @var array() Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+     */
+	public $phpmin = array(5, 2);
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';
+
+    public $page_largeur;
+    public $page_hauteur;
+    public $format;
+	public $marge_gauche;
+	public $marge_droite;
+	public $marge_haute;
+	public $marge_basse;
+
+    public $emetteur;	// Objet societe qui emet
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "standard";
+		$this->description = $langs->trans("DocumentModelStandardPDF");
+
+		// Dimension page pour format A4
+		$this->type = 'pdf';
+		$formatarray=pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_codestockservice = 0;      // Affiche code stock-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_freetext = 0;				   // Support add of a personalised text
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		
+		// Define position of columns
+		$this->wref = 15;
+		$this->posxdesc=$this->marge_gauche+1;
+		$this->posxlabel=$this->posxdesc+$this->wref;
+		$this->posxtva=80;		
+		$this->posxqty=95;
+		$this->posxup=115;
+		$this->posxunit=135;
+		$this->posxdiscount=155;
+		$this->postotalht=175;
+
+		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva=$this->posxup;
+		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$this->posxpicture-=20;
+			$this->posxtva-=20;
+			$this->posxup-=20;
+			$this->posxqty-=20;
+			$this->posxunit-=20;
+			$this->posxdiscount-=20;
+			$this->postotalht-=20;
+		}
+		$this->tva=array();
+		$this->localtax1=array();
+		$this->localtax2=array();
+		$this->atleastoneratenotnull=0;
+		$this->atleastonediscount=0;
+	}
+
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Stock		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+		$outputlangs->load("stocks");
+		$outputlangs->load("orders");
+		$outputlangs->load("deliveries");
+
+		$nblignes = count($object->lines);
+
+		if ($conf->stock->dir_output)
+		{
+		    // Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->stock->dir_output;
+				$file = $dir . "/SPECIMEN.pdf";
+			}
+			else
+			{
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->stock->dir_output . "/" . $objectref;
+				$file = $dir . "/" . $objectref . ".pdf";
+			}
+
+			$stockFournisseur = new ProductFournisseur($this->db);
+			$supplierprices = $stockFournisseur->list_product_fournisseur_price($object->id);
+			$object->supplierprices = $supplierprices;
+			
+			$productstatic=new Product($db);
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Create pdf instance
+				$pdf=pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1,0);
+
+				$heightforinfotot = 40;	// Height reserved to output the info and total part
+		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+
+                if (class_exists('TCPDF'))
+                {
+                    $pdf->setPrintHeader(false);
+                    $pdf->setPrintFooter(false);
+                }
+                $pdf->SetFont(pdf_getPDFFont($outputlangs));
+                // Set path to the background PDF File
+                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                {
+                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                    $tplidx = $pdf->importPage(1);
+                }
+
+				$pdf->Open();
+				$pagenb=0;
+				$pdf->SetDrawColor(128,128,128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("Stock"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Stock")." ".$outputlangs->convToOutputCharset($object->libelle));
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+
+				// New page
+				$pdf->AddPage();
+				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, '');		// Set interline to 3
+				$pdf->SetTextColor(0,0,0);
+
+				$tab_top = 42;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_height = 130;
+				$tab_height_newpage = 150;
+
+				/* ************************************************************************** */
+				/*                                                                            */
+				/* Affichage de la liste des produits de l'entrepot                           */
+				/*                                                                            */
+				/* ************************************************************************** */
+				
+				$nexY+=5;				
+				$nexY = $pdf->GetY();
+				$nexY+=10;
+
+				$totalunit=0;
+				$totalvalue=$totalvaluesell=0;
+
+				$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc, p.entity,";
+				$sql.= " ps.reel as value";
+				$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
+				$sql.= " WHERE ps.fk_product = p.rowid";
+				$sql.= " AND ps.reel <> 0";	// We do not show if stock is 0 (no product in this warehouse)
+				$sql.= " AND ps.fk_entrepot = ".$object->id;
+				$sql.= $db->order($sortfield,$sortorder);
+
+				//dol_syslog('List products', LOG_DEBUG);
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$num = $db->num_rows($resql);
+					$i = 0;
+					$nblignes = $num;
+					for ($i = 0 ; $i < $nblignes ; $i++)
+					{
+						$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 ($objtp->label != '') $objp->produit = $objtp->label;
+							}
+						}
+						
+						$curY = $nexY;
+						$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+						$pdf->SetTextColor(0,0,0);
+
+						$pdf->setTopMargin($tab_top_newpage);
+						$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+						$pageposbefore=$pdf->getPage();
+						
+						// Description of product line
+						$curX = $this->posxdesc-1;
+
+						$showpricebeforepagebreak=1;
+
+						$pdf->startTransaction();
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						$pageposafter=$pdf->getPage();
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pageposafter=$pageposbefore;
+							//print $pageposafter.'-'.$pageposbefore;exit;
+							$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
+							$pageposafter=$pdf->getPage();
+							$posyafter=$pdf->GetY();
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('','',true);
+									if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									$pdf->setPage($pageposafter+1);
+								}
+							}
+							else
+							{
+								// We found a page break
+								$showpricebeforepagebreak=0;
+							}
+						}
+						else	// No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+						$posYAfterDescription=$pdf->GetY();
+
+						$nexY = $pdf->GetY();
+						$pageposafter=$pdf->getPage();
+
+						$pdf->setPage($pageposbefore);
+						$pdf->setTopMargin($this->marge_haute);
+						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+						// We suppose that a too long description is moved completely on next page
+						if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+							$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+						}
+
+						$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+						
+						$productstatic->id=$objp->rowid;
+						$productstatic->ref = $objp->ref;
+						$productstatic->label = $objp->produit;
+						$productstatic->type=$objp->type;
+						$productstatic->entity=$objp->entity;
+						$productstatic->status_batch=$objp->tobatch;	
+
+						// Ref.
+						$pdf->SetXY($this->posxdesc, $curY);
+						$pdf->MultiCell($this->wref, 3, $productstatic->ref, 0, 'L');
+
+						// Label
+						$pdf->SetXY($this->posxlabel+0.8, $curY);
+						$pdf->MultiCell($this->posxqty-$this->posxlabel-0.8, 3, $objp->produit, 0, 'L');
+
+						// Quantity
+						$valtoshow=price2num($objp->value, 'MS');
+						$towrite = (empty($valtoshow)?'0':$valtoshow);
+						
+						$pdf->SetXY($this->posxqty, $curY);
+						$pdf->MultiCell($this->posxup-$this->posxqty-0.8, 3, $towrite, 0, 'R');				
+						
+						$totalunit+=$objp->value;
+							
+						$pdf->SetXY($this->posxup, $curY);
+						$pdf->MultiCell($this->posxunit-$this->posxup-0.8, 3, price(price2num($objp->ppmp,'MU'), 0, $outputlangs), 0, 'R');
+
+						// Total PMP
+						$pdf->SetXY($this->posxunit, $curY);
+						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 3, price(price2num($objp->ppmp*$objp->value,'MT'), 0, $outputlangs), 0, 'R');
+						$totalvalue+=price2num($objp->ppmp*$objp->value,'MT');
+
+						// Price sell min
+						if (empty($conf->global->PRODUIT_MULTIPRICES))
+						{
+							$pricemin=$objp->price;
+							$pdf->SetXY($this->posxdiscount, $curY);
+							$pdf->MultiCell($this->postotalht-$this->posxdiscount, 3, price(price2num($pricemin,'MU'), 0, $outputlangs), 0, 'R', 0);
+
+							// Total sell min
+							$pdf->SetXY($this->postotalht, $curY);
+							$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, price(price2num($pricemin*$objp->value,'MT'), 0, $outputlangs), 0, 'R', 0);
+						}
+						$totalvaluesell+=price2num($pricemin*$objp->value,'MT');
+
+						// Add line
+						if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+						{
+							$pdf->setPage($pageposafter);
+							$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+							//$pdf->SetDrawColor(190,190,200);
+							$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+							$pdf->SetLineStyle(array('dash'=>0));
+						}
+
+						$nexY+=2;    // Passe espace entre les lignes
+						
+						// Detect if some page were added automatically and output _tableau for past pages
+						while ($pagenb < $pageposafter)
+						{
+							$pdf->setPage($pagenb);
+							if ($pagenb == 1)
+							{
+								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+							}
+							else
+							{
+								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+							}
+							$this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pagenb++;
+							$pdf->setPage($pagenb);
+							$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+						if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+						{
+							if ($pagenb == 1)
+							{
+								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+							}
+							else
+							{
+								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+							}
+							$this->_pagefoot($pdf,$object,$outputlangs,1);
+							// New page
+							$pdf->AddPage();
+							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pagenb++;
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+					}
+					
+					$db->free($resql);
+					
+					/**
+					 * footer table
+					 */
+					$nexY = $pdf->GetY();
+					$nexY+=2;
+					$curY = $nexY;					
+					
+					$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));					
+					$pdf->line($this->marge_gauche, $curY-1, $this->page_largeur-$this->marge_droite, $curY-1);
+					$pdf->SetLineStyle(array('dash'=>0));
+					
+					$pdf->SetFont('','B',$default_font_size-1);
+					$pdf->SetTextColor(0,0,120);
+
+					// Ref.
+					$pdf->SetXY($this->posxdesc, $curY);
+					$pdf->MultiCell($this->wref, 3, $langs->trans("Total"), 0, 'L');
+
+					// Quantity				
+					$valtoshow=price2num($totalunit, 'MS');
+					$towrite = empty($valtoshow)?'0':$valtoshow;
+
+					$pdf->SetXY($this->posxqty, $curY);
+					$pdf->MultiCell($this->posxup-$this->posxqty-0.8, 3, $towrite, 0, 'R');
+
+					// Total PMP
+					$pdf->SetXY($this->posxunit, $curY);
+					$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 3, price(price2num($totalvalue,'MT'), 0, $outputlangs), 0, 'R');
+
+					// Price sell min
+					if (empty($conf->global->PRODUIT_MULTIPRICES))
+					{
+						// Total sell min
+						$pdf->SetXY($this->postotalht, $curY);
+						$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, price(price2num($totalvaluesell,'MT'), 0, $outputlangs), 0, 'R', 0);
+					}
+				}
+				else
+				{
+					dol_print_error($db);
+				}
+
+				if ($notetoshow)
+				{
+					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+
+					$tab_top = 88;
+
+					$pdf->SetFont('','', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$nexY = $pdf->GetY();
+					$height_note=$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_note+1);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY+6;
+				}
+				else
+				{
+					$height_note=0;
+				}
+
+				$iniY = $tab_top + 7;
+				$curY = $tab_top + 7;
+				$nexY = $tab_top + 7;
+
+				// Loop on each lines
+				/*
+				for ($i = 0 ; $i < $nblignes ; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+					$pdf->SetTextColor(0,0,0);
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+					$pageposbefore=$pdf->getPage();
+
+					// Description of stock line
+					$curX = $this->posxdesc-1;
+
+					$showpricebeforepagebreak=1;
+
+					$pdf->startTransaction();
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+					$pageposafter=$pdf->getPage();
+					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					{
+						$pdf->rollbackTransaction(true);
+						$pageposafter=$pageposbefore;
+						//print $pageposafter.'-'.$pageposbefore;exit;
+						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
+						$pageposafter=$pdf->getPage();
+						$posyafter=$pdf->GetY();
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						{
+							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+							{
+								$pdf->AddPage('','',true);
+								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								$pdf->setPage($pageposafter+1);
+							}
+						}
+						else
+						{
+							// We found a page break
+							$showpricebeforepagebreak=0;
+						}
+					}
+					else	// No pagebreak
+					{
+						$pdf->commitTransaction();
+					}
+
+					$nexY = $pdf->GetY();
+					$pageposafter=$pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+
+					// VAT Rate
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+					{
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+						$pdf->SetXY($this->posxtva, $curY);
+						$pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
+					}
+
+					// Unit price before discount
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+					$pdf->SetXY($this->posxup, $curY);
+					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
+
+					// Quantity
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+					$pdf->SetXY($this->posxqty, $curY);
+					// Enough for 6 chars
+					if($conf->global->PRODUCT_USE_UNITS)
+					{
+						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
+					}
+					else
+					{
+						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
+					}
+
+					// Unit
+					if($conf->global->PRODUCT_USE_UNITS)
+					{
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$pdf->SetXY($this->posxunit, $curY);
+						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
+					}
+
+					// Discount on line
+					$pdf->SetXY($this->posxdiscount, $curY);
+					if ($object->lines[$i]->remise_percent)
+					{
+						$pdf->SetXY($this->posxdiscount-2, $curY);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+					}
+
+					// Total HT line
+					$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
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					else $tvaligne=$object->lines[$i]->total_tva;
+
+					$localtax1ligne=$object->lines[$i]->total_localtax1;
+					$localtax2ligne=$object->lines[$i]->total_localtax2;
+					$localtax1_rate=$object->lines[$i]->localtax1_tx;
+					$localtax2_rate=$object->lines[$i]->localtax2_tx;
+					$localtax1_type=$object->lines[$i]->localtax1_type;
+					$localtax2_type=$object->lines[$i]->localtax2_type;
+
+					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
+					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+
+					$vatrate=(string) $object->lines[$i]->tva_tx;
+
+					// Retrieve type from database for backward compatibility with old records
+					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
+					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+					{
+						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+						$localtax1_type = $localtaxtmp_array[0];
+						$localtax2_type = $localtaxtmp_array[2];
+					}
+
+				    // retrieve global local tax
+					if ($localtax1_type && $localtax1ligne != 0)
+						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					if ($localtax2_type && $localtax2ligne != 0)
+						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
+					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]=0;
+					$this->tva[$vatrate] += $tvaligne;
+
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
+					$nexY+=2;    // Passe espace entre les lignes
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter)
+					{
+						$pdf->setPage($pagenb);
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+						}
+						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					{
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+						}
+						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						// New page
+						$pdf->AddPage();
+						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
+				*/
+				$tab_top = $tab_top_newpage+21;               
+				
+				// Show square
+				if ($pagenb == 1)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+				else
+				{
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+				
+				$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+
+				// Affiche zone infos
+				//$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// Affiche zone totaux
+				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+				// Pied de page
+				$this->_pagefoot($pdf,$object,$outputlangs);
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1;   // Pas d'erreur
+			}
+			else
+			{
+				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$langs->trans("ErrorConstantNotDefined","PRODUCT_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		TCPDF		$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
+	 *   @return	void
+	 */
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	{
+	    global $conf;
+
+	    // Force to disable hidetop and hidebottom
+	    $hidebottom=0;
+	    if ($hidetop) $hidetop=-1;
+
+	    $currency = !empty($currency) ? $currency : $conf->currency;
+	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+	    // Amount in (at tab_top - 1)
+	    $pdf->SetTextColor(0,0,0);
+	    $pdf->SetFont('','', $default_font_size - 2);
+
+	    if (empty($hidetop))
+	    {
+	        $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
+	        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+	        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+	        //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+	        if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+	    }
+
+	    $pdf->SetDrawColor(128,128,128);
+	    $pdf->SetFont('','B', $default_font_size - 3);
+
+	    // Output Rect
+	    //$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+		
+		$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
+		$pdf->SetDrawColor(220,26,26);	
+		$pdf->line($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite, $tab_top);
+		$pdf->SetLineStyle(array('dash'=>0));
+		$pdf->SetDrawColor(128,128,128);
+		$pdf->SetTextColor(0,0,120);
+		
+	    if (empty($hidetop))
+	    {
+	        //$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+	        $pdf->SetXY($this->posxdesc-1, $tab_top+1);
+	        $pdf->MultiCell($this->wref,3, $outputlangs->transnoentities("Ref"),'','L');
+	    }
+	        
+		//$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxlabel-3, $tab_top+1);
+			$pdf->MultiCell($this->posxqty-$this->posxlabel+3,2, $outputlangs->transnoentities("Label"),'','C');
+		}
+
+	    //$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {	
+	        $pdf->SetXY($this->posxqty-1, $tab_top+1);
+	        $pdf->MultiCell($this->posxup-$this->posxqty-1,2, $outputlangs->transnoentities("Units"),'','C');
+	    }
+
+	    //$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->posxup-1, $tab_top+1);
+			$pdf->MultiCell($this->posxunit-$this->posxup-1,2, $outputlangs->transnoentities("AverageUnitPricePMPShort"),'','C');
+	    }
+
+		//$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
+		if (empty($hidetop)) 
+		{
+			$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '',
+				'C');
+		}
+
+	    //$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {
+			$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+			$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("SellPriceMin"),'','C');
+	    }
+
+	    //$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);	   
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->postotalht-1, $tab_top+1);
+	        $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht,2, $outputlangs->transnoentities("EstimatedStockValueSellShort"),'','C');
+	    }
+		
+		$pdf->SetDrawColor(220,26,26);	
+		$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
+		$pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11);	 
+		$pdf->SetLineStyle(array('dash'=>0));
+		
+	}
+
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	TCPDF		$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	string		$titlekey		Translation key to show as title of document
+	 *  @return	void
+	 */
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey="")
+	{
+	    global $conf,$langs,$db,$hookmanager;
+
+	    $outputlangs->load("main");
+	    $outputlangs->load("bills");
+	    $outputlangs->load("propal");
+	    $outputlangs->load("companies");
+	    $outputlangs->load("orders");
+	    $outputlangs->load("stocks");
+	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+	    if ($object->type == 1) $titlekey='ServiceSheet';
+	    else $titlekey='StockSheet';
+
+	    pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+	    // Show Draft Watermark
+	    if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+	    {
+	        pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+	    }
+
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->SetFont('','B', $default_font_size + 3);
+
+	    $posy=$this->marge_haute;
+	    $posx=$this->page_largeur-$this->marge_droite-100;
+
+	    $pdf->SetXY($this->marge_gauche,$posy);
+
+	    // Logo
+	    $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+	    if ($this->emetteur->logo)
+	    {
+	        if (is_readable($logo))
+	        {
+	            $height=pdf_getHeightForLogo($logo);
+	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+	        }
+	        else
+	        {
+	            $pdf->SetTextColor(200,0,0);
+	            $pdf->SetFont('','B', $default_font_size -2);
+	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+	        }
+	    }
+	    else
+	    {
+	        $text=$this->emetteur->name;
+	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+	    }
+		
+	    $pdf->SetFont('','B', $default_font_size + 3);
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $title=$outputlangs->transnoentities("Warehouse");
+	    $pdf->MultiCell(100, 3, $title, '', 'R');
+
+	    $pdf->SetFont('','B',$default_font_size);
+
+	    $posy+=5;
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+
+	    $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->libelle), '', 'R');
+
+	    $posy+=5;
+	    $pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
+		
+		$posy+=4;
+		$pdf->SetXY($posx-50,$posy);
+		$pdf->MultiCell(150, 3, $object->lieu, '', 'R');
+		
+		
+		// Parent entrepot
+		$posy+=4;
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ParentWarehouse").' :', '', 'R');
+		
+		$posy+=4;
+		$pdf->SetXY($posx-50,$posy);
+		$e = new Entrepot($db);
+		if(!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0) 
+		{
+			$pdf->MultiCell(150, 3, $e->libelle, '', 'R');
+		}
+		else
+		{
+			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
+		}
+		
+		// Description
+		$nexY = $pdf->GetY();
+		$nexY+=5;
+		$pdf->SetXY($posx,$posy);
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Description").' : </b>'.nl2br($object->description), 0, 1);
+		$nexY = $pdf->GetY();
+		
+		$calcproductsunique=$object->nb_different_products();
+		$calcproducts=$object->nb_products();
+
+		// Total nb of different products
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfDifferentProducts").' : </b>'.(empty($calcproductsunique['nb'])?'0':$calcproductsunique['nb']), 0, 1);
+		$nexY = $pdf->GetY();
+
+		// Nb of products
+		$valtoshow=price2num($calcproducts['nb'], 'MS');
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfProducts").' : </b>'.(empty($valtoshow)?'0':$valtoshow), 0, 1);
+		$nexY = $pdf->GetY();
+		
+		// Value
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("EstimatedStockValueShort").' : </b>'. price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency), 0, 1);
+		$nexY = $pdf->GetY();
+		
+		
+		// Last movement
+		$sql = "SELECT max(m.datem) as datem";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+		$sql .= " WHERE m.fk_entrepot = '".$object->id."'";
+		$resqlbis = $db->query($sql);
+		if ($resqlbis)
+		{
+			$obj = $db->fetch_object($resqlbis);
+			$lastmovementdate=$db->jdate($obj->datem);
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+
+		if ($lastmovementdate)
+		{
+			$toWrite = dol_print_date($lastmovementdate,'dayhour').' ';
+		}
+		else
+		{
+			$toWrite = $outputlangs->transnoentities("None");
+		}
+
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("LastMovement").' : </b>'.$toWrite, 0, 1);
+		$nexY = $pdf->GetY();
+
+		
+	    /*if ($object->ref_client)
+	    {
+	        $posy+=5;
+	        $pdf->SetXY($posx,$posy);
+	        $pdf->SetTextColor(0,0,60);
+	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+	    }*/
+
+	    /*$posy+=4;
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
+	    */
+
+	    // Get contact
+	    /*
+	    if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
+	    {
+	        $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+	        if (count($arrayidcontact) > 0)
+	        {
+	            $usertmp=new User($this->db);
+	            $usertmp->fetch($arrayidcontact[0]);
+	            $posy+=4;
+	            $pdf->SetXY($posx,$posy);
+	            $pdf->SetTextColor(0,0,60);
+	            $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+	        }
+	    }*/
+
+	    $posy+=2;
+
+	    // Show list of linked objects
+	    $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+
+	    if ($showaddress)
+	    {
+	        /*
+	        // Sender properties
+	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+
+	        // Show sender
+	        $posy=42;
+	        $posx=$this->marge_gauche;
+	        if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+	        $hautcadre=40;
+
+	        // Show sender frame
+	        $pdf->SetTextColor(0,0,0);
+	        $pdf->SetFont('','', $default_font_size - 2);
+	        $pdf->SetXY($posx,$posy-5);
+	        $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+	        $pdf->SetXY($posx,$posy);
+	        $pdf->SetFillColor(230,230,230);
+	        $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+	        $pdf->SetTextColor(0,0,60);
+
+	        // Show sender name
+	        $pdf->SetXY($posx+2,$posy+3);
+	        $pdf->SetFont('','B', $default_font_size);
+	        $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+	        $posy=$pdf->getY();
+
+	        // Show sender information
+	        $pdf->SetXY($posx+2,$posy);
+	        $pdf->SetFont('','', $default_font_size - 1);
+	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+	        */
+	    }
+
+	    $pdf->SetTextColor(0,0,0);
+	}
+
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
+	 * 		@param	Object		$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
+	 */
+	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	{
+	    global $conf;
+	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+	    return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+	}
+
+}
+
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmouvement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmouvement.modules.php
new file mode 100644
index 00000000000..16d979d60ee
--- /dev/null
+++ b/htdocs/core/modules/stock/doc/pdf_stdmouvement.modules.php
@@ -0,0 +1,1159 @@
+<?php
+/* Copyright (C) 2017 	Laurent Destailleur <eldy@stocks.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/stock/doc/pdf_standard.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build PDF documents for stocks/services
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class pdf_stdmouvement extends ModelePDFMouvement
+{
+    /**
+     * @var DoliDb Database handler
+     */
+    public $db;
+
+	/**
+     * @var string model name
+     */
+    public $name;
+
+	/**
+     * @var string model description (short text)
+     */
+    public $description;
+
+	/**
+     * @var string document type
+     */
+    public $type;
+
+	/**
+     * @var array() Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+     */
+	public $phpmin = array(5, 2);
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';
+
+    public $page_largeur;
+    public $page_hauteur;
+    public $format;
+	public $marge_gauche;
+	public $marge_droite;
+	public $marge_haute;
+	public $marge_basse;
+
+    public $emetteur;	// Objet societe qui emet
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "stdmouvement";
+		$this->description = $langs->trans("DocumentModelStandardPDF");
+
+		// Dimension page pour format A4
+		$this->type = 'pdf';
+		$formatarray=pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_codestockservice = 0;      // Affiche code stock-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_freetext = 0;				   // Support add of a personalised text
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		
+		// Define position of columns
+		$this->wref = 15;
+		$this->posxidref = $this->marge_gauche;
+		$this->posxdatemouv = $this->marge_gauche+8;;
+		$this->posxdesc=37;
+		$this->posxlabel=50;
+		$this->posxtva=80;	
+		$this->posxqty=105;
+		$this->posxup=119;
+		$this->posxunit=136;
+		$this->posxdiscount=167;
+		$this->postotalht=180;
+
+		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva=$this->posxup;
+		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$this->posxpicture-=20;
+			$this->posxtva-=20;
+			$this->posxup-=20;
+			$this->posxqty-=20;
+			$this->posxunit-=20;
+			$this->posxdiscount-=20;
+			$this->postotalht-=20;
+		}
+		$this->tva=array();
+		$this->localtax1=array();
+		$this->localtax2=array();
+		$this->atleastoneratenotnull=0;
+		$this->atleastonediscount=0;
+	}
+
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Stock		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+		$outputlangs->load("stocks");
+		$outputlangs->load("orders");
+		$outputlangs->load("deliveries");
+		
+	/**
+	 * TODO: get from object
+	 */
+
+		$id=GETPOST('id','int');
+		$ref = GETPOST('ref','alpha');
+		$msid=GETPOST('msid','int');
+		$product_id=GETPOST("product_id");
+		$action=GETPOST('action','aZ09');
+		$cancel=GETPOST('cancel','alpha');
+		$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'movementlist';
+
+		$idproduct = GETPOST('idproduct','int');
+		$year = GETPOST("year");
+		$month = GETPOST("month");
+		$search_ref = GETPOST('search_ref', 'alpha');
+		$search_movement = GETPOST("search_movement");
+		$search_product_ref = trim(GETPOST("search_product_ref"));
+		$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"));
+		$search_qty = trim(GETPOST("search_qty"));
+		$search_type_mouvement=GETPOST('search_type_mouvement','int');
+
+		$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+		$page = GETPOST("page",'int');
+		$sortfield = GETPOST("sortfield",'alpha');
+		$sortorder = GETPOST("sortorder",'alpha');
+		if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+		$offset = $limit * $page;
+		if (! $sortfield) $sortfield="m.datem";
+		if (! $sortorder) $sortorder="DESC";
+
+		$pdluoid=GETPOST('pdluoid','int');
+
+		// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+		$hookmanager->initHooks(array('movementlist'));
+		$extrafields = new ExtraFields($db);
+
+		// fetch optionals attributes and labels
+		$extralabels = $extrafields->fetch_name_optionals_label('movement');
+		$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+		$productlot=new ProductLot($db);
+		$productstatic=new Product($db);
+		$warehousestatic=new Entrepot($db);
+		$movement=new MouvementStock($db);
+		$userstatic=new User($db);
+
+		$sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.entity,";
+		$sql.= " e.ref as stock, e.rowid as entrepot_id, e.lieu,";
+		$sql.= " m.rowid as mid, m.value as qty, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
+		$sql.= " m.batch, m.price,";
+		$sql.= " m.type_mouvement,";
+		$sql.= " pl.rowid as lotid, pl.eatby, pl.sellby,";
+		$sql.= " u.login, u.photo, u.lastname, u.firstname";
+		// Add fields from extrafields
+		foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+		// Add fields from hooks
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+		$sql.=$hookmanager->resPrint;
+		$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
+		$sql.= " ".MAIN_DB_PREFIX."product as p,";
+		$sql.= " ".MAIN_DB_PREFIX."stock_mouvement as m";
+		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."movement_extrafields as ef on (m.rowid = ef.fk_object)";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON m.fk_user_author = u.rowid";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND m.fk_product = pl.fk_product";
+		$sql.= " WHERE m.fk_product = p.rowid";
+		if ($msid > 0) $sql .= " AND m.rowid = ".$msid;
+		$sql.= " AND m.fk_entrepot = e.rowid";
+		$sql.= " AND e.entity IN (".getEntity('stock').")";
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_type = 0";
+		if ($id > 0) $sql.= " AND e.rowid ='".$id."'";
+		if ($month > 0)
+		{
+			if ($year > 0)
+			$sql.= " AND m.datem 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(m.datem, '%m') = '$month'";
+		}
+		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 ($idproduct > 0) $sql.= " AND p.rowid = '".$idproduct."'";
+		if (! empty($search_ref))			$sql.= natural_search('m.rowid', $search_ref, 1);
+		if (! empty($search_movement))      $sql.= natural_search('m.label', $search_movement);
+		if (! empty($search_inventorycode)) $sql.= natural_search('m.inventorycode', $search_inventorycode);
+		if (! empty($search_product_ref))   $sql.= natural_search('p.ref', $search_product_ref);
+		if (! empty($search_product))       $sql.= natural_search('p.label', $search_product);
+		if ($search_warehouse > 0)          $sql.= " AND e.rowid = '".$db->escape($search_warehouse)."'";
+		if (! empty($search_user))          $sql.= natural_search('u.login', $search_user);
+		if (! empty($search_batch))         $sql.= natural_search('m.batch', $search_batch);
+		if ($search_qty != '')				$sql.= natural_search('m.value', $search_qty, 1);
+		if ($search_type_mouvement > 0)		$sql.= " AND m.type_mouvement = '".$db->escape($search_type_mouvement)."'";
+		// Add where from extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+		// Add where from hooks
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+		$sql.=$hookmanager->resPrint;
+		$sql.= $db->order($sortfield,$sortorder);
+
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $db->query($sql);
+			$nbtotalofrecords = $db->num_rows($result);
+			if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+			{
+				$page = 0;
+				$offset = 0;
+			}
+		}
+
+		if(empty($search_inventorycode)) $sql.= $db->plimit($limit+1, $offset);
+
+
+		$resql = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+
+	/*
+	 * END TODO
+	 **/
+
+		//$nblignes = count($object->lines);
+
+		if ($conf->stock->dir_output)
+		{
+		    
+			if ($resql)
+			{
+				$product = new Product($db);
+				$object = new Entrepot($db);
+
+				if ($idproduct > 0)
+				{
+					$product->fetch($idproduct);
+				}
+				if ($id > 0 || $ref)
+				{
+					$result = $object->fetch($id, $ref);
+					if ($result < 0)
+					{
+						dol_print_error($db);
+					}
+				}
+
+				$num = $db->num_rows($resql);
+
+				$arrayofselected=is_array($toselect)?$toselect:array();
+
+				$i = 0;
+				$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+				if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
+				else
+				{
+					$texte = $langs->trans("ListOfStockMovements");
+					if ($id) $texte.=' ('.$langs->trans("ForThisWarehouse").')';
+				}
+			}
+			
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->stock->dir_output . "/mouvement";
+				$file = $dir . "/SPECIMEN.pdf";
+			}
+			else
+			{
+				$objectref = dol_sanitizeFileName($object->ref);
+				if(!empty($search_inventorycode)) $objectref.="_".$id."_".$search_inventorycode;
+				if($search_type_mouvement) $objectref.="_".$search_type_mouvement;
+				$dir = $conf->stock->dir_output . "/mouvement/" . $objectref;
+				$file = $dir . "/" . $objectref . ".pdf";
+			}
+			
+			$stockFournisseur = new ProductFournisseur($this->db);
+			$supplierprices = $stockFournisseur->list_product_fournisseur_price($object->id);
+			$object->supplierprices = $supplierprices;
+			
+			$productstatic=new Product($db);
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Create pdf instance
+				$pdf=pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1,0);
+
+				$heightforinfotot = 40;	// Height reserved to output the info and total part
+		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+
+                if (class_exists('TCPDF'))
+                {
+                    $pdf->setPrintHeader(false);
+                    $pdf->setPrintFooter(false);
+                }
+                $pdf->SetFont(pdf_getPDFFont($outputlangs));
+                // Set path to the background PDF File
+                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                {
+                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                    $tplidx = $pdf->importPage(1);
+                }
+
+				$pdf->Open();
+				$pagenb=0;
+				$pdf->SetDrawColor(128,128,128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("Stock"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Stock")." ".$outputlangs->convToOutputCharset($object->libelle));
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+
+				// New page
+				$pdf->AddPage();
+				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, '');		// Set interline to 3
+				$pdf->SetTextColor(0,0,0);
+
+				$tab_top = 42;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_height = 130;
+				$tab_height_newpage = 150;
+
+				/* ************************************************************************** */
+				/*                                                                            */
+				/* Affichage de la liste des produits du MouvementStock                           */
+				/*                                                                            */
+				/* ************************************************************************** */
+				
+				$nexY+=5;				
+				$nexY = $pdf->GetY();
+				$nexY+=10;
+
+				$totalunit=0;
+				$totalvalue=$totalvaluesell=0;
+				
+				//dol_syslog('List products', LOG_DEBUG);
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$num = $db->num_rows($resql);
+					$i = 0;
+					$nblignes = $num;
+					for ($i = 0 ; $i < $nblignes ; $i++)
+					{
+						$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 ($objtp->label != '') $objp->produit = $objtp->label;
+							}
+						}
+						
+						$curY = $nexY;
+						$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+						$pdf->SetTextColor(0,0,0);
+
+						$pdf->setTopMargin($tab_top_newpage);
+						$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+						$pageposbefore=$pdf->getPage();
+						
+						// Description of product line
+						$curX = $this->posxdesc-1;
+
+						$showpricebeforepagebreak=1;
+
+						$pdf->startTransaction();
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						$pageposafter=$pdf->getPage();
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pageposafter=$pageposbefore;
+							//print $pageposafter.'-'.$pageposbefore;exit;
+							$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
+							$pageposafter=$pdf->getPage();
+							$posyafter=$pdf->GetY();
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('','',true);
+									if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									$pdf->setPage($pageposafter+1);
+								}
+							}
+							else
+							{
+								// We found a page break
+								$showpricebeforepagebreak=0;
+							}
+						}
+						else	// No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+						$posYAfterDescription=$pdf->GetY();
+
+						$nexY = $pdf->GetY();
+						$pageposafter=$pdf->getPage();
+
+						$pdf->setPage($pageposbefore);
+						$pdf->setTopMargin($this->marge_haute);
+						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+						// We suppose that a too long description is moved completely on next page
+						if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+							$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+						}
+
+						$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+						
+						// $objp = $db->fetch_object($resql);
+
+						$userstatic->id=$objp->fk_user_author;
+						$userstatic->login=$objp->login;
+						$userstatic->lastname=$objp->lastname;
+						$userstatic->firstname=$objp->firstname;
+						$userstatic->photo=$objp->photo;
+
+						$productstatic->id=$objp->rowid;
+						$productstatic->ref=$objp->product_ref;
+						$productstatic->label=$objp->produit;
+						$productstatic->type=$objp->type;
+						$productstatic->entity=$objp->entity;
+						$productstatic->status_batch=$objp->tobatch;
+
+						$productlot->id = $objp->lotid;
+						$productlot->batch= $objp->batch;
+						$productlot->eatby= $objp->eatby;
+						$productlot->sellby= $objp->sellby;
+
+						$warehousestatic->id=$objp->entrepot_id;
+						$warehousestatic->libelle=$objp->stock;
+						$warehousestatic->lieu=$objp->lieu;
+
+						$arrayofuniqueproduct[$objp->rowid]=$objp->produit;
+						if(!empty($objp->fk_origin)) {
+							$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
+						} else {
+							$origin = '';
+						}					
+						
+						// Id movement.
+						$pdf->SetXY($this->posxidref, $curY);
+						$pdf->MultiCell($this->posxdesc-$this->posxidref-0.8, 3, $objp->mid, 0, 'L');
+
+						// Date.
+						$pdf->SetXY($this->posxdatemouv, $curY);
+						$pdf->MultiCell($this->posxdesc-$this->posxdatemouv-0.8, 6, dol_print_date($db->jdate($objp->datem),'dayhour'), 0, 'L');
+
+						// Ref.
+						$pdf->SetXY($this->posxdesc, $curY);
+						$pdf->MultiCell($this->posxlabel-$this->posxdesc-0.8, 3, $productstatic->ref, 0, 'L');
+
+						// Label
+						$pdf->SetXY($this->posxlabel+0.8, $curY);
+						$pdf->MultiCell($this->posxqty-$this->posxlabel-0.8, 6, $productstatic->label, 0, 'L');
+
+						// Lot/serie
+						$pdf->SetXY($this->posxqty, $curY);
+						$pdf->MultiCell($this->posxup-$this->posxqty-0.8, 3, $productlot->batch, 0, 'R');				
+						
+						// Inv. code
+						$pdf->SetXY($this->posxup, $curY);
+						$pdf->MultiCell($this->posxunit-$this->posxup-0.8, 3, $objp->inventorycode, 0, 'R');
+
+						// Label mouvement
+						$pdf->SetXY($this->posxunit, $curY);
+						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 3, $objp->label, 0, 'R');
+						$totalvalue+=price2num($objp->ppmp*$objp->value,'MT');
+						
+						// Origin
+						$pricemin=$objp->price;
+						$pdf->SetXY($this->posxdiscount, $curY);
+						$pdf->MultiCell($this->postotalht-$this->posxdiscount-0.8, 3, $origin, 0, 'R', 0);
+
+						// Qty
+						$valtoshow=price2num($objp->qty, 'MS');
+						$towrite = (empty($valtoshow)?'0':$valtoshow);
+						$totalunit+=$objp->qty;
+
+						$pdf->SetXY($this->postotalht, $curY);
+						$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $objp->qty, 0, 'R', 0);
+						
+						$totalvaluesell+=price2num($pricemin*$objp->value,'MT');
+						
+						$nexY+=3.5;    // Passe espace entre les lignes
+						// Add line
+						if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+						{
+							$pdf->setPage($pageposafter);
+							$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+							//$pdf->SetDrawColor(190,190,200);
+							$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+							$pdf->SetLineStyle(array('dash'=>0));
+						}
+
+						$nexY+=2;    // Passe espace entre les lignes
+						
+						// Detect if some page were added automatically and output _tableau for past pages
+						while ($pagenb < $pageposafter)
+						{
+							$pdf->setPage($pagenb);
+							if ($pagenb == 1)
+							{
+								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+							}
+							else
+							{
+								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+							}
+							$this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pagenb++;
+							$pdf->setPage($pagenb);
+							$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+						if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+						{
+							if ($pagenb == 1)
+							{
+								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+							}
+							else
+							{
+								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+							}
+							$this->_pagefoot($pdf,$object,$outputlangs,1);
+							// New page
+							$pdf->AddPage();
+							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pagenb++;
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+					}
+
+					$db->free($resql);
+
+					/**
+					 * footer table
+					 */
+					$nexY = $pdf->GetY();
+					$nexY+=5;
+					$curY = $nexY;					
+
+					$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));					
+					$pdf->line($this->marge_gauche, $curY-1, $this->page_largeur-$this->marge_droite, $curY-1);
+					$pdf->SetLineStyle(array('dash'=>0));
+
+					$pdf->SetFont('','B',$default_font_size-1);
+					$pdf->SetTextColor(0,0,120);
+
+					// Total
+					$pdf->SetXY($this->posxidref, $curY);
+					$pdf->MultiCell($this->posxdesc-$this->posxidref, 3, $langs->trans("Total"), 0, 'L');
+					
+					// Total Qty
+					$pdf->SetXY($this->postotalht, $curY);
+					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $totalunit, 0, 'R', 0);
+					
+				}
+				else
+				{
+					dol_print_error($db);
+				}
+
+				if ($notetoshow)
+				{
+					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+
+					$tab_top = 88;
+
+					$pdf->SetFont('','', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$nexY = $pdf->GetY();
+					$height_note=$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_note+1);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY+6;
+				}
+				else
+				{
+					$height_note=0;
+				}
+
+				$iniY = $tab_top + 7;
+				$curY = $tab_top + 7;
+				$nexY = $tab_top + 7;
+
+				$tab_top = $tab_top_newpage+21;               
+				
+				// Show square
+				if ($pagenb == 1)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+				else
+				{
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+				
+				$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+
+				// Affiche zone infos
+				//$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// Affiche zone totaux
+				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+				// Pied de page
+				$this->_pagefoot($pdf,$object,$outputlangs);
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1;   // Pas d'erreur
+			}
+			else
+			{
+				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$langs->trans("ErrorConstantNotDefined","PRODUCT_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		TCPDF		$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
+	 *   @return	void
+	 */
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	{
+	    global $conf;
+
+	    // Force to disable hidetop and hidebottom
+	    $hidebottom=0;
+	    if ($hidetop) $hidetop=-1;
+
+	    $currency = !empty($currency) ? $currency : $conf->currency;
+	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+	    // Amount in (at tab_top - 1)
+	    $pdf->SetTextColor(0,0,0);
+	    $pdf->SetFont('','', $default_font_size - 2);
+
+	    if (empty($hidetop))
+	    {
+	        $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
+	        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+	        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+	        //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+	        if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+	    }
+
+	    $pdf->SetDrawColor(128,128,128);
+	    $pdf->SetFont('','B', $default_font_size - 3);
+
+	    // Output Rect
+	    //$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+		
+		$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
+		$pdf->SetDrawColor(220,26,26);	
+		$pdf->line($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite, $tab_top);
+		$pdf->SetLineStyle(array('dash'=>0));
+		$pdf->SetDrawColor(128,128,128);
+		$pdf->SetTextColor(0,0,120);
+		
+		//Ref mouv
+	    if (empty($hidetop))
+	    {
+	        //$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+	        $pdf->SetXY($this->posxidref, $tab_top+1);
+	        $pdf->MultiCell($this->posxdatemouv-$this->posxdatemouv-0.8,3, $outputlangs->transnoentities("Ref"),'','L');
+	    }
+		
+		//Date mouv
+		//$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxdatemouv, $tab_top+1);
+			$pdf->MultiCell($this->posxdesc-$this->posxdatemouv,2, $outputlangs->transnoentities("Date"),'','C');
+		}
+
+		//Ref Product
+	    //$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {	
+	        $pdf->SetXY($this->posxdesc-1, $tab_top+1);
+	        $pdf->MultiCell($this->posxlabel-$this->posxdesc,2, $outputlangs->transnoentities("Ref. Product"),'','C');
+	    }
+
+		//Label Product
+	    //$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->posxlabel-1, $tab_top+1);
+			$pdf->MultiCell($this->posxqty-$this->posxlabel,2, $outputlangs->transnoentities("Label"),'','C');
+	    }
+
+		//Lot/serie Product
+		//$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
+		if (empty($hidetop)) 
+		{
+			$pdf->SetXY($this->posxqty, $tab_top + 1);
+			$pdf->MultiCell($this->posxup - $this->posxqty, 2, $outputlangs->transnoentities("Lot/Série"), '','C');
+		}
+
+		//Code Inv
+	    //$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {
+			$pdf->SetXY($this->posxup-1, $tab_top+1);
+			$pdf->MultiCell($this->posxunit-$this->posxup,2, $outputlangs->transnoentities("Inventory Code"),'','C');
+	    }
+
+		//Label mouvement
+	    //$pdf->line($this->posxunit, $tab_top, $this->posxunit, $tab_top + $tab_height);	   
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->posxunit, $tab_top+1);
+	        $pdf->MultiCell($this->posxdiscount-$this->posxunit,2, $outputlangs->transnoentities("Label Mouvement"),'','C');
+	    }
+		
+		//Origin
+	    //$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);	   
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->posxdiscount+2, $tab_top+1);
+	        $pdf->MultiCell($this->postotalht-$this->posxdiscount-0.8,2, $outputlangs->transnoentities("Origin"),'','C');
+	    }
+		
+		//Qty
+	    //$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);	   
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->postotalht+2, $tab_top+1);
+	        $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht,2, $outputlangs->transnoentities("Qty"),'','C');
+	    }
+		
+		$pdf->SetDrawColor(220,26,26);	
+		$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
+		$pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11);	 
+		$pdf->SetLineStyle(array('dash'=>0));
+		
+	}
+
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	TCPDF		$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	string		$titlekey		Translation key to show as title of document
+	 *  @return	void
+	 */
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey="")
+	{
+	    global $conf,$langs,$db,$hookmanager;
+
+	    $outputlangs->load("main");
+	    $outputlangs->load("bills");
+	    $outputlangs->load("propal");
+	    $outputlangs->load("companies");
+	    $outputlangs->load("orders");
+	    $outputlangs->load("stocks");
+	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+	    if ($object->type == 1) $titlekey='ServiceSheet';
+	    else $titlekey='StockSheet';
+
+	    pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+	    // Show Draft Watermark
+	    if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+	    {
+	        pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+	    }
+
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->SetFont('','B', $default_font_size + 3);
+
+	    $posy=$this->marge_haute;
+	    $posx=$this->page_largeur-$this->marge_droite-100;
+
+	    $pdf->SetXY($this->marge_gauche,$posy);
+
+	    // Logo
+	    $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+	    if ($this->emetteur->logo)
+	    {
+	        if (is_readable($logo))
+	        {
+	            $height=pdf_getHeightForLogo($logo);
+	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+	        }
+	        else
+	        {
+	            $pdf->SetTextColor(200,0,0);
+	            $pdf->SetFont('','B', $default_font_size -2);
+	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+	        }
+	    }
+	    else
+	    {
+	        $text=$this->emetteur->name;
+	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+	    }
+
+	    $pdf->SetFont('','B', $default_font_size + 3);
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $title=$outputlangs->transnoentities("Warehouse");
+	    $pdf->MultiCell(100, 3, $title, '', 'R');
+
+	    $pdf->SetFont('','B',$default_font_size);
+
+	    $posy+=5;
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+
+	    $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->libelle), '', 'R');
+
+	    $posy+=5;
+	    $pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
+		
+		$posy+=4;
+		$pdf->SetXY($posx-50,$posy);
+		$pdf->MultiCell(150, 3, $object->lieu, '', 'R');
+		
+		
+		// Parent MouvementStock
+		$posy+=4;
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ParentWarehouse").' :', '', 'R');
+		
+		$posy+=4;
+		$pdf->SetXY($posx-50,$posy);
+		$e = new MouvementStock($db);
+		if(!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0) 
+		{
+			$pdf->MultiCell(150, 3, $e->libelle, '', 'R');
+		}
+		else
+		{
+			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
+		}
+		
+		// Description
+		$nexY = $pdf->GetY();
+		$nexY+=5;
+		$pdf->SetXY($posx,$posy);
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Description").' : </b>'.nl2br($object->description), 0, 1);
+		$nexY = $pdf->GetY();
+		
+		$calcproductsunique=$object->nb_different_products();
+		$calcproducts=$object->nb_products();
+
+		// Total nb of different products
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfDifferentProducts").' : </b>'.(empty($calcproductsunique['nb'])?'0':$calcproductsunique['nb']), 0, 1);
+		$nexY = $pdf->GetY();
+
+		// Nb of products
+		$valtoshow=price2num($calcproducts['nb'], 'MS');
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfProducts").' : </b>'.(empty($valtoshow)?'0':$valtoshow), 0, 1);
+		$nexY = $pdf->GetY();
+		
+		// Value
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("EstimatedStockValueShort").' : </b>'. price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency), 0, 1);
+		$nexY = $pdf->GetY();
+		
+		
+		// Last movement
+		$sql = "SELECT max(m.datem) as datem";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+		$sql .= " WHERE m.fk_entrepot = '".$object->id."'";
+		$resqlbis = $db->query($sql);
+		if ($resqlbis)
+		{
+			$obj = $db->fetch_object($resqlbis);
+			$lastmovementdate=$db->jdate($obj->datem);
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+
+		if ($lastmovementdate)
+		{
+			$toWrite = dol_print_date($lastmovementdate,'dayhour').' ';
+		}
+		else
+		{
+			$toWrite = $outputlangs->transnoentities("None");
+		}
+
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("LastMovement").' : </b>'.$toWrite, 0, 1);
+		$nexY = $pdf->GetY();
+
+		
+	    /*if ($object->ref_client)
+	    {
+	        $posy+=5;
+	        $pdf->SetXY($posx,$posy);
+	        $pdf->SetTextColor(0,0,60);
+	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+	    }*/
+
+	    /*$posy+=4;
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
+	    */
+
+	    // Get contact
+	    /*
+	    if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
+	    {
+	        $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+	        if (count($arrayidcontact) > 0)
+	        {
+	            $usertmp=new User($this->db);
+	            $usertmp->fetch($arrayidcontact[0]);
+	            $posy+=4;
+	            $pdf->SetXY($posx,$posy);
+	            $pdf->SetTextColor(0,0,60);
+	            $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+	        }
+	    }*/
+
+	    $posy+=2;
+
+	    // Show list of linked objects
+	    //$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+
+	    if ($showaddress)
+	    {
+	        /*
+	        // Sender properties
+	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+
+	        // Show sender
+	        $posy=42;
+	        $posx=$this->marge_gauche;
+	        if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+	        $hautcadre=40;
+
+	        // Show sender frame
+	        $pdf->SetTextColor(0,0,0);
+	        $pdf->SetFont('','', $default_font_size - 2);
+	        $pdf->SetXY($posx,$posy-5);
+	        $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+	        $pdf->SetXY($posx,$posy);
+	        $pdf->SetFillColor(230,230,230);
+	        $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+	        $pdf->SetTextColor(0,0,60);
+
+	        // Show sender name
+	        $pdf->SetXY($posx+2,$posy+3);
+	        $pdf->SetFont('','B', $default_font_size);
+	        $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+	        $posy=$pdf->getY();
+
+	        // Show sender information
+	        $pdf->SetXY($posx+2,$posy);
+	        $pdf->SetFont('','', $default_font_size - 1);
+	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+	        */
+	    }
+
+	    $pdf->SetTextColor(0,0,0);
+	}
+
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
+	 * 		@param	Object		$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
+	 */
+	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	{
+	    global $conf;
+	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+	    return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+	}
+
+}
+
diff --git a/htdocs/core/modules/stock/modules_stock.class.php b/htdocs/core/modules/stock/modules_stock.class.php
new file mode 100644
index 00000000000..283ae75b6a3
--- /dev/null
+++ b/htdocs/core/modules/stock/modules_stock.class.php
@@ -0,0 +1,90 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+
+/**
+ *	    \class      ModeleStock
+ *		\brief  	Parent class for warehouse generators
+ */
+ 
+/**
+ *  \file       htdocs/core/modules/stock/modules_stock.php
+ *  \ingroup    stock
+ *  \brief      File with parent class for generating warehouse to PDF and File of class to manage warehouse mouvement
+ */
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+ 
+/**
+ *	Parent class to manage warehouse document templates
+ */
+abstract class ModelePDFStock extends CommonDocGenerator
+{
+	var $error='';
+
+
+	/**
+	 *	Return list of active generation modules
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='stock';
+		$liste=array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		return $liste;
+	}
+}
+
+
+/**
+ *	Parent class to manage warehouse mouvement document templates
+ */
+abstract class ModelePDFMouvement extends CommonDocGenerator
+{
+	var $error='';
+
+
+	/**
+	 *	Return list of active generation modules
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='mouvement';
+		$liste=array();
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		return $liste;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/core/modules/stock/modules_stock.php b/htdocs/core/modules/stock/modules_stock.php
new file mode 100644
index 00000000000..f1c72601b97
--- /dev/null
+++ b/htdocs/core/modules/stock/modules_stock.php
@@ -0,0 +1,52 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+
+/**
+ *	\class      ModeleStock
+ *	\brief      Parent class for stock models of doc generators
+ */
+abstract class ModeleStock extends CommonDocGenerator
+{
+    var $error='';
+
+    /**
+     *  Return list of active generation modules
+     *
+	 * 	@param	DoliDB		$db					Database handler
+     *  @param	integer		$maxfilenamelength  Max length of value to show
+     * 	@return	array							List of templates
+     */
+    static function liste_modeles($db,$maxfilenamelength=0)
+    {
+        global $conf;
+
+        $type='stock';
+        $liste=array();
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $liste=getListOfModels($db,$type,$maxfilenamelength);
+
+        return $liste;
+    }
+}
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 22b746486c8..6eb9f136a27 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -63,7 +63,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
 
@@ -219,7 +219,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
@@ -398,15 +398,16 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
 
 					// Quantity
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxqty, $curY);
 					// Enough for 6 chars
 					if($conf->global->PRODUCT_USE_UNITS)
 					{
-						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R');
+						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
 					}
 					else
 					{
-						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R');
+						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
 					}
 
 					// Unit
@@ -421,7 +422,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->SetXY($this->posxdiscount, $curY);
 					if ($object->lines[$i]->remise_percent)
 					{
-						$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $object->lines[$i]->remise_percent."%", 0, 'R');
+					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $remise_percent."%", 0, 'R');
 					}
 
 					// Total HT line
@@ -1086,7 +1088,16 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		if ($showaddress)
 		{
 			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+		    $carac_emetteur='';
+		    // Add internal contact of proposal if defined
+		    $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+		    if (count($arrayidcontact) > 0)
+		    {
+		        $object->fetch_user($arrayidcontact[0]);
+		        $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+		    }
+
+		    $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy=42;
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 374dde2c64f..6947d67fb16 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -269,7 +269,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
@@ -479,15 +479,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
 
 					// Quantity
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxqty, $curY);
 					// Enough for 6 chars
 					if($conf->global->PRODUCT_USE_UNITS)
 					{
-						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R');
+						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
 					}
 					else
 					{
-						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R');
+						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
 					}
 
 					// Unit
@@ -502,7 +503,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->SetXY($this->posxdiscount, $curY);
 					if ($object->lines[$i]->remise_percent)
 					{
-						$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $object->lines[$i]->remise_percent."%", 0, 'R');
+					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $remise_percent."%", 0, 'R');
 					}
 
 					// Total HT line
@@ -1210,8 +1212,17 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		if ($showaddress)
 		{
-			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+		    // Sender properties
+		    $carac_emetteur='';
+		    // Add internal contact of proposal if defined
+		    $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+		    if (count($arrayidcontact) > 0)
+		    {
+		        $object->fetch_user($arrayidcontact[0]);
+		        $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+		    }
+
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy=42;
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 8c9ed049841..f9567a32a5c 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -226,7 +226,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 52fbeac21d5..227a4258918 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -299,7 +299,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 688f963f455..b8cc257a7d9 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -166,7 +166,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				$this->lastTime = $now;
 			}
 
-			$message = dol_print_date(time(),"%Y-%m-%d %H:%M:%S").$delay." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident>0?str_pad('',$this->ident,' '):'').$content['message'];
+			$message = strftime("%Y-%m-%d %H:%M:%S", time()).$delay." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident>0?str_pad('',$this->ident,' '):'').$content['message'];
 			fwrite($filefd, $message."\n");
 			fclose($filefd);
 			@chmod($logfile, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index e1be41b36ac..8e6017cdf3b 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -23,15 +23,14 @@
  *       \brief      Wrapper that receive any search. Depending on input field, make a redirect to correct URL.
  */
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
+if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');
+if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
 if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
+if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
 if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
 if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
+if (! defined('NOLOGIN')) define('NOLOGIN',1);
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
@@ -142,7 +141,7 @@ if (GETPOST('search_group') != '')
 }
 
 
-    
+
 // If we are here, search was called with no supported criteria
 if (! empty($_SERVER['HTTP_REFERER']))
 {
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 51e6c518a7a..6a59722e4d8 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -173,7 +173,7 @@ $langs->load("modulebuilder");
 </td>
 </tr>
 <!-- Position -->
-<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOST('pos','int'); ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos')?GETPOST('pos','int'):100; ?>"></td></tr>
 <!-- Language file -->
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile','alpha')); ?>"></td></tr>
 <!-- Computed Value -->
@@ -191,7 +191,7 @@ $langs->load("modulebuilder");
 <?php } ?>
 <!-- Visibility -->
 <tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("Visibility"), $langs->trans("VisibleDesc")); ?>
-</td><td class="valeur"><input id="list" size="1" type="text" name="list" value="<?php echo GETPOST('list','int')!='' ? GETPOST('list','int') : '1'; ?>"></td></tr>
+</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo GETPOST('list','int')!='' ? GETPOST('list','int') : '1'; ?>"></td></tr>
 </table>
 
 <?php dol_fiche_end(); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index e08983f9e10..3c3cc1858c5 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -143,6 +143,7 @@ $langs->load("modulebuilder");
 <table summary="listofattributes" class="border centpercent">
 
 <?php
+$label=$extrafields->attributes[$elementtype]['label'][$attrname];
 $type=$extrafields->attributes[$elementtype]['type'][$attrname];
 $size=$extrafields->attributes[$elementtype]['size'][$attrname];
 $computed=$extrafields->attributes[$elementtype]['computed'][$attrname];
@@ -175,7 +176,7 @@ elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($t
 }
 ?>
 <!-- Label -->
-<tr><td class="titlefield fieldrequired"><?php echo $langs->trans("Label"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo $extrafields->attribute_label[$attrname]; ?>"></td></tr>
+<tr><td class="titlefield fieldrequired"><?php echo $langs->trans("Label"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo $label; ?>"></td></tr>
 <!-- Code -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><?php echo $attrname; ?></td></tr>
 <!-- Type -->
@@ -252,7 +253,7 @@ else
 <?php } ?>
 <!-- Visibility -->
 <tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("Visibility"), $langs->trans("VisibleDesc")); ?>
-</td><td class="valeur"><input id="list" size="1" type="text" name="list" value="<?php echo ($list!=''?$list:'1'); ?>"></td></tr>
+</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo ($list!=''?$list:'1'); ?>"></td></tr>
 </table>
 
 <?php dol_fiche_end(); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index ecdda360309..1b0a5303bec 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -91,7 +91,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 		if (! empty($conf->multicompany->enabled))  {
 			print '<td align="center">'.($extrafields->attributes[$elementtype]['entityid'][$key]==0?$langs->trans("All"):$extrafields->attributes[$elementtype]['entitylabel'][$key]).'</td>';
 		}
-		print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';
+		print '<td class="right nowraponall""><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';
 		print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
 		print "</tr>";
 	}
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index e4a63b23b3d..4ae64ea82ed 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -29,7 +29,7 @@ if (empty($object) || ! is_object($object))
 
 ?>
 
-<!-- BEGIN PHP TEMPLATE AJAXROW.TPL.PHP - Script to enable drag and drop on tables -->
+<!-- BEGIN PHP TEMPLATE AJAXROW.TPL.PHP - Script to enable drag and drop on lines of a table -->
 <?php
 $id=$object->id;
 $fk_element=$object->fk_element;
@@ -55,6 +55,7 @@ $(document).ready(function(){
 			var reloadpage = "<?php echo $forcereloadpage; ?>";
 			console.log("tableDND onDrop");
 			console.log(decodeURI($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize()));
+			$('#<?php echo $tagidfortablednd; ?> tr[data-element=extrafield]').attr('id', '');	// Set extrafields id to empty value in order to ignore them in tableDnDSerialize function
 			var roworder = cleanSerialize(decodeURI($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize()));
 			var table_element_line = "<?php echo $table_element_line; ?>";
 			var fk_element = "<?php echo $fk_element; ?>";
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 5baa70825d8..e57452ef8d3 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -152,6 +152,24 @@ if ($action == 'presend')
 			}
 		}
 	}
+	if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+		$listeuser=array();
+		$fuserdest = new User($db);
+
+		$result= $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
+		if ($result>0 && is_array($fuserdest->users) && count($fuserdest->users)>0) {
+			foreach($fuserdest->users as $uuserdest) {
+				$listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id,'email');
+			}
+		} elseif ($result<0) {
+			setEventMessages(null, $fuserdest->errors,'errors');
+		}
+		if (count($listeuser)>0) {
+			$formmail->withtouser = $listeuser;
+			$formmail->withtoccuser = $listeuser;
+		}
+
+	}
 
 	$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
 	$formmail->withtocc = $liste;
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 65312110cc9..9bd0cc7e976 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -19,10 +19,10 @@
  */
 
 // Following var can be set
-// $permission = permission or not to add a file
-// $permtoedit = permission or not to edit file name, crop file
-// $modulepart = for download
-// $param      = param to add to download links
+// $permission  = permission or not to add a file
+// $permtoedit  = permission or not to edit file name, crop file
+// $modulepart  = for download
+// $param       = param to add to download links
 
 // Protection to avoid direct call of template
 if (empty($langs) || ! is_object($langs))
@@ -36,6 +36,15 @@ $langs->load("link");
 if (empty($relativepathwithnofile)) $relativepathwithnofile='';
 if (empty($permtoedit)) $permtoedit=-1;
 
+// Drag and drop for up and down allowed on product, thirdparty, ...
+// The drag and drop call the page core/ajax/row.php
+// If you enable the move up/down of files here, check that page that include template set its sortorder on 'position_name' instead of 'name'
+// Also the object->fk_element must be defined.
+$disablemove=1;
+if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticketsup', 'holiday', 'expensereport'))) $disablemove=0;
+
+
+
 /*
  * Confirm form to delete
  */
@@ -62,7 +71,7 @@ $savingdocmask='';
 if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX))
 {
 	//var_dump($modulepart);
-	if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','expedition','project','project_task','expensereport','tax')))
+	if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','expedition','project','project_task','expensereport','tax', 'produit', 'product_batch')))
 	{
 		$savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
 	}
@@ -86,11 +95,6 @@ $formfile->form_attach_new_file(
 	$savingdocmask
 );
 
-// Drag and drop for up and down allowed on product, thirdparty, ...
-// The drag and drop call the page core/ajax/row.php
-$disablemove=1;
-if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticketsup'))) $disablemove=0;
-
 // List of document
 $formfile->list_of_documents(
     $filearray,
diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php
index 0dc6e81321f..f4f74d35428 100644
--- a/htdocs/core/tpl/extrafields_add.tpl.php
+++ b/htdocs/core/tpl/extrafields_add.tpl.php
@@ -40,7 +40,7 @@ if (empty($conf) || ! is_object($conf))
 $parameters = array();
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (empty($reshook)) {
 	print $object->showOptionals($extrafields, 'edit');
 }
 
diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index 5c63233d373..c6d0cf61043 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -40,7 +40,7 @@ if (empty($conf) || ! is_object($conf))
 $parameters = array();
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (empty($reshook)) {
 	print $object->showOptionals($extrafields, 'edit');
 }
 
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 58915b7a786..2576873a2c5 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -7,8 +7,10 @@ if (empty($conf) || ! is_object($conf))
 	exit;
 }
 
+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
-if (! empty($extrafieldsobjectkey))	// New method: $extrafieldsobject can be 'societe', 'socpeople', ...
+if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
@@ -42,36 +44,3 @@ if (! empty($extrafieldsobjectkey))	// New method: $extrafieldsobject can be 'so
 		}
 	}
 }
-else								// Old method
-{
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-		foreach($extrafields->attribute_label as $key => $val)
-		{
-			if (! empty($arrayfields["ef.".$key]['checked']))
-			{
-				$align=$extrafields->getAlignFlag($key);
-				print '<td';
-				if ($align) print ' align="'.$align.'"';
-				print '>';
-				$tmpkey='options_'.$key;
-				if (in_array($extrafields->attribute_type[$key], array('date', 'datetime', 'timestamp')))
-				{
-					$value = $db->jdate($obj->$tmpkey);
-				}
-				else
-				{
-					$value = $obj->$tmpkey;
-				}
-				print $extrafields->showOutputField($key, $value, '');
-				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
-				if (! empty($val['isameasure']))
-				{
-					if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
-					$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index 42770fc91f5..6243b172479 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -7,37 +7,42 @@ if (empty($conf) || ! is_object($conf))
 	exit;
 }
 
+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+
 // Loop to show all columns of extrafields for the search title line
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	foreach($extrafields->attribute_label as $key => $val)
+	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
-		if (! empty($arrayfields["ef.".$key]['checked'])) {
-			$align=$extrafields->getAlignFlag($key);
-			$typeofextrafield=$extrafields->attribute_type[$key];
-			print '<td class="liste_titre'.($align?' '.$align:'').'">';
-			if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-			{
-				$crit=$val;
-				$tmpkey=preg_replace('/search_options_/','',$key);
-				$searchclass='';
-				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+		foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+		{
+			if (! empty($arrayfields["ef.".$key]['checked'])) {
+				$align=$extrafields->getAlignFlag($key);
+				$typeofextrafield=$extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
+				print '<td class="liste_titre'.($align?' '.$align:'').'">';
+				if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
+				{
+					$crit=$val;
+					$tmpkey=preg_replace('/search_options_/','',$key);
+					$searchclass='';
+					if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+					print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+				}
+				elseif (! in_array($typeofextrafield, array('datetime','timestamp')))
+				{
+					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
+					$morecss='';
+					if ($typeofextrafield == 'sellist') $morecss='maxwidth200';
+					echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_', $morecss);
+				}
+				elseif (in_array($typeofextrafield, array('datetime','timestamp')))
+				{
+					// TODO
+					// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
+				}
+				print '</td>';
 			}
-			elseif (! in_array($typeofextrafield, array('datetime','timestamp')))
-			{
-				// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
-				$morecss='';
-				if ($typeofextrafield == 'sellist') $morecss='maxwidth200';
-				echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_', $morecss);
-			}
-			elseif (in_array($typeofextrafield, array('datetime','timestamp')))
-			{
-				// TODO
-				// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
-			}
-			print '</td>';
 		}
 	}
 }
\ No newline at end of file
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 7006a54351b..a8e43d6429f 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -7,17 +7,24 @@ if (empty($conf) || ! is_object($conf))
 	exit;
 }
 
+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+
 // Loop to complete the sql search criterias from extrafields
-foreach ($search_array_options as $key => $val)
+if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	$crit=$val;
-	$tmpkey=preg_replace('/search_options_/','',$key);
-	$typ=$extrafields->attribute_type[$tmpkey];
-	$mode_search=0;
-	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
-	if (in_array($typ, array('sellist','link','chkbxlst','checkbox')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+	foreach ($search_array_options as $key => $val)
 	{
-		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
+		$crit=$val;
+		$tmpkey=preg_replace('/search_options_/','',$key);
+		$typ=$extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
+
+		$mode_search=0;
+		if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+		if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+		if (in_array($typ, array('chkbxlst','checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
+		if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+		{
+			$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
+		}
 	}
 }
\ No newline at end of file
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index ae5f640828c..8020739d5cb 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -7,18 +7,23 @@ if (empty($conf) || ! is_object($conf))
 	exit;
 }
 
+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+
 // Loop to show all columns of extrafields for the title line
-if (is_array($extrafields->attributes[$object->element]['label']) && count($extrafields->attributes[$object->element]['label']))
+if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	foreach($extrafields->attributes[$object->element]['label'] as $key => $val)
+	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
-		if (! empty($arrayfields["ef.".$key]['checked']))
+		foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
 		{
-			$align=$extrafields->getAlignFlag($key);
-			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attributes[$object->element]['computed'][$key])) $sortonfield='';
-			if ($extrafields->attributes[$object->element]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
-			else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
+			if (! empty($arrayfields["ef.".$key]['checked']))
+			{
+				$align=$extrafields->getAlignFlag($key);
+				$sortonfield = "ef.".$key;
+				if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
+				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
+				else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index e7abadac599..06396cf4fb7 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -45,14 +45,31 @@ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object,
 print $hookmanager->resPrint;
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-//var_dump($extrafields->attributes);
-if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element]['label']))
+//var_dump($extrafields->attributes[$object->table_element]);
+if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
 {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
 	{
 		// Discard if extrafield is a hidden field on form
-		if (empty($extrafields->attributes[$object->table_element]['list'][$key])) continue;	// 0 = Never visible field
-		if (abs($extrafields->attributes[$object->table_element]['list'][$key]) != 1 && abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3) continue;  // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+		$enabled = 1;
+		if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$key]))
+		{
+			$enabled = dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1);
+		}
+		if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$key]))
+		{
+			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
+		}
+		$perms = 1;
+		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))
+		{
+			$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
+		}
+		//print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";
+
+		if (empty($enabled)) continue;	// 0 = Never visible field
+		if (abs($enabled) != 1 && abs($enabled) != 3) continue;  // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+		if (empty($perms)) continue;    // 0 = Not visible
 
 		// Load language if required
 		if (! empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
@@ -67,7 +84,7 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][
 		}
 		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
 		{
-			print $extrafields->showSeparator($key);
+			print $extrafields->showSeparator($key, $object);
 		}
 		else
 		{
@@ -100,7 +117,7 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][
 			{
 			    $fieldid='id';
 			    if ($object->table_element == 'societe') $fieldid='socid';
-				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+				print '<td align="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			$html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';
@@ -139,7 +156,8 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][
 			}
 			else
 			{
-				print $extrafields->showOutputField($key, $value, '', (empty($extrafieldsobjectkey)?'':$extrafieldsobjectkey));
+				//print $key.'-'.$value.'-'.$object->table_element;
+				print $extrafields->showOutputField($key, $value, '', $object->table_element);
 			}
 			print '</td></tr>' . "\n";
 
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index e3dc94cd30e..0f22527ff01 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -121,7 +121,7 @@ if ($disablenofollow) echo '</a>';
 <?php if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php } ?>
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user">
-<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user" size="20" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
+<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
 </span>
 </td>
 </tr>
@@ -131,7 +131,7 @@ if ($disablenofollow) echo '</a>';
 <?php if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php } ?>
 <!--<span class="span-icon-password">-->
 <span class="fa fa-key">
-<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password" type="password" size="20" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE)?'off':'on'; ?>" />
+<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" type="password" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE)?'off':'on'; ?>" />
 </span>
 </td></tr>
 <?php
@@ -165,7 +165,7 @@ if ($captcha) {
 	<table class="login_table_securitycode centpercent"><tr>
 	<td>
 	<span class="span-icon-security">
-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" />
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />
 	</span>
 	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 48989b2daec..d46e27e28af 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -27,6 +27,11 @@
 // $trackid='ord'.$object->id;
 
 
+if ($massaction == 'predeletedraft')
+{
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDraftDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
+}
+
 if ($massaction == 'predelete')
 {
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index fdef8a03ed8..61818d4deb9 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -111,7 +111,7 @@ if ($nolinesbefore) {
 	<?php } ?>
 	<td class="linecolvat" align="right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 	<td class="linecoluht" align="right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
-	<?php if (!empty($conf->multicurrency->enabled)) { $colspan++;?>
+	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { $colspan++;?>
 	<td class="linecoluht_currency" align="right"><span id="title_up_ht_currency"><?php echo $langs->trans('PriceUHTCurrency'); ?></span></td>
 	<?php } ?>
 	<?php if (! empty($inputalsopricewithtax)) { ?>
@@ -345,7 +345,7 @@ else {
 	<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (isset($_POST["price_ht"])?GETPOST("price_ht",'alpha',2):''); ?>">
 	</td>
 
-	<?php if (!empty($conf->multicurrency->enabled)) { $colspan++;?>
+	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { $colspan++;?>
 	<td class="nobottom linecoluht_currency" align="right">
 	<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (isset($_POST["multicurrency_price_ht"])?GETPOST("multicurrency_price_ht",'alpha',2):''); ?>">
 	</td>
@@ -462,7 +462,7 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
 		}
 	}
 
-	if (!empty($conf->multicurrency->enabled)) $colspan+=2;
+	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
 
 	if (! empty($usemargins))
 	{
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 63321d16506..d3dc9807c5a 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -53,7 +53,7 @@ $colspan = 3;	// Col total ht + col edit + col delete
 if (! empty($inputalsopricewithtax)) $colspan++;	// We add 1 if col total ttc
 if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
 if (empty($user->rights->margins->creer)) $colspan++;
-if (!empty($conf->multicurrency->enabled)) $colspan+=2;
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
 ?>
 
 <!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->
@@ -132,7 +132,7 @@ $coldisplay=-1; // We remove first td
 	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
 	{
 	?>
-		<td align="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo $line->ref_fourn; ?>"></td>
+		<td align="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
 	<?php
 	}
 
@@ -148,7 +148,7 @@ $coldisplay=-1; // We remove first td
 	if ($this->situation_counter > 1) print ' readonly';
 	print '></td>';
 
-	if (!empty($conf->multicurrency->enabled)) {
+	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
 		print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
 	}
 
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index bc191ce9d80..b36159f9340 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -152,7 +152,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
 			if ($line->date_start_fill || $line->date_end_fill) echo '</div>';
 		}
 		else {
-			echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			if ($line->date_start || $line->date_end) echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
 			//echo get_date_range($line->date_start, $line->date_end, $format);
 		}
 
@@ -195,7 +195,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
 
 	<td align="right" class="linecoluht nowrap"><?php $coldisplay++; ?><?php echo price($line->subprice); ?></td>
 
-	<?php if (!empty($conf->multicurrency->enabled)) { ?>
+	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
 	<td align="right" class="linecoluht_currency nowrap"><?php $coldisplay++; ?><?php echo price($line->multicurrency_subprice); ?></td>
 	<?php } ?>
 
@@ -261,7 +261,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
 	<td align="right" class="linecoloption nowrap"><?php $coldisplay++; ?><?php echo $langs->trans('Option'); ?></td>
 	<?php } else { ?>
 	<td align="right" class="liencolht nowrap"><?php $coldisplay++; ?><?php echo price($line->total_ht); ?></td>
-		<?php if (!empty($conf->multicurrency->enabled)) { ?>
+		<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
 		<td align="right" class="linecolutotalht_currency nowrap"><?php $coldisplay++; ?><?php echo price($line->multicurrency_total_ht); ?></td>
 		<?php } ?>
 	<?php } ?>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index e1b3ebfc21f..2f36d32535f 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -95,7 +95,7 @@ if ($disablenofollow) echo '</a>';
 <td valign="bottom" class="nowrap center">
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user">
-<input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user" size="20" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
+<input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
 </span>
 </td>
 </tr>
@@ -132,7 +132,7 @@ if (! empty($morelogincontent)) {
 	<td>
 	<!-- <span class="span-icon-security"> -->
 	<span class="nofa">
-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" />
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />
 	</span>
 	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index a3b11222a0f..2301b1642b4 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -889,6 +889,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$actioncomm->fk_element  = $elementid;
 		$actioncomm->elementtype = $elementtype;
 
+		if (property_exists($object,'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid)>0) {
+			$actioncomm->userassigned=$object->sendtouserid;
+		}
+
 		$ret=$actioncomm->create($user);       // User creating action
 
 		if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index f97d1400018..2750834bac6 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -23,7 +23,6 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
 
 /**
@@ -56,6 +55,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 		$b=new BlockedLog($this->db);
 
 		// Tracked events
@@ -111,7 +111,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 0; // not implemented action log
 		}
 
-		$result = $b->setObjectData($object, $action, $amounts);		// Set field date_object, ref_object, fk_object, element, object_data
+		$result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
 
 		if ($result < 0)
 		{
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 8cfece7dc89..7677c1743a8 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -24,8 +24,6 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
-require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
 
 /**
@@ -60,6 +58,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			return 0;
 		}
 
+		require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
+
 		$result=0;
 
 		// Users
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index ecf57316c89..c5f704fdcb1 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -22,8 +22,6 @@
  *  \brief      File to manage triggers Mailman and Spip
  */
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
-require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
 
 /**
@@ -51,6 +49,9 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	{
         if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
 
+        require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
+        require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
+
         if ($action == 'CATEGORY_LINK')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -74,10 +75,10 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
         	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
-        	if (is_object($object->unlinkoff) && method_exists($object->unlinkoff, 'del_to_abo') && $object->unlinkoff->del_to_abo() < 0)
+        	if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0)
         	{
-    			$this->error=$object->unlinkoff->error;
-        		$this->errors=$object->unlinkoff->errors;
+        		$this->error=$object->context['unlinkoff']->error;
+        		$this->errors=$object->context['unlinkoff']->errors;
         		$return=-1;
         	}
         	else
diff --git a/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php
index b1dd9fb282a..d27f0d6aa67 100644
--- a/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php
@@ -110,174 +110,209 @@ class InterfaceTicketEmail extends DolibarrTriggers
     		case 'TICKET_ASSIGNED':
 	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
 
-	            if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id) {
+	            if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
+	            {
 	                $userstat = new User($this->db);
 	                $res = $userstat->fetch($object->fk_user_assign);
-	                if ($res) {
-	                    // Send email to assigned user
-	                    $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
-	                    $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
-	                    $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
-	                    $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
-	                    $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
-	                    $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
-	                    // Extrafields
-	                    if (is_array($object->array_options) && count($object->array_options) > 0) {
-	                        foreach ($object->array_options as $key => $value) {
-                                $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+	                if ($res > 0)
+	                {
+	                	if (empty($conf->global->TICKETS_DISABLE_ALL_MAILS))
+	                	{
+	                		// Init to avoid errors
+	                		$filepath = array();
+	                		$filename = array();
+	                		$mimetype = array();
+
+	                		// Send email to assigned user
+		                    $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
+		                    $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
+		                    $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
+		                    $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
+		                    $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
+		                    $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
+		                    // Extrafields
+		                    if (is_array($object->array_options) && count($object->array_options) > 0) {
+		                        foreach ($object->array_options as $key => $value) {
+	                                $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+		                        }
+		                    }
+
+		                    $message .= '</ul>';
+		                    $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
+		                    $message .= '<p><a href="' . dol_buildpath('/ticketsup/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
+
+		                    $sendto = $userstat->email;
+		                    $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
+
+	                        $message = dol_nl2br($message);
+
+	                        if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 	                        }
-	                    }
-
-	                    $message .= '</ul>';
-	                    $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
-	                    $message .= '<p><a href="' . dol_buildpath('/ticketsup/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
-
-	                    $sendto = $userstat->email;
-	                    $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
-
-	                    // Init to avoid errors
-	                    $filepath = array();
-	                    $filename = array();
-	                    $mimetype = array();
-
-                        $message = dol_nl2br($message);
-
-                        if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
-                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-                        }
-                        include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
-	                    $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
-	                    if ($mailfile->error) {
-                            setEventMessage($mailfile->error, 'errors');
-	                    } else {
-	                        $result = $mailfile->sendfile();
-	                    }
-                        if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
-                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-                        }
+	                        include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+		                    $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
+		                    if ($mailfile->error) {
+	                            setEventMessage($mailfile->error, 'errors');
+		                    } else {
+		                        $result = $mailfile->sendfile();
+		                    }
+	                        if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+	                        }
+	                	}
 
                         $ok = 1;
 	                }
+	                else
+	                {
+	                	$this->error = $userstat->error;
+	                	$this->errors = $userstat->errors;
+	                }
 	            }
 	            break;
 
-
     		case 'TICKET_CREATE':
 	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
 
-	            // Init to avoid errors
-	            $filepath = array();
-	            $filename = array();
-	            $mimetype = array();
-
 	            $langs->load('ticketsup');
 
-	            $object->fetch('', $object->track_id);
+	            $object->fetch('', $object->track_id);	// Should be useless
 
-	            /* Send email to admin */
-	            $sendto = $conf->global->TICKETS_NOTIFICATION_EMAIL_TO;
-	            $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
-	            $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
-	            $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-	            $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-	            $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-	            $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-	            $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
-	            // Extrafields
-	            if (is_array($object->array_options) && count($object->array_options) > 0) {
-	                foreach ($object->array_options as $key => $value) {
-	                      $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+
+	            // Send email to notification email
+
+	            if (empty($conf->global->TICKETS_DISABLE_ALL_MAILS) && empty($object->context['disableticketsupemail']))
+	            {
+		            $sendto = $conf->global->TICKETS_NOTIFICATION_EMAIL_TO;
+
+		            if ($sendto)
+					{
+						// Init to avoid errors
+						$filepath = array();
+						$filename = array();
+						$mimetype = array();
+
+						/* Send email to admin */
+			            $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
+			            $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+			            $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+			            $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+			            $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+			            $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+			            $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
+			            // Extrafields
+			            if (is_array($object->array_options) && count($object->array_options) > 0) {
+			                foreach ($object->array_options as $key => $value) {
+			                      $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			                }
+			            }
+			            $message_admin.='</ul>';
+
+			            if ($object->fk_soc > 0) {
+			                      $object->fetch_thirdparty();
+			                      $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
+			            }
+
+			            $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+			            $message_admin.='<p><a href="'.dol_buildpath('/ticketsup/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+
+			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKETS_NOTIFICATION_EMAIL_FROM.'>';
+			            $replyto = $from;
+
+		                $message_admin = dol_nl2br($message_admin);
+
+		                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+		                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+		                }
+		                include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			            $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+			            if ($mailfile->error) {
+		                    dol_syslog($mailfile->error, LOG_DEBUG);
+			            } else {
+			                     $result=$mailfile->sendfile();
+			            }
+		                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+		                }
+					}
+	            }
+
+				// Send email to customer
+
+				if (empty($conf->global->TICKETS_DISABLE_ALL_MAILS) && empty($object->context['disableticketsupemail']) && $object->notify_tiers_at_create)
+	            {
+		            $sendto = '';
+		            if (empty($user->socid) && empty($user->email)) {
+		                      $object->fetch_thirdparty();
+		                      $sendto = $object->thirdparty->email;
+		            } else {
+		                $sendto = $user->email;
+		            }
+
+		            if ($sendto) {
+		            	// Init to avoid errors
+		            	$filepath = array();
+		            	$filename = array();
+		            	$mimetype = array();
+
+		            	$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
+			            $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
+			            $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+			            $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+			            $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+			            $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+
+			            // Extrafields
+			            foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
+			            {
+			            	$enabled = 1;
+			            	if ($enabled && isset($this->attributes[$object->table_element]['list'][$key]))
+			            	{
+			            		$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+			            	}
+			            	$perms = 1;
+			            	if ($perms && isset($this->attributes[$object->table_element]['perms'][$key]))
+			            	{
+			            		$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+			            	}
+
+			            	$qualified = true;
+			            	if (empty($enabled)) $qualified = false;
+			            	if (empty($perms)) $qualified = false;
+
+			            	if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            }
+
+			            $message_customer.='</ul>';
+			            $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+			            $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE?$conf->global->TICKETS_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticketsup/view.php', 2)).'?track_id='.$object->track_id;
+			            $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
+			            $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
+
+			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKETS_NOTIFICATION_EMAIL_FROM.'>';
+			            $replyto = $from;
+
+	                    $message_customer = dol_nl2br($message_customer);
+
+	                    if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                        $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+	                    }
+	                    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			            $mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+			            if ($mailfile->error) {
+	                        dol_syslog($mailfile->error, LOG_DEBUG);
+			            } else {
+			                      $result=$mailfile->sendfile();
+			            }
+	                    if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+	                    }
 	                }
 	            }
-	            $message_admin.='</ul>';
-
-	            if ($object->fk_soc > 0) {
-	                      $object->fetch_thirdparty();
-	                      $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
-	            }
-
-	            $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-	            $message_admin.='<p><a href="'.dol_buildpath('/ticketsup/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
-
-	            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKETS_NOTIFICATION_EMAIL_FROM.'>';
-	            $replyto = $from;
-
-                $message_admin = dol_nl2br($message_admin);
-
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
-                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-                }
-                include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	            $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-	            if ($mailfile->error) {
-                    dol_syslog($mailfile->error, LOG_DEBUG);
-	            } else {
-	                     $result=$mailfile->sendfile();
-	            }
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
-                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-                }
-
-                /* Send email to customer */
-	            $sendto = '';
-	            if (empty($user->socid) && empty($user->email)) {
-	                      $object->fetch_thirdparty();
-	                      $sendto = $object->thirdparty->email;
-	            } else {
-	                $sendto = $user->email;
-	            }
-
-	            if ($sendto && $object->notify_tiers_at_create) {
-		            $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
-		            $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
-		            $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-		            $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-		            $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-		            $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-		            // Extrafields
-		            if ($conf->global->TICKETS_EXTRAFIELDS_PUBLIC) {
-		                if (is_array($object->array_options) && count($object->array_options) > 0) {
-		                    foreach ($object->array_options as $key => $value) {
-                                $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
-		                    }
-		                }
-		            }
-		            $message_customer.='</ul>';
-		            $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-		            $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE?$conf->global->TICKETS_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/ticketsup/public/view.php', 2)).'?track_id='.$object->track_id;
-		            $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
-		            $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
-
-
-		            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKETS_NOTIFICATION_EMAIL_FROM.'>';
-		            $replyto = $from;
-
-		            // Init to avoid errors
-		            $filepath = array();
-		            $filename = array();
-		            $mimetype = array();
-
-                    $message_customer = dol_nl2br($message_customer);
-
-                    if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
-                        $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-                    }
-                    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		            $mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-		            if ($mailfile->error) {
-                        dol_syslog($mailfile->error, LOG_DEBUG);
-		            } else {
-		                      $result=$mailfile->sendfile();
-		            }
-                    if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
-                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-                    }
-                }
                 $ok = 1;
-
 	            break;
 
             case 'TICKET_DELETE':
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index b6428c51b28..7d4680be3f9 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -28,8 +28,8 @@
  *              - Le nom de la propriete name doit etre Mytrigger
  */
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-dol_include_once('/stripe/class/stripe.class.php');
-$path=dirname(__FILE__).'/';
+
+
 /**
  *  Class of triggers for stripe module
  */
@@ -47,8 +47,8 @@ class InterfaceStripe
         $this->db = $db;
 
         $this->name = preg_replace('/^Interface/i', '', get_class($this));
-	      $this->family = 'Stripeconnect';
-        $this->description = "Triggers of the module Stripeconnect";
+	    $this->family = 'stripe';
+        $this->description = "Triggers of the module Stripe";
         $this->version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' or version
         $this->picto = 'stripe@stripe';
     }
@@ -120,7 +120,10 @@ class InterfaceStripe
 		$langs->load('other');
 
 		$ok = 0;
+
+		require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 		$stripe = new Stripe($db);
+
 		if (empty($conf->stripe->enabled)) return 0;
 
 		$service = 'StripeTest';
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 707b75b95fe..7730f6aafe4 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -624,7 +624,7 @@ else
 		}
 		else
 		{
-			$mc->getInfo($obj->entity);
+			$mc->getInfo($object->entity);
 			print $mc->label;
 		}
 		print "</td></tr>";
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index aeb0d7229b4..e3235789d66 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1050,8 +1050,9 @@ class Cronjob extends CommonObject
 			{
 				dol_syslog(get_class($this)."::run_jobs START ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG);
 
-				// Create Object for the call module
+				// Create Object for the called module
 				$object = new $this->objectname($this->db);
+				if ($this->entity > 0) $object->entity = $this->entity;		// We work on a dedicated entity
 
 				$params_arr = array_map('trim', explode(",",$this->params));
 
@@ -1067,9 +1068,16 @@ class Cronjob extends CommonObject
 				if ($result === false || (! is_bool($result) && $result != 0))
 				{
 				    $langs->load("errors");
-					dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$object->error, LOG_ERR);
-				    $this->error = $object->error?$object->error:$langs->trans('ErrorUnknown');
-					$this->lastoutput = ($object->output?$object->output."\n":"").$this->error;
+
+				    $errmsg='';
+				    if (! is_array($object->errors) || ! in_array($object->error, $object->errors)) $errmsg.=$object->error;
+				    if (is_array($object->errors) && count($object->errors)) $errmsg.=($errmsg?', '.$errmsg:'').join(', ',$object->errors);
+				    if (empty($errmsg)) $errmsg=$langs->trans('ErrorUnknown');
+
+				    dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$errmsg, LOG_ERR);
+
+				    $this->error = $errmsg;
+				    $this->lastoutput = ($object->output?$object->output."\n":"").$errmsg;
 					$this->lastresult = is_numeric($result)?$result:-1;
 		            $retval = $this->lastresult;
 		            $error++;
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 7bca10ff883..61b31d37131 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -276,6 +276,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -332,16 +337,21 @@ print '<input type="hidden" name="search_status" value="'.$search_status.'" >';
 print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 // Line with explanation and button new job
-if (! $user->rights->cron->create)
+$newcardbutton='';
+if ($user->rights->cron->create)
 {
-    $buttontoshow.='<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob").'</a>';
+	$newcardbutton.='<a class="butActionNew" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob");
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 else
 {
-    $buttontoshow.='<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
+	$newcardbutton.='<a class="butActionNewRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob");
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
-print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $buttontoshow, '', $limit);
+print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $newcardbutton, '', $limit);
 
 
 print $langs->trans('CronInfo').'<br>';
@@ -498,7 +508,10 @@ if ($num > 0)
 		print '</td>';
 
 		print '<td class="center">';
-		if ($obj->lastresult != '') {print dol_trunc($obj->lastresult);}
+		if ($obj->lastresult != '') {
+			if (empty($obj->lastresult)) print $obj->lastresult;
+			else print '<span class="error">'.dol_trunc($obj->lastresult).'</div>';
+		}
 		print '</td>';
 
 		print '<td>';
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 25f2ac8ccc7..9e5121112d0 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -244,7 +244,7 @@ class CdavLib
 	 *
 	 * @param int	 	$calendarId			Calendar id
 	 * @param int		$bCalendarData		Add calendar data
-	 * @return array|string[][]|unknown[][]|NULL[][]
+	 * @return array|string[][]
 	 */
 	public function getFullCalendarObjects($calendarId, $bCalendarData)
 	{
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index c8b71d1e3f5..cd19fc294ec 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -21,16 +21,12 @@
  *      \brief      Server DAV
  */
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOLOGIN'))  		 define("NOLOGIN",1);		// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 
 require ("../main.inc.php");
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -56,7 +52,9 @@ if(empty($conf->dav->enabled))
 
 // settings
 $publicDir = $conf->dav->dir_output.'/public';
-$tmpDir = $conf->dav->dir_output.'/tmp';
+$privateDir = $conf->dav->dir_output.'/private';
+$tmpDir = $conf->dav->dir_temp;
+//var_dump($tmpDir);exit;
 
 // Authentication callback function
 $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password)
@@ -100,7 +98,8 @@ $nodes = array();
 
 // Enable directories and features according to DAV setup
 // / Public docs
-$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/public');
+if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR)) $nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/public');
+$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/private');
 
 // Principals Backend
 //$principalBackend = new \Sabre\DAVACL\PrincipalBackend\Dolibarr($user,$db);
@@ -124,8 +123,14 @@ $baseUri = DOL_URL_ROOT.'/dav/fileserver.php/';
 if (isset($baseUri)) $server->setBaseUri($baseUri);
 
 // Add authentication function
-$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
-
+if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
+	|| ! preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public','/').'/', $_SERVER["PHP_SELF"]))
+	&& ! preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
+	)
+{
+	//var_dump($_SERVER["QUERY_STRING"]);exit;
+	$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
+}
 // Support for LOCK and UNLOCK
 $lockBackend = new \Sabre\DAV\Locks\Backend\File($tmpDir . '/.locksdb');
 $lockPlugin = new \Sabre\DAV\Locks\Plugin($lockBackend);
diff --git a/htdocs/document.php b/htdocs/document.php
index 50f4a61186d..725d079a9f6 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -32,31 +32,31 @@
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','1');
 if (! defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL','1');
 if (! defined('NOREQUIREMENU'))		define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');
-//if (! defined('NOREQUIREHOOK'))		define('NOREQUIREHOOK','1');	// Disable "main.inc.php" hooks
+
 // For bittorent link, we don't need to load/check we are into a login session
-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'bittorrent' && ! defined("NOLOGIN"))
+if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'bittorrent')
 {
-	define("NOLOGIN",1);
-	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOLOGIN"))		define("NOLOGIN",1);
+	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 // For direct external download link, we don't need to load/check we are into a login session
-if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))
+if (isset($_GET["hashp"]))
 {
-	define("NOLOGIN",1);
-	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOLOGIN"))		define("NOLOGIN",1);
+	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined("NOLOGIN"))
+if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
 {
-	define("NOLOGIN",1);
-	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOLOGIN"))		define("NOLOGIN",1);
+	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 
 /**
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 78b8d01e51d..46f223d3857 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -242,8 +242,15 @@ else if ($action == 'classin' && $user->rights->don->creer)
 	$object->fetch($id);
 	$object->setProject($projectid);
 }
+
+// Actions to build doc
+$upload_dir = $conf->don->dir_output;
+$permissioncreate = $user->rights->don->creer;
+include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+
 // Remove file in doc form
-if ($action == 'remove_file')
+/*if ($action == 'remove_file')
 {
 	$object = new Don($db, 0, $_GET['id']);
 	if ($object->fetch($id))
@@ -261,11 +268,12 @@ if ($action == 'remove_file')
 		$action='';
 	}
 }
+*/
 
 /*
  * Build doc
  */
-
+/*
 if ($action == 'builddoc')
 {
 	$object = new Don($db);
@@ -291,6 +299,7 @@ if ($action == 'builddoc')
 		exit;
 	}
 }
+*/
 
 
 /*
@@ -387,7 +396,7 @@ if ($action == 'create')
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    if (empty($reshook))
     {
 		print $object->showOptionals($extrafields,'edit',$parameters);
     }
@@ -513,7 +522,7 @@ if (! empty($id) && $action == 'edit')
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    if (empty($reshook))
     {
       	print $object->showOptionals($extrafields,'edit');
     }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 86bfe2e6823..90cf8bad1b4 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -52,6 +52,10 @@ class Don extends CommonObject
     var $fk_typepayment;
 	var $num_payment;
 	var $date_valid;
+	var $modepaymentid = 0;
+
+	var $labelstatut;
+	var $labelstatutshort;
 
 	/**
 	 * @deprecated
@@ -59,6 +63,7 @@ class Don extends CommonObject
 	 */
 	var $commentaire;
 
+
     /**
      *  Constructor
      *
@@ -69,17 +74,6 @@ class Don extends CommonObject
         global $langs;
 
         $this->db = $db;
-        $this->modepaymentid = 0;
-
-        $langs->load("donations");
-        $this->labelstatut[-1]=$langs->trans("Canceled");
-        $this->labelstatut[0]=$langs->trans("DonationStatusPromiseNotValidated");
-        $this->labelstatut[1]=$langs->trans("DonationStatusPromiseValidated");
-        $this->labelstatut[2]=$langs->trans("DonationStatusPaid");
-        $this->labelstatutshort[-1]=$langs->trans("Canceled");
-        $this->labelstatutshort[0]=$langs->trans("DonationStatusPromiseNotValidatedShort");
-        $this->labelstatutshort[1]=$langs->trans("DonationStatusPromiseValidatedShort");
-        $this->labelstatutshort[2]=$langs->trans("DonationStatusPaidShort");
     }
 
 
@@ -103,7 +97,19 @@ class Don extends CommonObject
      */
     function LibStatut($statut,$mode=0)
     {
-        global $langs;
+    	if (empty($this->labelstatut) || empty($this->labelstatushort))
+    	{
+	    	global $langs;
+	    	$langs->load("donations");
+	    	$this->labelstatut[-1]=$langs->trans("Canceled");
+	    	$this->labelstatut[0]=$langs->trans("DonationStatusPromiseNotValidated");
+	    	$this->labelstatut[1]=$langs->trans("DonationStatusPromiseValidated");
+	    	$this->labelstatut[2]=$langs->trans("DonationStatusPaid");
+	    	$this->labelstatutshort[-1]=$langs->trans("Canceled");
+	    	$this->labelstatutshort[0]=$langs->trans("DonationStatusPromiseNotValidatedShort");
+	    	$this->labelstatutshort[1]=$langs->trans("DonationStatusPromiseValidatedShort");
+	    	$this->labelstatutshort[2]=$langs->trans("DonationStatusPaidShort");
+    	}
 
         if ($mode == 0)
         {
@@ -396,7 +402,7 @@ class Don extends CommonObject
         }
 
 		// Update extrafield
-        if (!$error) {
+        if (! $error) {
         	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
         	{
         		$result=$this->insertExtraFields();
@@ -482,7 +488,7 @@ class Don extends CommonObject
             }
 
             // Update extrafield
-            if (!$error)
+            if (! $error)
 			{
               	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
                	{
@@ -925,4 +931,112 @@ class Don extends CommonObject
 		}
 	}
 
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	{
+		global $conf,$langs;
+
+		$langs->load("bills");
+
+		if (! dol_strlen($modele)) {
+
+			$modele = 'html_cerfafr';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->DON_ADDON_MODEL)) {
+				$modele = $conf->global->DON_ADDON_MODEL;
+			}
+		}
+
+		$modelpath = "core/modules/dons/";
+
+		// TODO Restore use of commonGenerateDocument instead of dedicated code here
+		//return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+		// Increase limit for PDF build
+		$err=error_reporting();
+		error_reporting(0);
+		@set_time_limit(120);
+		error_reporting($err);
+
+		$srctemplatepath='';
+
+		// If selected modele is a filename template (then $modele="modelname:filename")
+		$tmp=explode(':',$modele,2);
+		if (! empty($tmp[1]))
+		{
+			$modele=$tmp[0];
+			$srctemplatepath=$tmp[1];
+		}
+
+		// Search template files
+		$file=''; $classname=''; $filefound=0;
+		$dirmodels=array('/');
+		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+		foreach($dirmodels as $reldir)
+		{
+			foreach(array('html','doc','pdf') as $prefix)
+			{
+				$file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php";
+
+				// On verifie l'emplacement du modele
+				$file=dol_buildpath($reldir."core/modules/dons/".$file,0);
+				if (file_exists($file))
+				{
+					$filefound=1;
+					$classname=$prefix.'_'.$modele;
+					break;
+				}
+			}
+			if ($filefound) break;
+		}
+
+		// Charge le modele
+		if ($filefound)
+		{
+			require_once $file;
+
+			$object=$this;
+
+			$classname = $modele;
+			$obj = new $classname($db);
+
+			// We save charset_output to restore it because write_file can change it if needed for
+			// output format that does not support UTF8.
+			$sav_charset_output=$outputlangs->charset_output;
+			if ($obj->write_file($object,$outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
+			{
+				$outputlangs->charset_output=$sav_charset_output;
+
+				// we delete preview files
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+				dol_delete_preview($object);
+				return 1;
+			}
+			else
+			{
+				$outputlangs->charset_output=$sav_charset_output;
+				dol_syslog("Erreur dans don_create");
+				dol_print_error($db,$obj->error);
+				return 0;
+			}
+		}
+		else
+		{
+			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+			return 0;
+		}
+	}
+
 }
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 0ae81231bc1..020272d5bae 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -171,7 +171,7 @@ if ($object->id)
 	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
 
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index b72e63f7797..d9bee39723c 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -150,7 +150,6 @@ print '</tr>';
 
 $total=0;
 $totalnb=0;
-$var=true;
 foreach ($listofstatus as $status)
 {
 
@@ -200,10 +199,8 @@ if ($resql)
     if ($num)
     {
         $i = 0;
-        $var = True;
         while ($i < $num)
         {
-
             $obj = $db->fetch_object($resql);
 
             print '<tr class="oddeven">';
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 4d7db533e12..334d1f219c2 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
  *
@@ -34,7 +34,7 @@ $langs->load("donations");
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -113,12 +113,19 @@ if (trim($search_name) != '')
 if ($search_amount) $sql.= natural_search('d.amount', $search_amount, 1);
 
 $sql.= $db->order($sortfield,$sortorder);
+
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
+
 $sql.= $db->plimit($limit+1, $offset);
 
 $resql = $db->query($sql);
@@ -131,7 +138,13 @@ if ($resql)
     //if ($page > 0) $param.= '&page='.$page;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/don/card.php?action=create">'.$langs->trans('NewDonation').'</a>';
+	$newcardbutton='';
+	if ($user->rights->don->creer)
+	{
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/don/card.php?action=create">'.$langs->trans('NewDonation');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
+	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 68d29fe3dc1..e4a7ef5c5d4 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -226,13 +226,10 @@ if ($resql)
 
 	if ($num > 0)
 	{
-		$var=True;
-
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
 
-
 			print '<tr class="oddeven">';
 			// Ref
 			print '<td>';
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index b8cd532d35a..cb574da939a 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -277,7 +277,7 @@ foreach ($data as $val)
 		$oldyear--;
 		print '<tr height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
-	
+
 		print '<td align="right">0</td>';
 		/*print '<td align="right">0</td>';
 		print '<td align="right">0</td>';*/
@@ -300,7 +300,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
     print $px1->show();
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 6753a4299b0..666c6df9217 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -22,10 +22,8 @@
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 698960974d5..f1c0b6b1448 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2018       Francis Appels      <francis.appels@yahoo.com>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 /**
  * Class to manage ECM files
  */
-class EcmFiles //extends CommonObject
+class EcmFiles extends CommonObject
 {
 	/**
 	 * @var string Id to identify managed objects
@@ -65,6 +66,8 @@ class EcmFiles //extends CommonObject
 	public $fk_user_c;
 	public $fk_user_m;
 	public $acl;
+	public $src_object_type;
+	public $src_object_id;
 
 	/**
 	 */
@@ -142,6 +145,9 @@ class EcmFiles //extends CommonObject
 		if (isset($this->acl)) {
 			 $this->acl = trim($this->acl);
 		}
+		if (isset($this->src_object_type)) {
+			$this->src_object_type = trim($this->src_object_type);
+		}
 		if (empty($this->date_c)) $this->date_c = dol_now();
 		if (empty($this->date_m)) $this->date_m = dol_now();
 
@@ -161,15 +167,27 @@ class EcmFiles //extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 				$maxposition = (int) $obj->maxposition;
 			}
-			else dol_print_error($this->db);
+			else
+			{
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				return --$error;
+			}
+			$maxposition=$maxposition+1;
+		}
+		else
+		{
+			$maxposition=$this->position;
 		}
-		$maxposition=$maxposition+1;
 
 		// Check parameters
 		if (empty($this->filename) || empty($this->filepath))
 		{
 			$this->errors[] = 'Bad property filename or filepath';
-			return -1;
+			return --$error;
+		}
+		if (! isset($this->entity))
+		{
+			$this->entity = $conf->entity;
 		}
 		// Put here code to add control on parameters values
 
@@ -192,12 +210,14 @@ class EcmFiles //extends CommonObject
 		$sql.= 'date_m,';
 		$sql.= 'fk_user_c,';
 		$sql.= 'fk_user_m,';
-		$sql.= 'acl';
+		$sql.= 'acl,';
+		$sql.= 'src_object_type,';
+		$sql.= 'src_object_id';
 		$sql .= ') VALUES (';
 		$sql .= " '".$ref."', ";
 		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
 		$sql .= ' '.(! isset($this->share)?'NULL':"'".$this->db->escape($this->share)."'").',';
-		$sql .= ' '.(! isset($this->entity)?$conf->entity:$this->entity).',';
+		$sql .= ' '.$this->entity.',';
 		$sql .= ' '.(! isset($this->filename)?'NULL':"'".$this->db->escape($this->filename)."'").',';
 		$sql .= ' '.(! isset($this->filepath)?'NULL':"'".$this->db->escape($this->filepath)."'").',';
 		$sql .= ' '.(! isset($this->fullpath_orig)?'NULL':"'".$this->db->escape($this->fullpath_orig)."'").',';
@@ -211,7 +231,9 @@ class EcmFiles //extends CommonObject
 		$sql .= ' '.(! isset($this->date_m) || dol_strlen($this->date_m)==0?'NULL':"'".$this->db->idate($this->date_m)."'").',';
 		$sql .= ' '.(! isset($this->fk_user_c)?$user->id:$this->fk_user_c).',';
 		$sql .= ' '.(! isset($this->fk_user_m)?'NULL':$this->fk_user_m).',';
-		$sql .= ' '.(! isset($this->acl)?'NULL':"'".$this->db->escape($this->acl)."'");
+		$sql .= ' '.(! isset($this->acl)?'NULL':"'".$this->db->escape($this->acl)."'").',';
+		$sql .= ' '.(! isset($this->src_object_type)?'NULL':"'".$this->db->escape($this->src_object_type)."'").',';
+		$sql .= ' '.(! isset($this->src_object_id)?'NULL':$this->src_object_id);
 		$sql .= ')';
 
 		$this->db->begin();
@@ -227,14 +249,13 @@ class EcmFiles //extends CommonObject
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 			$this->position = $maxposition;
 
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
+			// Triggers
+			if (! $notrigger)
+			{
+				// Call triggers
+				$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 		}
 
@@ -253,14 +274,16 @@ class EcmFiles //extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param  int    $id          	   Id object
-	 * @param  string $ref         	   Hash of file name (filename+filepath). Not always defined on some version.
-	 * @param  string $relativepath    Relative path of file from document directory. Example: path/path2/file
-	 * @param  string $hashoffile      Hash of file content. Take the first one found if same file is at different places. This hash will also change if file content is changed.
-	 * @param  string $hashforshare    Hash of file sharing.
-	 * @return int                 	   <0 if KO, 0 if not found, >0 if OK
+	 * @param  int    $id          	   	Id object
+	 * @param  string $ref         	   	Hash of file name (filename+filepath). Not always defined on some version.
+	 * @param  string $relativepath    	Relative path of file from document directory. Example: path/path2/file
+	 * @param  string $hashoffile      	Hash of file content. Take the first one found if same file is at different places. This hash will also change if file content is changed.
+	 * @param  string $hashforshare    	Hash of file sharing.
+	 * @param  string $src_object_type 	src_object_type to search
+	 * @param  string $src_object_id 	src_object_id to search
+	 * @return int                 	   	<0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id, $ref = '', $relativepath = '', $hashoffile='', $hashforshare='')
+	public function fetch($id, $ref = '', $relativepath = '', $hashoffile='', $hashforshare='', $src_object_type='', $src_object_id=0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -283,7 +306,9 @@ class EcmFiles //extends CommonObject
 		$sql .= " t.date_m,";
 		$sql .= " t.fk_user_c,";
 		$sql .= " t.fk_user_m,";
-		$sql .= " t.acl";
+		$sql .= " t.acl,";
+		$sql .= " t.src_object_type,";
+		$sql .= " t.src_object_id";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql.= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
@@ -301,8 +326,13 @@ class EcmFiles //extends CommonObject
 		}
 		elseif (! empty($hashforshare)) {
 			$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
-		} else {
-			$sql .= ' AND t.rowid = ' . $id;
+		}
+		elseif ($src_object_type && $src_object_id)
+		{
+			$sql.= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id);
+		}
+		else {
+			$sql .= ' AND t.rowid = '.$this->db->escape($id);
 		}
 		// When we search on hash of content, we take the first one. Solve also hash conflict.
 		$this->db->plimit(1);
@@ -333,6 +363,8 @@ class EcmFiles //extends CommonObject
 				$this->fk_user_c = $obj->fk_user_c;
 				$this->fk_user_m = $obj->fk_user_m;
 				$this->acl = $obj->acl;
+				$this->src_object_type = $obj->src_object_type;
+				$this->src_object_id = $obj->src_object_id;
 			}
 
 			// Retrieve all extrafields for invoice
@@ -390,7 +422,9 @@ class EcmFiles //extends CommonObject
 		$sql .= " t.date_m,";
 		$sql .= " t.fk_user_c,";
 		$sql .= " t.fk_user_m,";
-		$sql .= " t.acl";
+		$sql .= " t.acl,";
+		$sql .= " t.src_object_type,";
+		$sql .= " t.src_object_id";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
 
 		// Manage filter
@@ -443,6 +477,9 @@ class EcmFiles //extends CommonObject
 				$line->fk_user_c = $obj->fk_user_c;
 				$line->fk_user_m = $obj->fk_user_m;
 				$line->acl = $obj->acl;
+				$line->src_object_type = $obj->src_object_type;
+				$line->src_object_id = $obj->src_object_id;
+				$this->lines[] = $line;
 			}
 			$this->db->free($resql);
 
@@ -465,6 +502,8 @@ class EcmFiles //extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
+		global $conf;
+
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -507,16 +546,15 @@ class EcmFiles //extends CommonObject
 		if (isset($this->extraparams)) {
 			 $this->extraparams = trim($this->extraparams);
 		}
-		if (isset($this->fk_user_c)) {
-			 $this->fk_user_c = trim($this->fk_user_c);
-		}
 		if (isset($this->fk_user_m)) {
 			 $this->fk_user_m = trim($this->fk_user_m);
 		}
 		if (isset($this->acl)) {
 			 $this->acl = trim($this->acl);
 		}
-
+		if (isset($this->src_object_type)) {
+			$this->src_object_type = trim($this->src_object_type);
+		}
 
 		// Check parameters
 		// Put here code to add a control on parameters values
@@ -538,9 +576,10 @@ class EcmFiles //extends CommonObject
 		$sql .= ' extraparams = '.(isset($this->extraparams)?"'".$this->db->escape($this->extraparams)."'":"null").',';
 		$sql .= ' date_c = '.(! isset($this->date_c) || dol_strlen($this->date_c) != 0 ? "'".$this->db->idate($this->date_c)."'" : 'null').',';
 		//$sql .= ' date_m = '.(! isset($this->date_m) || dol_strlen($this->date_m) != 0 ? "'".$this->db->idate($this->date_m)."'" : 'null').','; // Field automatically updated
-		$sql .= ' fk_user_c = '.(isset($this->fk_user_c)?$this->fk_user_c:"null").',';
 		$sql .= ' fk_user_m = '.($this->fk_user_m > 0?$this->fk_user_m:$user->id).',';
-		$sql .= ' acl = '.(isset($this->acl)?"'".$this->db->escape($this->acl)."'":"null");
+		$sql .= ' acl = '.(isset($this->acl)?"'".$this->db->escape($this->acl)."'":"null").',';
+		$sql .= ' src_object_id = '.($this->src_object_id > 0?$this->src_object_id:"null").',';
+		$sql .= ' src_object_type = '.(isset($this->src_object_type)?"'".$this->db->escape($this->src_object_type)."'":"null");
 		$sql .= ' WHERE rowid=' . $this->id;
 
 		$this->db->begin();
@@ -552,14 +591,13 @@ class EcmFiles //extends CommonObject
 			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
 		}
 
-		if (!$error && !$notrigger) {
-			// 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
+		// Triggers
+		if (! $error && ! $notrigger)
+		{
+			// Call triggers
+			$result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);
+			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+			// End call triggers
 		}
 
 		// Commit or rollback
@@ -590,16 +628,13 @@ class EcmFiles //extends CommonObject
 
 		$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
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
+		// Triggers
+		if (! $notrigger)
+		{
+			// Call triggers
+			$result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE',$user);
+			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+			// End call triggers
 		}
 
 		// If you need to delete child tables to, you can insert them here
@@ -781,8 +816,9 @@ class EcmFiles //extends CommonObject
 		$this->fk_user_c = $user->id;
 		$this->fk_user_m = '';
 		$this->acl = '';
+		$this->src_object_type = 'product';
+		$this->src_object_id = 1;
 	}
-
 }
 
 
@@ -804,4 +840,6 @@ class EcmfilesLine
 	public $fk_user_c;
 	public $fk_user_m;
 	public $acl;
+	public $src_object_type;
+	public $src_object_id;
 }
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 719f738d081..ddf819ad692 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -123,6 +123,11 @@ if (empty($reshook))
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
+	// Actions to build doc
+	$upload_dir = $conf->expedition->dir_output.'/sending';
+	$permissioncreate = $user->rights->expedition->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
 	// Reopen
 	if ($action == 'reopen' && $user->rights->expedition->creer)
 	{
@@ -164,20 +169,13 @@ if (empty($reshook))
 
 	    if (! $error)
 	    {
-	        // Actions on extra fields (by external module or standard code)
-	        // TODO le hook fait double emploi avec le trigger !!
-	        $hookmanager->initHooks(array('expeditiondao'));
-	        $parameters = array('id' => $object->id);
-	        $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-	        if (empty($reshook)) {
-	            $result = $object->insertExtraFields('SHIPMENT_MODIFY');
-       			if ($result < 0)
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$error++;
-				}
-	        } else if ($reshook < 0)
-	            $error++;
+	        // Actions on extra fields
+            $result = $object->insertExtraFields('SHIPMENT_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
 	    }
 
 	    if ($error)
@@ -540,42 +538,6 @@ if (empty($reshook))
 	    $action="";
 	}
 
-	// Build document
-	else if ($action == 'builddoc')	// En get ou en post
-	{
-		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	    // Define output language
-	    $outputlangs = $langs;
-	    $newlang='';
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$shipment->thirdparty->default_lang;
-	    if (! empty($newlang))
-	    {
-	        $outputlangs = new Translate("",$conf);
-	        $outputlangs->setDefaultLang($newlang);
-	    }
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    if ($result <= 0)
-	    {
-			setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-	    }
-	}
-
-	// Delete file in doc form
-	elseif ($action == 'remove_file')
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$upload_dir =	$conf->expedition->dir_output . "/sending";
-		$file =	$upload_dir	. '/' .	GETPOST('file');
-		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-
 	elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
@@ -1066,7 +1028,7 @@ if ($action == 'create')
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
-			if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+			if (empty($reshook)) {
 				// copy from order
 				$orderExtrafields = new Extrafields($db);
 				$orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 9857b90c84c..844a6c95305 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -181,7 +181,7 @@ class Shipments extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int     ID of shipment
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->expedition->creer) {
 			  throw new RestException(401, "Insuffisant rights");
@@ -250,7 +250,7 @@ class Shipments extends DolibarrApi
      * @return int
      */
     /*
-    function postLine($id, $request_data = NULL) {
+    function postLine($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->expedition->creer) {
 		  	throw new RestException(401);
 		  }
@@ -312,7 +312,7 @@ class Shipments extends DolibarrApi
      * @return object
      */
     /*
-    function putLine($id, $lineid, $request_data = NULL) {
+    function putLine($id, $lineid, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->expedition->creer) {
 		  	throw new RestException(401);
 		  }
@@ -407,7 +407,7 @@ class Shipments extends DolibarrApi
      *
      * @return int
      */
-    function put($id, $request_data = NULL) {
+    function put($id, $request_data = null) {
       if (! DolibarrApiAccess::$user->rights->expedition->creer) {
 		  	throw new RestException(401);
 		  }
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 05328d57b05..dd3123930fe 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -311,23 +311,15 @@ class Expedition extends CommonObject
 					}
 				}
 
-				// Actions on extra fields (by external module or standard code)
-				// TODO le hook fait double emploi avec le trigger !!
-				$hookmanager->initHooks(array('expeditiondao'));
-				$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))
+				// Actions on extra fields
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					$result=$this->insertExtraFields();
+					if ($result < 0)
 					{
-						$result=$this->insertExtraFields();
-						if ($result < 0)
-						{
-							$error++;
-						}
+						$error++;
 					}
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error && ! $notrigger)
 				{
@@ -1105,7 +1097,7 @@ class Expedition extends CommonObject
 			$error++;
 		}
 
-		if (! $error) 
+		if (! $error)
 		{
 			if (! $notrigger)
 			{
@@ -2690,19 +2682,21 @@ class ExpeditionLigne extends CommonObjectLine
 				$this->errors[]=$this->db->lasterror()." - sql=$sql";
 				$error++;
 			}
-			else
+		}
+
+		if (! $error)
+		{
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$this->errors[]=$this->error;
-						$error++;
-					}
+					$this->errors[]=$this->error;
+					$error++;
 				}
 			}
 		}
+
 		if (! $error && ! $notrigger)
 		{
 			// Call trigger
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 87d0932c64b..48c551bb7d1 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -163,7 +163,7 @@ if ($id > 0 || ! empty($ref)){
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 		print "</table>\n";
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 88050097d3f..a3d44d7072a 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2016	   Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2016-2018 Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -233,14 +233,20 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 
+$sql.= $db->order($sortfield,$sortorder);
+
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
-$sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1,$offset);
 
 //print $sql;
@@ -268,7 +274,9 @@ if ($resql)
 	$newcardbutton='';
 	if ($user->rights->expedition->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create2">'.$langs->trans('NewSending').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create2">'.$langs->trans('NewSending');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	$i = 0;
@@ -438,7 +446,7 @@ if ($resql)
 		}
 	}
 	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index e3218d5f578..ac1368660da 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -189,20 +189,13 @@ if (empty($reshook))
 
         if (! $error)
         {
-            // Actions on extra fields (by external module or standard code)
-            $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
-            // some hooks
-            if (empty($reshook)) {
-                $result = $object->insertExtraFields('SHIPMENT_MODIFY');
-       			if ($result < 0)
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$error++;
-				}
-            } else if ($reshook < 0)
-                $error++;
+            // Actions on extra fields
+            $result = $object->insertExtraFields('SHIPMENT_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
         }
 
         if ($error)
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 53837c76fd1..9d7d77cf290 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -275,17 +275,17 @@ foreach ($data as $val)
 	while (! empty($year) && $oldyear > $year+1)
 	{ // If we have empty year
 		$oldyear--;
-		
-		
+
+
 		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
-	
+
 		print '<td align="right">0</td>';
 		/*print '<td align="right">0</td>';
 		print '<td align="right">0</td>';*/
 		print '</tr>';
 	}
-	
+
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center">';
 	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
@@ -305,7 +305,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
     print $px1->show();
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index eea3545bb07..d17ae2eb095 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -44,9 +44,7 @@ if (! empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 }
 
-$langs->load("trips");
-$langs->load("bills");
-$langs->load("mails");
+$langs->loadLangs(array("trips","bills","mails"));
 
 $action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel','alpha');
@@ -288,20 +286,13 @@ if (empty($reshook))
 
         if (! $error)
         {
-            // Actions on extra fields (by external module or standard code)
-            $hookmanager->initHooks(array('expensereportdao'));
-            $parameters = array('id' => $object->id);
-            $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
-            // some hooks
-            if (empty($reshook)) {
-            	$result = $object->insertExtraFields('FICHINTER_MODIFY');
-       			if ($result < 0)
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$error++;
-				}
-            } else if ($reshook < 0)
-                $error++;
+            // Actions on extra fields
+           	$result = $object->insertExtraFields('FICHINTER_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
         }
 
         if ($error)
@@ -1355,6 +1346,7 @@ if ($action == 'create')
 	print '</td>';
 	print '</tr>';
 
+	// User for expense report
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
 	print '<td>';
@@ -1367,6 +1359,7 @@ if ($action == 'create')
 	print '</td>';
 	print '</tr>';
 
+	// Approver
 	print '<tr>';
 	print '<td>'.$langs->trans("VALIDATOR").'</td>';
 	print '<td>';
@@ -1419,7 +1412,7 @@ if ($action == 'create')
 	$parameters = array('colspan' => ' colspan="3"');
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
     print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+	if (empty($reshook)) {
 	    print $object->showOptionals($extrafields, 'edit');
 	}
 
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index e68c9338b92..726aa158413 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -160,7 +160,7 @@ class ExpenseReports extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int                     ID of Expense Report
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
 			  throw new RestException(401, "Insuffisant rights");
@@ -228,7 +228,7 @@ class ExpenseReports extends DolibarrApi
      * @return int
      */
 /*
-    function postLine($id, $request_data = NULL) {
+    function postLine($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
 		  	throw new RestException(401);
 		  }
@@ -290,7 +290,7 @@ class ExpenseReports extends DolibarrApi
      * @return object
      */
     /*
-    function putLine($id, $lineid, $request_data = NULL) {
+    function putLine($id, $lineid, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
 		  	throw new RestException(401);
 		  }
@@ -380,7 +380,7 @@ class ExpenseReports extends DolibarrApi
      *
      * @return int
      */
-    function put($id, $request_data = NULL) {
+    function put($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
 		  	throw new RestException(401);
 		  }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 57b3f9b34c8..d9a79789298 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1690,6 +1690,13 @@ class ExpenseReport extends CommonObject
 
 			$this->line = new ExpenseReportLine($this->db);
 
+			if (preg_match('/\((.*)\)/', $vatrate, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate);    // Remove code into vatrate.
+			}
+			$vatrate = preg_replace('/\*/','',$vatrate);
+
 			$seller = '';  // seller is unknown
 			$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
 
@@ -1924,7 +1931,6 @@ class ExpenseReport extends CommonObject
 
             // Clean vat code
             $vat_src_code='';
-
             if (preg_match('/\((.*)\)/', $vatrate, $reg))
             {
                 $vat_src_code = $reg[1];
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index ed588f3f961..67f074d7f92 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -34,10 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
-$langs->load("other");
-$langs->load("trips");
-$langs->load("companies");
-$langs->load("interventions");
+$langs->loadLangs(array("other","trips","companies","interventions"));
 
 $id = GETPOST('id','int');
 $ref = GETPOST('ref', 'alpha');
@@ -58,7 +55,7 @@ $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortfield) $sortfield="position_name";
 
 
 $object = new ExpenseReport($db);
@@ -67,6 +64,9 @@ $object->fetch($id, $ref);
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart='trip';
 
+// Load object
+//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
 
 /*
  * Actions
@@ -118,7 +118,7 @@ if ($object->id)
     $linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 77db05da49a..5fba738809a 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -48,7 +48,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="d.date_create";
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 
 
 /*
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 2944220458d..2bc7a624514 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004     	Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2009	Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015       Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2018       Ferran Marcet		 <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -328,7 +329,13 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
+
 $sql.= $db->plimit($limit+1, $offset);
 
 //print $sql;
@@ -465,7 +472,9 @@ if ($resql)
 		$newcardbutton='';
 		if ($user->rights->expensereport->creer)
 		{
-			$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create">'.$langs->trans('NewTrip').'</a>';
+			$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create">'.$langs->trans('NewTrip');
+			$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+			$newcardbutton.= '</a>';
 		}
 
 		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit);
@@ -617,7 +626,7 @@ if ($resql)
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['d.date_create']['checked'])) print_liste_field_titre($arrayfields['d.date_create']['label'],$_SERVER["PHP_SELF"],"d.date_create","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index a715d85f6a6..063406b1878 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -90,7 +90,7 @@ if ($id > 0 || ! empty($ref))
 
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
-var_dump($value_public);
+
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index d2f3a4c3567..871805564c5 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -73,7 +73,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 	$db->begin();
 
 	$result=$object->valide();
-	
+
 	if ($result > 0)
 	{
 		$db->commit();
@@ -112,7 +112,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 
 llxHeader('', $langs->trans("ExpenseReportPayment"));
 
-if ($id > 0) 
+if ($id > 0)
 {
 	$result=$object->fetch($id);
 	if (! $result) dol_print_error($db,'Failed to get payment id '.$id);
@@ -240,8 +240,6 @@ if ($resql)
 
 	if ($num > 0)
 	{
-		$var=True;
-
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
@@ -277,7 +275,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	
+
 
 	print "</table>\n";
 	print '</div>';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index d0e3a1164bc..819f0d4d351 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -288,7 +288,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
     print $px1->show();
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index b4a2b58a18e..540f897ffe5 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -750,20 +750,12 @@ if (empty($reshook))
 
 		if (! $error)
 		{
-			// Actions on extra fields (by external module or standard code)
-			// 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
-			if (empty($reshook))
+			// Actions on extra fields
+			$result=$object->insertExtraFields('INTERVENTION_MODIFY');
+			if ($result < 0)
 			{
-				$result=$object->insertExtraFields('INTERVENTION_MODIFY');
-				if ($result < 0)
-				{
-					$error++;
-				}
+				$error++;
 			}
-			else if ($reshook < 0) $error++;
 		}
 
 		if ($error) $action = 'edit_extras';
@@ -1010,7 +1002,7 @@ if ($action == 'create')
         $parameters=array('colspan' => ' colspan="2"');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 0d9360b0e72..8b21b534856 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -188,7 +188,7 @@ class Interventions extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int     ID of intervention
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->ficheinter->creer) {
 			  throw new RestException(401, "Insuffisant rights");
@@ -249,7 +249,7 @@ class Interventions extends DolibarrApi
      *
      * @return  int
      */
-    function postLine($id, $request_data = NULL)
+    function postLine($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->ficheinter->creer) {
                           throw new RestException(401, "Insuffisant rights");
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 1204830fb0f..25f2e691265 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -55,9 +55,10 @@ class Fichinter extends CommonObject
 	var $datet;
 	var $datem;
 	var $duration;
-	var $statut;		// 0=draft, 1=validated, 2=invoiced, 3=Terminate
+	var $statut = 0;		// 0=draft, 1=validated, 2=invoiced, 3=Terminate
 	var $description;
-	var $fk_contrat;
+	var $fk_contrat = 0;
+	var $fk_project = 0;
 	var $extraparams=array();
 
 	var $lines = array();
@@ -87,24 +88,8 @@ class Fichinter extends CommonObject
 	function __construct($db)
 	{
 		$this->db = $db;
-		$this->products = array();
-		$this->fk_project = 0;
-		$this->fk_contrat = 0;
-		$this->statut = 0;
 
-		// List of language codes for status
-		$this->statuts[0]='Draft';
-		$this->statuts[1]='Validated';
-		$this->statuts[2]='StatusInterInvoiced';
-		$this->statuts[3]='Done';
-		$this->statuts_short[0]='Draft';
-		$this->statuts_short[1]='Validated';
-		$this->statuts_short[2]='StatusInterInvoiced';
-		$this->statuts_short[3]='Done';
-		$this->statuts_logo[0]='statut0';
-		$this->statuts_logo[1]='statut1';
-		$this->statuts_logo[2]='statut6';
-		$this->statuts_logo[3]='statut6';
+		$this->products = array();
 	}
 
 	/**
@@ -253,7 +238,7 @@ class Fichinter extends CommonObject
 			}
 
 
-			if (! $notrigger)
+			if (! $error && ! $notrigger)
 			{
 				// Call trigger
 				$result=$this->call_trigger('FICHINTER_CREATE',$user);
@@ -634,22 +619,40 @@ class Fichinter extends CommonObject
 	 */
 	function LibStatut($statut,$mode=0)
 	{
-		global $langs;
+		// Init/load array of translation of status
+		if (empty($this->statuts) || empty($this->statuts_short))
+		{
+			global $langs;
+			$langs->load("fichinter");
+
+			$this->statuts[0]=$langs->trans('Draft');
+			$this->statuts[1]=$langs->trans('Validated');
+			$this->statuts[2]=$langs->trans('StatusInterInvoiced');
+			$this->statuts[3]=$langs->trans('Done');
+			$this->statuts_short[0]=$langs->trans('Draft');
+			$this->statuts_short[1]=$langs->trans('Validated');
+			$this->statuts_short[2]=$langs->trans('StatusInterInvoiced');
+			$this->statuts_short[3]=$langs->trans('Done');
+			$this->statuts_logo[0]='statut0';
+			$this->statuts_logo[1]='statut1';
+			$this->statuts_logo[2]='statut6';
+			$this->statuts_logo[3]='statut6';
+		}
 
 		if ($mode == 0)
-			return $langs->trans($this->statuts[$statut]);
+			return $this->statuts[$statut];
 		if ($mode == 1)
-			return $langs->trans($this->statuts_short[$statut]);
+			return $this->statuts_short[$statut];
 		if ($mode == 2)
-			return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]).' '.$langs->trans($this->statuts_short[$statut]);
+			return img_picto($this->statuts_short[$statut], $this->statuts_logo[$statut]).' '.$this->statuts_short[$statut];
 		if ($mode == 3)
-			return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]);
+			return img_picto($this->statuts_short[$statut], $this->statuts_logo[$statut]);
 		if ($mode == 4)
-			return img_picto($langs->trans($this->statuts_short[$statut]),$this->statuts_logo[$statut]).' '.$langs->trans($this->statuts[$statut]);
+			return img_picto($this->statuts_short[$statut], $this->statuts_logo[$statut]).' '.$this->statuts[$statut];
 		if ($mode == 5)
-			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
+			return '<span class="hideonsmartphone">'.$this->statuts_short[$statut].' </span>'.img_picto($this->statuts[$statut],$this->statuts_logo[$statut]);
 		if ($mode == 6)
-			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
+			return '<span class="hideonsmartphone">'.$this->statuts[$statut].' </span>'.img_picto($this->statuts[$statut],$this->statuts_logo[$statut]);
 
 		return '';
 	}
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index c869387b211..4c6d51e89fe 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -158,7 +158,7 @@ if ($object->id)
 
     print '<table class="border" width="100%">';
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index f7082770970..87d8b366ef8 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,7 +59,7 @@ $result = restrictedArea($user, 'ficheinter', $id,'fichinter');
 
 $diroutputmassaction=$conf->ficheinter->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
@@ -229,6 +230,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -274,7 +280,9 @@ if ($resql)
 	$newcardbutton='';
 	if ($user->rights->ficheinter->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create">'.$langs->trans('NewIntervention').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create">'.$langs->trans('NewIntervention');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	// Lines of title fields
@@ -378,6 +386,7 @@ if ($resql)
 	if (! empty($arrayfields['f.fk_statut']['checked']))
 	{
 		print '<td class="liste_titre" align="right">';
+		$tmp = $objectstatic->LibStatut(0);		// To load $this->statuts_short
 		$liststatus=$objectstatic->statuts_short;
 		if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) unset($liststatus[2]);   // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
@@ -400,7 +409,7 @@ if ($resql)
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre("DateCreationShort",$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 1c0ba5764ed..b00b1391003 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -255,6 +255,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	// Status
 	print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">';
+	$tmp = $objectstatic->LibStatut(0);		// To load $this->statuts_short
 	$liststatus=$objectstatic->statuts_short;
 	if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) unset($liststatus[2]);   // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 	print $form->selectarray('object_status', $liststatus, $object_status, 1, 0, 0, '', 1);
@@ -324,7 +325,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Show graphs
-print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
     print $px1->show();
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index a3990333d46..eeb2c1113f6 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -24,10 +24,8 @@
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index af36e6d572e..6dff84c5742 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -121,11 +121,13 @@ if (empty($reshook))
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
 
         if ($ret < 0) $error++;
+
         if (! $error)
         {
             $result = $object->insertExtraFields('COMPANY_MODIFY');
             if ($result < 0) $error++;
         }
+
         if ($error) $action = 'edit_extras';
     }
 }
@@ -428,8 +430,6 @@ if ($object->id > 0)
 	print $boxstat;
 
 
-	$var=true;
-
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 	// Lien recap
@@ -547,12 +547,10 @@ if ($object->id > 0)
 	            print '</td></tr>';
 	        }
 
-	        $var = True;
 	        while ($i < $num && $i <= $MAXLIST)
 	        {
 	            $obj = $db->fetch_object($resql);
 
-
 	            print '<tr class="oddeven">';
 	            print '<td class="nowrap">';
 	            $proposalstatic->id = $obj->rowid;
@@ -652,12 +650,10 @@ if ($object->id > 0)
     			print '</td></tr>';
 			}
 
-			$var = True;
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$obj = $db->fetch_object($resql);
 
-
 				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $orderstatic->id = $obj->rowid;
@@ -725,7 +721,7 @@ if ($object->id > 0)
     			print '</tr></table>';
     			print '</td></tr>';
 			}
-			$var=True;
+
 			while ($i < min($num,$MAXLIST))
 			{
 				$obj = $db->fetch_object($resql);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index e60fdccd4ad..68bb902b8fb 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -182,7 +182,7 @@ class SupplierInvoices extends DolibarrApi
      * @param array $request_data   Request datas
      * @return int  ID of supplier invoice
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
 			throw new RestException(401, "Insuffisant rights");
@@ -218,7 +218,7 @@ class SupplierInvoices extends DolibarrApi
      * @param array $request_data   Datas
      * @return int
      */
-    function put($id, $request_data = NULL)
+    function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
 			throw new RestException(401);
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 74b5bbe43b3..d9596bf3958 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -186,7 +186,7 @@ class SupplierOrders extends DolibarrApi
      * @param array $request_data   Request datas
      * @return int  ID of supplier order
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->fournisseur->commande->creer) {
 			throw new RestException(401, "Insuffisant rights");
@@ -222,7 +222,7 @@ class SupplierOrders extends DolibarrApi
      * @param array $request_data   Datas
      * @return int
      */
-    function put($id, $request_data = NULL)
+    function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->fournisseur->commande->creer) {
 			throw new RestException(401);
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 7364199fca5..ba486e066cc 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -34,8 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 class Fournisseur extends Societe
 {
 	var $next_prev_filter="te.fournisseur = 1";		// Used to add a filter in Form::showrefnav method
-	
-	
+
+
 	/**
 	 *	Constructor
 	 *
@@ -44,10 +44,9 @@ class Fournisseur extends Societe
 	function __construct($db)
 	{
 		$this->db = $db;
+
 		$this->client = 0;
-		$this->fournisseur = 0;
-		$this->effectif_id  = 0;
-		$this->forme_juridique_code  = 0;
+		$this->fournisseur = 1;
 	}
 
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 04e22501b95..b7ee4ee7232 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -184,23 +184,9 @@ class CommandeFournisseur extends CommonOrder
      */
     public function __construct($db)
     {
-    	global $conf;
-
         $this->db = $db;
-        $this->products = array();
 
-        // List of language codes for status
-        $this->statuts[0] = 'StatusOrderDraft';
-        $this->statuts[1] = 'StatusOrderValidated';
-        $this->statuts[2] = 'StatusOrderApproved';
-        if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusOrderOnProcess';
-        else $this->statuts[3] = 'StatusOrderOnProcessWithValidation';
-        $this->statuts[4] = 'StatusOrderReceivedPartially';
-        $this->statuts[5] = 'StatusOrderReceivedAll';
-        $this->statuts[6] = 'StatusOrderCanceled';	// Approved->Canceled
-        $this->statuts[7] = 'StatusOrderCanceled';	// Process running->canceled
-        //$this->statuts[8] = 'StatusOrderBilled';	// Everything is finished, order received totally and bill received
-        $this->statuts[9] = 'StatusOrderRefused';
+        $this->products = array();
     }
 
 
@@ -318,97 +304,17 @@ class CommandeFournisseur extends CommonOrder
 
             if ($this->statut == 0) $this->brouillon = 1;
 
-			//$result=$this->fetch_lines();
-            $this->lines=array();
-
-            $sql = "SELECT l.rowid, l.ref as ref_supplier, l.fk_product, l.product_type, l.label, l.description, l.qty,";
-            $sql.= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
-            $sql.= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
-            $sql.= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
-            $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
-	        $sql.= " l.fk_unit,";
-            $sql.= " l.date_start, l.date_end,";
-			$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
-            $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
-            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-            $sql.= " WHERE l.fk_commande = ".$this->id;
-            $sql.= " ORDER BY l.rang, l.rowid";
-            //print $sql;
-
-            dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
-            $result = $this->db->query($sql);
-            if ($result)
+            /*
+             * Lines
+             */
+            $result=$this->fetch_lines();
+            if ($result < 0)
             {
-                $num = $this->db->num_rows($result);
-                $i = 0;
-
-                while ($i < $num)
-                {
-                    $objp                  = $this->db->fetch_object($result);
-
-                    $line                 = new CommandeFournisseurLigne($this->db);
-
-                    $line->id                  = $objp->rowid;
-                    $line->desc                = $objp->description;
-                    $line->description         = $objp->description;
-                    $line->qty                 = $objp->qty;
-                    $line->tva_tx              = $objp->tva_tx;
-                    $line->localtax1_tx		   = $objp->localtax1_tx;
-                    $line->localtax2_tx		   = $objp->localtax2_tx;
-                    $line->localtax1_type	   = $objp->localtax1_type;
-                    $line->localtax2_type	   = $objp->localtax2_type;
-                    $line->subprice            = $objp->subprice;
-                    $line->pu_ht	           = $objp->subprice;
-                    $line->remise_percent      = $objp->remise_percent;
-
-                    $line->vat_src_code        = $objp->vat_src_code;
-                    $line->total_ht            = $objp->total_ht;
-                    $line->total_tva           = $objp->total_tva;
-                    $line->total_localtax1	   = $objp->total_localtax1;
-                    $line->total_localtax2	   = $objp->total_localtax2;
-                    $line->total_ttc           = $objp->total_ttc;
-                    $line->product_type        = $objp->product_type;
-
-                    $line->fk_product          = $objp->fk_product;
-
-                    $line->libelle             = $objp->product_label;
-                    $line->product_label       = $objp->product_label;
-                    $line->product_desc        = $objp->product_desc;
-
-                    $line->ref                 = $objp->product_ref;    // Ref of product
-                    $line->product_ref         = $objp->product_ref;    // Ref of product
-                    $line->ref_fourn           = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
-                    $line->ref_supplier        = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
-
-                    $line->date_start          = $this->db->jdate($objp->date_start);
-                    $line->date_end            = $this->db->jdate($objp->date_end);
-	                $line->fk_unit             = $objp->fk_unit;
-
-					// Multicurrency
-					$line->fk_multicurrency 		= $objp->fk_multicurrency;
-					$line->multicurrency_code 		= $objp->multicurrency_code;
-					$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
-					$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
-					$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
-					$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
-
-	                $line->special_code        = $objp->special_code;
-	                $line->fk_parent_line      = $objp->fk_parent_line;
-
-                    $line->rang                = $objp->rang;
-
-                    $this->lines[$i]      = $line;
-
-                    $i++;
-                }
-                $this->db->free($result);
-
-                return 1;
+            	return -1;
             }
             else
             {
-                $this->error=$this->db->error()." sql=".$sql;
-                return -1;
+            	return 1;
             }
         }
         else
@@ -418,6 +324,113 @@ class CommandeFournisseur extends CommonOrder
         }
     }
 
+    /**
+     * Load array lines
+     *
+     * @param		int		$only_product	Return only physical products
+     * @return		int						<0 if KO, >0 if OK
+     */
+    function fetch_lines($only_product=0)
+    {
+    	//$result=$this->fetch_lines();
+    	$this->lines=array();
+
+    	$sql = "SELECT l.rowid, l.ref as ref_supplier, l.fk_product, l.product_type, l.label, l.description, l.qty,";
+    	$sql.= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
+    	$sql.= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
+    	$sql.= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
+    	$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
+    	$sql.= " l.fk_unit,";
+    	$sql.= " l.date_start, l.date_end,";
+    	$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
+    	$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
+    	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+    	$sql.= " WHERE l.fk_commande = ".$this->id;
+    	if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+    	$sql.= " ORDER BY l.rang, l.rowid";
+    	//print $sql;
+
+    	dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
+    	$result = $this->db->query($sql);
+    	if ($result)
+    	{
+    		$num = $this->db->num_rows($result);
+    		$i = 0;
+
+    		while ($i < $num)
+    		{
+    			$objp                  = $this->db->fetch_object($result);
+
+    			$line                 = new CommandeFournisseurLigne($this->db);
+
+    			$line->id                  = $objp->rowid;
+    			$line->desc                = $objp->description;
+    			$line->description         = $objp->description;
+    			$line->qty                 = $objp->qty;
+    			$line->tva_tx              = $objp->tva_tx;
+    			$line->localtax1_tx		   = $objp->localtax1_tx;
+    			$line->localtax2_tx		   = $objp->localtax2_tx;
+    			$line->localtax1_type	   = $objp->localtax1_type;
+    			$line->localtax2_type	   = $objp->localtax2_type;
+    			$line->subprice            = $objp->subprice;
+    			$line->pu_ht	           = $objp->subprice;
+    			$line->remise_percent      = $objp->remise_percent;
+
+    			$line->vat_src_code        = $objp->vat_src_code;
+    			$line->total_ht            = $objp->total_ht;
+    			$line->total_tva           = $objp->total_tva;
+    			$line->total_localtax1	   = $objp->total_localtax1;
+    			$line->total_localtax2	   = $objp->total_localtax2;
+    			$line->total_ttc           = $objp->total_ttc;
+    			$line->product_type        = $objp->product_type;
+
+    			$line->fk_product          = $objp->fk_product;
+
+    			$line->libelle             = $objp->product_label;
+    			$line->product_label       = $objp->product_label;
+    			$line->product_desc        = $objp->product_desc;
+
+    			$line->ref                 = $objp->product_ref;    // Ref of product
+    			$line->product_ref         = $objp->product_ref;    // Ref of product
+    			$line->ref_fourn           = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
+    			$line->ref_supplier        = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
+
+    			$line->date_start          = $this->db->jdate($objp->date_start);
+    			$line->date_end            = $this->db->jdate($objp->date_end);
+    			$line->fk_unit             = $objp->fk_unit;
+
+    			// Multicurrency
+    			$line->fk_multicurrency 		= $objp->fk_multicurrency;
+    			$line->multicurrency_code 		= $objp->multicurrency_code;
+    			$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+    			$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+    			$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+    			$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+
+    			$line->special_code        = $objp->special_code;
+    			$line->fk_parent_line      = $objp->fk_parent_line;
+
+    			$line->rang                = $objp->rang;
+
+    			// Retreive all extrafield
+    			// fetch optionals attributes and labels
+    			$line->fetch_optionals();
+
+    			$this->lines[$i]      = $line;
+
+    			$i++;
+    		}
+    		$this->db->free($result);
+
+    		return $num;
+    	}
+    	else
+    	{
+    		$this->error=$this->db->error()." sql=".$sql;
+    		return -1;
+    	}
+    }
+
     /**
      *	Validate an order
      *
@@ -560,24 +573,41 @@ class CommandeFournisseur extends CommonOrder
      */
     function LibStatut($statut,$mode=0,$billed=0)
     {
-        global $langs;
-        $langs->load('orders');
+    	if (empty($this->statuts) || empty($statutshort))
+    	{
+	        global $langs;
+	        $langs->load('orders');
+
+	        $this->statuts[0] = 'StatusOrderDraft';
+	        $this->statuts[1] = 'StatusOrderValidated';
+	        $this->statuts[2] = 'StatusOrderApproved';
+	        if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusOrderOnProcess';
+	        else $this->statuts[3] = 'StatusOrderOnProcessWithValidation';
+	        $this->statuts[4] = 'StatusOrderReceivedPartially';
+	        $this->statuts[5] = 'StatusOrderReceivedAll';
+	        $this->statuts[6] = 'StatusOrderCanceled';	// Approved->Canceled
+	        $this->statuts[7] = 'StatusOrderCanceled';	// Process running->canceled
+	        //$this->statuts[8] = 'StatusOrderBilled';	// Everything is finished, order received totally and bill received
+	        $this->statuts[9] = 'StatusOrderRefused';
+
+	        // List of language codes for status
+	        $statutshort[0] = 'StatusOrderDraftShort';
+	        $statutshort[1] = 'StatusOrderValidatedShort';
+	        $statutshort[2] = 'StatusOrderApprovedShort';
+	        $statutshort[3] = 'StatusOrderOnProcessShort';
+	        $statutshort[4] = 'StatusOrderReceivedPartiallyShort';
+	        $statutshort[5] = 'StatusOrderReceivedAllShort';
+	        $statutshort[6] = 'StatusOrderCanceledShort';
+	        $statutshort[7] = 'StatusOrderCanceledShort';
+	        $statutshort[9] = 'StatusOrderRefusedShort';
+    	}
+
+    	$langs->load('orders');
 
         $billedtext='';
 		//if ($statut==5 && $this->billed == 1) $statut = 8;
         if ($billed == 1) $billedtext=$langs->trans("Billed");
 
-        // List of language codes for status
-        $statutshort[0] = 'StatusOrderDraftShort';
-        $statutshort[1] = 'StatusOrderValidatedShort';
-        $statutshort[2] = 'StatusOrderApprovedShort';
-        $statutshort[3] = 'StatusOrderOnProcessShort';
-        $statutshort[4] = 'StatusOrderReceivedPartiallyShort';
-        $statutshort[5] = 'StatusOrderReceivedAllShort';
-        $statutshort[6] = 'StatusOrderCanceledShort';
-        $statutshort[7] = 'StatusOrderCanceledShort';
-        $statutshort[9] = 'StatusOrderRefusedShort';
-
         if ($mode == 0)
         {
             return $langs->trans($this->statuts[$statut]);
@@ -1415,7 +1445,7 @@ class CommandeFournisseur extends CommonOrder
 
         $error = 0;
 
-        dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $fk_unit");
+        dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $info_bits $notrigger $date_start $date_end $fk_unit $pu_ht_devise $origin $origin_id");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
@@ -1451,13 +1481,13 @@ class CommandeFournisseur extends CommonOrder
         }
         if ($type < 0) return -1;
 
-        if ($this->statut == 0)
+        if ($this->statut == self::STATUS_DRAFT)
         {
             $this->db->begin();
 
             if ($fk_product > 0)
             {
-                if (empty($conf->global->SUPPLIER_ORDER_WITH_NOPRICEDEFINED))
+            	if (! empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
                 {
                     // Check quantity is enough
                     dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
@@ -1470,15 +1500,14 @@ class CommandeFournisseur extends CommonOrder
                         // We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
                         // If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
                         $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid));   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+
                         if ($result > 0)
                         {
-			    $pu           = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
-                            $ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
-			    // is remise percent not keyed but present for the product we add it
-                            if ($remise_percent == 0 && $prod->remise_percent !=0)
+                        	$pu = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
+                        	$ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
+                        	// is remise percent not keyed but present for the product we add it
+                        	if ($remise_percent == 0 && $prod->remise_percent !=0)
                             	$remise_percent =$prod->remise_percent;
-
-
                         }
                         if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
                         {
@@ -1509,6 +1538,7 @@ class CommandeFournisseur extends CommonOrder
                     else
     				{
                         $this->error=$prod->error;
+                        $this->db->rollback();
                         return -1;
                     }
                 }
@@ -1579,7 +1609,7 @@ class CommandeFournisseur extends CommonOrder
             $this->line->product_type=$product_type;
             $this->line->remise_percent=$remise_percent;
             $this->line->subprice=$pu_ht;
-            $this->line->rang=$this->rang;
+            $this->line->rang=$rang;
             $this->line->info_bits=$info_bits;
 
             $this->line->vat_src_code=$vat_src_code;
@@ -1674,7 +1704,7 @@ class CommandeFournisseur extends CommonOrder
             $this->error='ErrorBadValueForParameterWarehouse';
             return -1;
         }
-        if ($qty <= 0)
+        if ($qty == 0)
         {
             $this->error='ErrorBadValueForParameterQty';
             return -1;
@@ -3066,6 +3096,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
     public $fk_facture;
     public $label;
     public $rang = 0;
+    public $special_code = 0;
 
 	/**
 	 * Unit price without taxes
@@ -3105,7 +3136,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
      */
     public function fetch($rowid)
     {
-        $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx,';
+        $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx, cd.special_code,';
         $sql.= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref,';
         $sql.= ' cd.remise, cd.remise_percent, cd.subprice,';
         $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
@@ -3144,6 +3175,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
             $this->total_localtax2	= $objp->total_localtax2;
             $this->total_ttc        = $objp->total_ttc;
             $this->product_type     = $objp->product_type;
+            $this->special_code     = $objp->special_code;
 
             $this->ref	            = $objp->product_ref;
             $this->product_ref      = $objp->product_ref;
@@ -3159,6 +3191,8 @@ class CommandeFournisseurLigne extends CommonOrderLine
 			$this->multicurrency_total_tva	= $objp->multicurrency_total_tva;
 			$this->multicurrency_total_ttc	= $objp->multicurrency_total_ttc;
 
+			$this->fetch_optionals();
+
             $this->db->free($result);
             return 1;
         }
@@ -3216,7 +3250,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
         // Insertion dans base de la ligne
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
         $sql.= " (fk_commande, label, description, date_start, date_end,";
-        $sql.= " fk_product, product_type,";
+        $sql.= " fk_product, product_type, special_code, rang,";
         $sql.= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
         $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,";
         $sql.= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc";
@@ -3227,8 +3261,9 @@ class CommandeFournisseurLigne extends CommonOrderLine
         if ($this->fk_product) { $sql.= $this->fk_product.","; }
         else { $sql.= "null,"; }
         $sql.= "'".$this->db->escape($this->product_type)."',";
+        $sql.= "'".$this->db->escape($this->special_code)."',";
+        $sql.= "'".$this->db->escape($this->rang)."',";
         $sql.= "'".$this->db->escape($this->qty)."', ";
-
         $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
         $sql.= " ".$this->tva_tx.", ";
         $sql.= " ".$this->localtax1_tx.",";
@@ -3259,7 +3294,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-
                 $result=$this->insertExtraFields();
                 if ($result < 0)
                 {
@@ -3331,6 +3365,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
         $sql.= ", total_localtax2='".price2num($this->total_localtax2)."'";
         $sql.= ", total_ttc='".price2num($this->total_ttc)."'";
         $sql.= ", product_type=".$this->product_type;
+        $sql.= ", special_code=".(!empty($this->special_code) ? $this->special_code : 0);
         $sql.= ($this->fk_unit ? ", fk_unit='".$this->db->escape($this->fk_unit)."'":", fk_unit=null");
 
         // Multicurrency
@@ -3347,7 +3382,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
         {
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-
                 $result=$this->insertExtraFields();
                 if ($result < 0)
                 {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 2a9198f0380..d4b1c14b522 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -89,16 +89,16 @@ class FactureFournisseur extends CommonInvoice
     public $tms;              // Last update date
     public $date;             // Invoice date
     public $date_echeance;    // Max payment date
-    public $amount;
-    public $remise;
-    public $tva;
+    public $amount=0;
+    public $remise=0;
+    public $tva=0;
     public $localtax1;
     public $localtax2;
-    public $total_ht;
-    public $total_tva;
-    public $total_localtax1;
-    public $total_localtax2;
-    public $total_ttc;
+    public $total_ht=0;
+    public $total_tva=0;
+    public $total_localtax1=0;
+    public $total_localtax2=0;
+    public $total_ttc=0;
 	/**
 	 * @deprecated
 	 * @see note_private, note_public
@@ -202,16 +202,6 @@ class FactureFournisseur extends CommonInvoice
     {
         $this->db = $db;
 
-        $this->amount = 0;
-        $this->remise = 0;
-        $this->tva = 0;
-        $this->total_localtax1 = 0;
-        $this->total_localtax2 = 0;
-        $this->total_ht = 0;
-        $this->total_tva = 0;
-        $this->total_ttc = 0;
-        $this->propalid = 0;
-
         $this->products = array();
     }
 
@@ -404,7 +394,7 @@ class FactureFournisseur extends CommonInvoice
                 	$line = $this->lines[$i];
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
+				    //if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
                 	if (! is_object($line)) $line = (object) $line;
 
                 	$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
@@ -444,23 +434,15 @@ class FactureFournisseur extends CommonInvoice
             {
             	$action='create';
 
-				// Actions on extra fields (by external module or standard code)
-				// 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
-				if (empty($reshook))
+				// Actions on extra fields
+            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-	            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					$result=$this->insertExtraFields();               // This also set $this->error or $this->errors if errors are found
+					if ($result < 0)
 					{
-						$result=$this->insertExtraFields();               // This also set $this->error or $this->errors if errors are found
-						if ($result < 0)
-						{
-							$error++;
-						}
+						$error++;
 					}
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error)
 				{
@@ -1508,8 +1490,6 @@ class FactureFournisseur extends CommonInvoice
 	 *  @param		double	$pu_ht_devise		Amount in currency
 	 *  @param		string	$ref_supplier		Supplier ref
      *	@return    	int             			>0 if OK, <0 if KO
-     *
-     *  FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order.
      */
     public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0, $ref_supplier='')
     {
@@ -1527,6 +1507,71 @@ class FactureFournisseur extends CommonInvoice
         if (empty($txlocaltax1)) $txlocaltax1=0;
         if (empty($txlocaltax2)) $txlocaltax2=0;
 
+        $this->db->begin();
+
+        if ($fk_product > 0)
+        {
+        	if (! empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
+        	{
+        		// Check quantity is enough
+        		dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
+        		$prod = new Product($this->db, $fk_product);
+        		if ($prod->fetch($fk_product) > 0)
+        		{
+        			$product_type = $prod->type;
+        			$label = $prod->label;
+
+        			// We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
+        			// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+        			$result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid));   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+        			if ($result > 0)
+        			{
+        				$pu = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
+        				$ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
+        				// is remise percent not keyed but present for the product we add it
+        				if ($remise_percent == 0 && $prod->remise_percent !=0)
+        					$remise_percent =$prod->remise_percent;
+        			}
+        			if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
+        			{
+        				$langs->load("errors");
+        				$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+        				$this->db->rollback();
+        				dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+        				//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
+        				//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
+        				return -1;
+        			}
+        			if ($result == -1)
+        			{
+        				$langs->load("errors");
+        				$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+        				$this->db->rollback();
+        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
+        				return -1;
+        			}
+        			if ($result < -1)
+        			{
+        				$this->error=$prod->error;
+        				$this->db->rollback();
+        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
+        				return -1;
+        			}
+        		}
+        		else
+        		{
+        			$this->error=$prod->error;
+        			$this->db->rollback();
+        			return -1;
+        		}
+        	}
+        }
+        else
+        {
+        	$product_type = $type;
+        }
+
+
         $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
         // Clean vat code
@@ -1565,6 +1610,12 @@ class FactureFournisseur extends CommonInvoice
         // Check parameters
         if ($type < 0) return -1;
 
+        if ($rang < 0)
+        {
+        	$rangmax = $this->line_max();
+        	$rang = $rangmax + 1;
+        }
+
         // Insert line
         $this->line=new SupplierInvoiceLine($this->db);
 
@@ -1664,12 +1715,13 @@ class FactureFournisseur extends CommonInvoice
 	 * @param		array		$array_options		extrafields array
      * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * @param		double		$pu_ht_devise		Amount in currency
+	 * @param		string		$ref_supplier		Supplier ref
      * @return    	int           					<0 if KO, >0 if OK
      */
-    public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null, $pu_ht_devise=0)
+    public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null, $pu_ht_devise=0, $ref_supplier='')
     {
     	global $mysoc;
-        dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$fk_unit", LOG_DEBUG);
+        dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$fk_unit,$pu_ht_devise,$ref_supplier", LOG_DEBUG);
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         $pu = price2num($pu);
@@ -1747,6 +1799,7 @@ class FactureFournisseur extends CommonInvoice
 	    $line->pu_ttc = $pu_ttc;
 	    $line->qty = $qty;
 	    $line->remise_percent = $remise_percent;
+	    $line->ref_supplier = $ref_supplier;
 
 	    $line->vat_src_code=$vat_src_code;
 	    $line->tva_tx = $vatrate;
@@ -2661,7 +2714,6 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->fk_facture_fourn			= $obj->fk_facture_fourn;
 		$this->description		= $obj->description;
 		$this->product_ref		= $obj->product_ref;
-		$this->ref				= $obj->product_ref;
 		$this->ref_supplier		= $obj->ref_supplier;
 		$this->libelle			= $obj->label;
 		$this->label  			= $obj->label;
@@ -2697,6 +2749,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->multicurrency_total_tva	= $obj->multicurrency_total_tva;
 		$this->multicurrency_total_ttc	= $obj->multicurrency_total_ttc;
 
+		$this->fetch_optionals();
+
 		return 1;
 	}
 
@@ -2708,6 +2762,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public function delete($notrigger = 0)
 	{
+		global $user;
+
 		dol_syslog(get_class($this)."::deleteline rowid=".$this->id, LOG_DEBUG);
 
 		$error = 0;
@@ -2715,7 +2771,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->db->begin();
 
 		if (!$notrigger) {
-			if ($this->call_trigger('LINEBILL_SUPPLIER_DELETE',$user) < 0) {
+			if ($this->call_trigger('LINEBILL_SUPPLIER_DELETE', $user) < 0) {
 				$error++;
 			}
 		}
@@ -2787,12 +2843,12 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
 		$sql.= "  description ='".$this->db->escape($this->description)."'";
-		$sql.= ", ref ='".$this->db->escape($this->ref)."'";
+		$sql.= ", ref ='".$this->db->escape($this->ref_supplier ? $this->ref_supplier : $this->ref)."'";
 		$sql.= ", pu_ht = ".price2num($this->pu_ht);
 		$sql.= ", pu_ttc = ".price2num($this->pu_ttc);
 		$sql.= ", qty = ".price2num($this->qty);
 		$sql.= ", remise_percent = ".price2num($this->remise_percent);
-		$sql.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
+		$sql.= ", vat_src_code = '".$this->db->escape(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
 		$sql.= ", tva_tx = ".price2num($this->tva_tx);
 		$sql.= ", localtax1_tx = ".price2num($this->localtax1_tx);
 		$sql.= ", localtax2_tx = ".price2num($this->localtax2_tx);
@@ -2830,7 +2886,9 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 		{
-			if ($this->insertExtraFields() < 0) {
+			$result = $this->insertExtraFields();
+			if ($result < 0)
+			{
 				$error++;
 			}
 		}
@@ -2976,7 +3034,7 @@ class SupplierInvoiceLine extends CommonObjectLine
                 }
             }
 
-            if (! $notrigger)
+            if (! $error && ! $notrigger)
             {
                 // Call trigger
                 $result=$this->call_trigger('LINEBILL_SUPPLIER_CREATE',$user);
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 1a22356695a..fd794758330 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -102,6 +102,7 @@ class PaiementFourn extends Paiement
 				$this->ref            = $obj->ref;
 				$this->entity         = $obj->entity;
 				$this->date           = $this->db->jdate($obj->dp);
+				$this->datepaye       = $this->db->jdate($obj->dp);
 				$this->numero         = $obj->num_paiement;
 				$this->bank_account   = $obj->fk_account;
 				$this->bank_line      = $obj->fk_bank;
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 31574a4b3c0..b80c202403d 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -364,12 +364,9 @@ if (empty($reshook))
 		{
 			$productsupplier = new ProductFournisseur($db);
 
-			if (empty($conf->global->SUPPLIER_ORDER_WITH_NOPRICEDEFINED))	// TODO this test seems useless
-			{
-				$idprod=0;
-				if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-99;	// Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
-			}
-			if (preg_match('/^idprod_([0-9]+)$/',GETPOST('idprodfournprice'), $reg))
+			$idprod=0;
+			if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-99;	// Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice'), $reg))
 			{
 				$idprod=$reg[1];
 				$res=$productsupplier->fetch($idprod);
@@ -393,6 +390,9 @@ if (empty($reshook))
 				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
 
 				$type = $productsupplier->type;
+				$price_base_type = ($productsupplier->fourn_price_base_type?$productsupplier->fourn_price_base_type:'HT');
+
+				$ref_supplier = $productsupplier->ref_supplier;
 
 				$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 				$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
@@ -408,8 +408,8 @@ if (empty($reshook))
 					$localtax1_tx,
 					$localtax2_tx,
 					$idprod,
-					$productsupplier->product_fourn_price_id,
-					$productsupplier->fourn_ref,
+					0,							// We already have the $idprod always defined
+					$ref_supplier,
 					$remise_percent,
 					'HT',
 					$pu_ttc,
@@ -438,7 +438,7 @@ if (empty($reshook))
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
 		}
-		else if (empty($error))
+		else if (empty($error)) // $price_ht is already set
 		{
 			$pu_ht = price2num($price_ht, 'MU');
 			$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -457,22 +457,19 @@ if (empty($reshook))
 			$localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 			$localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-			if (GETPOST('price_ht')!=='')
+			if ($price_ht !== '')
 			{
-				$price_base_type = 'HT';
-				$ht = price2num(GETPOST('price_ht'));
-				$ttc = 0;
+				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 			}
 			else
 			{
-				$ttc = price2num(GETPOST('price_ttc'));
-				$ht = $ttc / (1 + ($tva_tx / 100));
-				$price_base_type = 'HT';
+				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
-
+			$price_base_type = 'HT';
 			$pu_ht_devise = price2num($price_ht_devise, 'MU');
 
-			$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, $ref_supplier, $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
+			$result=$object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
 		}
 
 		//print "xx".$tva_tx; exit;
@@ -556,9 +553,12 @@ if (empty($reshook))
 		}
 
 		$productsupplier = new ProductFournisseur($db);
-		if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid','int')) < 0 )
+		if (! empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
 		{
-			setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
+			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid','int')) < 0 )
+			{
+				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
+			}
 		}
 
 		$date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
@@ -838,6 +838,8 @@ if (empty($reshook))
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 			$action = '';
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+			exit;
 		}
 		else
 		{
@@ -955,32 +957,19 @@ if (empty($reshook))
 
 		if (! $error)
 		{
-			// Actions on extra fields (by external module or standard code)
-			// TODO le hook fait double emploi avec le trigger !!
-			$hookmanager->initHooks(array('supplierorderdao'));
-			$parameters=array('id'=>$object->id);
-
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
-
-			if (empty($reshook))
+			// Actions on extra fields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$object->insertExtraFields('ORDER_SUPPLIER_MODIFY');
+				if ($result < 0)
 				{
-					$result=$object->insertExtraFields('ORDER_SUPPLIER_MODIFY');
-
-					if ($result < 0)
-					{
-						$error++;
-					}
-
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 		}
-		else
-		{
+
+		if ($error)
 			$action = 'edit_extras';
-		}
 	}
 
 	/*
@@ -1073,8 +1062,6 @@ if (empty($reshook))
 							$fk_parent_line = 0;
 							$num = count($lines);
 
-							$productsupplier = new ProductFournisseur($db);
-
 							for($i = 0; $i < $num; $i ++)
 							{
 
@@ -1082,7 +1069,7 @@ if (empty($reshook))
 									continue;
 
 								$label = (! empty($lines[$i]->label) ? $lines[$i]->label : '');
-								$desc = (! empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->libelle);
+								$desc = (! empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->product_desc);
 								$product_type = (! empty($lines[$i]->product_type) ? $lines[$i]->product_type : 0);
 
 								// Reset fk_parent_line for no child products and special product
@@ -1098,43 +1085,57 @@ if (empty($reshook))
 									$array_option = $lines[$i]->array_options;
 								}
 
-								$result = $productsupplier->find_min_price_product_fournisseur($lines[$i]->fk_product, $lines[$i]->qty, $srcobject->socid);
-								if ($result>=0)
+								$ref_supplier = '';
+								$product_fourn_price_id = 0;
+								if ($origin == "commande")
 								{
-									$tva_tx = $lines[$i]->tva_tx;
-
-									if ($origin=="commande")
+									$productsupplier = new ProductFournisseur($db);
+									$result = $productsupplier->find_min_price_product_fournisseur($lines[$i]->fk_product, $lines[$i]->qty, $srcobject->socid);
+									if ($result > 0)
 									{
-										$soc=new societe($db);
-										$soc->fetch($socid);
-										$tva_tx=get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $productsupplier->product_fourn_price_id);
+										$ref_supplier = $productsupplier->ref_supplier;
+										$product_fourn_price_id = $productsupplier->product_fourn_price_id;
 									}
-
-									$result = $object->addline(
-										$desc,
-										$lines[$i]->subprice,
-										$lines[$i]->qty,
-										$tva_tx,
-										$lines[$i]->localtax1_tx,
-										$lines[$i]->localtax2_tx,
-										$lines[$i]->fk_product > 0 ? $lines[$i]->fk_product : 0,
-										$productsupplier->product_fourn_price_id,
-										$productsupplier->ref_supplier,
-										$lines[$i]->remise_percent,
-										'HT',
-										0,
-										$lines[$i]->product_type,
-										'',
-										'',
-										null,
-										null,
-										array(),
-										$lines[$i]->fk_unit,
-										0,
-										$element,
-										!empty($lines[$i]->id) ? $lines[$i]->id : $lines[$i]->rowid
-									);
 								}
+								else
+								{
+									$ref_supplier = $lines[$i]->ref_fourn;
+									$product_fourn_price_id = 0;
+								}
+
+								$tva_tx = $lines[$i]->tva_tx;
+
+								if ($origin=="commande")
+								{
+									$soc=new societe($db);
+									$soc->fetch($socid);
+									$tva_tx=get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id);
+								}
+
+								$result = $object->addline(
+									$desc,
+									$lines[$i]->subprice,
+									$lines[$i]->qty,
+									$tva_tx,
+									$lines[$i]->localtax1_tx,
+									$lines[$i]->localtax2_tx,
+									$lines[$i]->fk_product > 0 ? $lines[$i]->fk_product : 0,
+									$product_fourn_price_id,
+									$ref_supplier,
+									$lines[$i]->remise_percent,
+									'HT',
+									0,
+									$lines[$i]->product_type,
+									'',
+									'',
+									null,
+									null,
+									array(),
+									$lines[$i]->fk_unit,
+									0,
+									$element,
+									!empty($lines[$i]->id) ? $lines[$i]->id : $lines[$i]->rowid
+								);
 
 								if ($result < 0) {
 									$error++;
@@ -1359,6 +1360,8 @@ if ($action=='create')
 
 	dol_htmloutput_events();
 
+	$currency_code = $conf->currency;
+
 	$societe='';
 	if ($socid>0)
 	{
@@ -1618,7 +1621,7 @@ if ($action=='create')
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -2174,8 +2177,10 @@ elseif (! empty($object->id))
 
 	// Add free products/services form
 	global $forceall, $senderissupplier, $dateSelector;
-	$forceall=1; $senderissupplier=1; $dateSelector=0;
-	if (! empty($conf->global->SUPPLIER_ORDER_WITH_NOPRICEDEFINED)) $senderissupplier=2;	// $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
+	$forceall=1; $dateSelector=0;
+	$senderissupplier=2;	// $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
+	//if (! empty($conf->global->SUPPLIER_ORDER_WITH_NOPRICEDEFINED)) $senderissupplier=2;
+	if (! empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier=1;
 
 	// Show object lines
 	$inputalsopricewithtax=0;
@@ -2185,12 +2190,10 @@ elseif (! empty($object->id))
 	$num = count($object->lines);
 
 	// Form to add new line
-	if ($object->statut == 0 && $user->rights->fournisseur->commande->creer)
+	if ($object->statut == CommandeFournisseur::STATUS_DRAFT && $user->rights->fournisseur->commande->creer)
 	{
 		if ($action != 'editline')
 		{
-			$var = true;
-
 			// Add free products/services
 			$object->formAddObjectLine(1, $societe, $mysoc);
 
@@ -2217,6 +2220,7 @@ elseif (! empty($object->id))
 			// modified by hook
 			if (empty($reshook))
 			{
+				$object->fetchObjectLinked();		// Links are used to show or not button, so we load them now.
 
 				// Validate
 				if ($object->statut == 0 && $num > 0)
@@ -2345,11 +2349,11 @@ elseif (! empty($object->id))
 				// Ship
 				if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 				{
-					if (in_array($object->statut, array(3,4))) {
+					if (in_array($object->statut, array(3,4,5))) {
 						if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->receptionner) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fourn/commande/dispatch.php?id=' . $object->id . '">' . $langs->trans('OrderDispatch') . '</a></div>';
+							print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fourn/commande/dispatch.php?id=' . $object->id . '">' . $langs->trans('ReceiveProducts') . '</a></div>';
 						} else {
-							print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('OrderDispatch') . '</a></div>';
+							print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('ReceiveProducts') . '</a></div>';
 						}
 					}
 				}
@@ -2668,7 +2672,7 @@ elseif (! empty($object->id))
 
 							// Ensure that price is equal and warn user if it's not
 							$supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
-							$local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
+							$local_price = null; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
 
 							$product_fourn = new ProductFournisseur($db);
 							$product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
@@ -2683,7 +2687,7 @@ elseif (! empty($object->id))
 								}
 							}
 
-							if ($local_price != NULL && $local_price != $supplier_price) {
+							if ($local_price != null && $local_price != $supplier_price) {
 								setEventMessages($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, null, 'warnings');
 							}
 
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 837e32f9ff6..c55183921f2 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -62,6 +62,8 @@ if (empty($conf->stock->enabled)) {
 	accessforbidden();
 }
 
+$hookmanager->initHooks(array('ordersupplierdispatch'));
+
 // Recuperation de l'id de projet
 $projectid = 0;
 if ($_GET["projectid"])
@@ -85,6 +87,10 @@ if ($id > 0 || ! empty($ref)) {
  * Actions
  */
 
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
 if ($action == 'checkdispatchline' && ! ((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))))
 {
 	$error=0;
@@ -237,7 +243,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 			$fk_commandefourndet = "fk_commandefourndet_" . $reg[1] . '_' . $reg[2];
 
 			// We ask to move a qty
-			if (GETPOST($qty) > 0) {
+			if (GETPOST($qty) != 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);
@@ -431,6 +437,9 @@ if ($id > 0 || ! empty($ref)) {
 	print '<td>' . $author->getNomUrl(1, '', 0, 0, 0) . '</td>';
 	print '</tr>';
 
+  $parameters=array();
+  $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+
 	print "</table>";
 
 	print '</div>';
@@ -701,7 +710,7 @@ if ($id > 0 || ! empty($ref)) {
 
 		if ($nbproduct)
 		{
-            $checkboxlabel=$langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv($object->statuts[5]));
+			$checkboxlabel=$langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv('StatusOrderReceivedAll'));
 
 			print '<br><div class="center">';
             print $langs->trans("Comment") . ' : ';
@@ -844,7 +853,7 @@ if ($id > 0 || ! empty($ref)) {
 				}
 				// date
 				print '<td>' . dol_print_date($objp->datec) . '</td>';
-				
+
 				print "</tr>\n";
 
 				$i ++;
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 11c3c59b313..59358279e31 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -168,7 +168,7 @@ if ($object->id > 0)
 
 	print '<table class="border" width="100%">';
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
 	print "</table>\n";
 
 	print "</div>\n";
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index ca395d0cf47..4eead48abf4 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -55,7 +55,6 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    $var=false;
     print '<form method="post" action="list.php">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
@@ -86,8 +85,6 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$var=True;
-
 	$total=0;
 	$totalinprocess=0;
 	$dataseries=array();
@@ -181,15 +178,13 @@ if ($resql)
 	print '<tr class="liste_titre"><th>'.$langs->trans("Status").'</th>';
 	print '<th align="right">'.$langs->trans("Nb").'</th>';
 	print "</tr>\n";
-	$var=True;
 
 	while ($i < $num)
 	{
 		$row = $db->fetch_row($resql);
 
-
 		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans($commandestatic->statuts[$row[1]]).'</td>';
+		print '<td>'.$commandestatic->LibStatut($row[1]).'</td>';
 		print '<td align="right"><a href="list.php?statut='.$row[1].'">'.$row[0].' '.$commandestatic->LibStatut($row[1],3).'</a></td>';
 
 		print "</tr>\n";
@@ -231,11 +226,10 @@ if (! empty($conf->fournisseur->enabled))
 		if ($num)
 		{
 			$i = 0;
-			$var = True;
 			while ($i < $num)
 			{
-
 				$obj = $db->fetch_object($resql);
+
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
@@ -272,13 +266,11 @@ if ($resql)
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre"><th>'.$langs->trans("UserWithApproveOrderGrant").'</th>';
 	print "</tr>\n";
-	$var=True;
 
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
 
-
 		print '<tr class="oddeven">';
 		print '<td>';
 		$userstatic->id=$obj->rowid;
@@ -330,10 +322,8 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-		$var = True;
 		while ($i < $num)
 		{
-
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -399,11 +389,10 @@ print '<th colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_R
 if ($num)
 {
 $i = 0;
-$var = True;
 while ($i < $num)
 {
-
 $obj = $db->fetch_object($resql);
+
 print '<tr class="oddeven">';
 print '<td class="nowrap">';
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 6f0b4899d6e..1ea820e09ad 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -24,10 +24,9 @@
 /**
  *   \file       htdocs/fourn/commande/list.php
  *   \ingroup    fournisseur
- *   \brief      List of suppliers orders
+ *   \brief      List of vendor orders
  */
 
-
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -40,13 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-$langs->load("orders");
-$langs->load("sendings");
-$langs->load('deliveries');
-$langs->load('companies');
-$langs->load('compta');
-$langs->load('bills');
-$langs->load('projects');
+$langs->loadLangs(array("orders","sendings",'deliveries','companies','compta','bills','projects','suppliers'));
 
 $action=GETPOST('action','aZ09');
 $massaction=GETPOST('massaction','alpha');
@@ -472,7 +465,7 @@ if ($status)
 {
 	if ($status == '1,2,3') $title.=' - '.$langs->trans("StatusOrderToProcessShort");
 	if ($status == '6,7') $title.=' - '.$langs->trans("StatusOrderCanceled");
-	else $title.=' - '.$langs->trans($commandestatic->statuts[$status]);
+	else $title.=' - '.$commandestatic->LibStatut($status);
 }
 if ($search_billed > 0) $title.=' - '.$langs->trans("Billed");
 
@@ -584,6 +577,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -642,11 +640,13 @@ if ($resql)
 	if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
 	if (in_array($massaction, array('presend','predelete','createbills'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	$newcardbutton='';
 	if($user->rights->fournisseur->commande->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create">'.$langs->trans('NewOrder').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create">'.$langs->trans('NewOrder');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	// Lignes des champs de filtre
@@ -818,19 +818,19 @@ if ($resql)
 	// Date order
 	if (! empty($arrayfields['cf.date_commande']['checked']))
 	{
-		print '<td class="liste_titre" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_ordermonth" value="'.$search_ordermonth.'">';
+		print '<td class="liste_titre nowraponall" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_ordermonth" value="'.$search_ordermonth.'">';
 		$formother->select_year($search_orderyear?$search_orderyear:-1,'search_orderyear',1, 20, 5);
 		print '</td>';
 	}
 	// Date delivery
 	if (! empty($arrayfields['cf.date_delivery']['checked']))
 	{
-		print '<td class="liste_titre" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_deliverymonth" value="'.$search_deliverymonth.'">';
-		$formother->select_year($search_deliveryyear?$search_deliveryyear:-1,'search_deliveryyear',1, 20, 5);
+		print '<td class="liste_titre nowraponall" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliverymonth" value="'.$search_deliverymonth.'">';
+		$formother->select_year($search_deliveryyear?$search_deliveryyear:-1, 'search_deliveryyear', 1, 20, 5);
 		print '</td>';
 	}
 	if (! empty($arrayfields['cf.total_ht']['checked']))
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index dbed55a75f5..4c229518eba 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -371,7 +371,7 @@ if ($action == 'create' && !$error) {
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		$object=new FactureFournisseur($db);
 		print $object->showOptionals($extrafields,'edit');
@@ -542,13 +542,12 @@ if (($action != 'create' && $action != 'add') && !$error) {
 
 		print '</td></tr>';
 
-		$var = True;
 		$generic_commande = new CommandeFournisseur($db);
 
-		while ( $i < $num ) {
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
-			$var = ! $var;
-			print '<tr ' . $bc[$var] . '>';
+
+			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 
 			$generic_commande->id = $objp->rowid;
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 584b053b3ba..a334442e9ab 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -50,7 +50,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="p.name";
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 
 
 /*
@@ -105,14 +105,11 @@ if ($result)
     print_liste_field_titre("Phone");
     print "</tr>\n";
 
-    $var=True;
     $i = 0;
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
 
-
-
         print '<tr class="oddeven">';
 
         print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'">'.img_object($langs->trans("ShowContact"),"contact").' '.$obj->lastname.'</a></td>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index d0d3b505245..5cb8e42681e 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -319,6 +319,12 @@ if (empty($reshook))
 		$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
 	}
 
+	// Set incoterm
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	{
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	}
+
 	// payment mode
 	else if ($action == 'setmode' && $user->rights->fournisseur->facture->creer)
 	{
@@ -994,8 +1000,17 @@ if (empty($reshook))
 				$price_base_type = 'TTC';
 			}
 
-			if (GETPOST('productid'))
+			if (GETPOST('productid') > 0)
 			{
+				$productsupplier = new ProductFournisseur($db);
+				if (! empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
+				{
+					if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), GETPOST('productid'), 'none', GETPOST('socid','int')) < 0 )
+					{
+						setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
+					}
+				}
+
 				$prod = new Product($db);
 				$prod->fetch(GETPOST('productid'));
 				$label = $prod->description;
@@ -1036,7 +1051,7 @@ if (empty($reshook))
 				}
 			}
 
-	        $result=$object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise);
+	        $result=$object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise, GETPOST('fourn_ref','alpha'));
 	        if ($result >= 0)
 	        {
 	            unset($_POST['label']);
@@ -1081,6 +1096,8 @@ if (empty($reshook))
 		// Set if we used free entry or predefined product
 		$predef='';
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')
 		{
@@ -1099,9 +1116,6 @@ if (empty($reshook))
 		$remise_percent=GETPOST('remise_percent'.$predef);
 		$price_ht_devise = GETPOST('multicurrency_price_ht');
 
-		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
@@ -1161,7 +1175,7 @@ if (empty($reshook))
 			$idprod=0;
 			if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-99;	// Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
 
-			if (preg_match('/^idprod_([0-9]+)$/',GETPOST('idprodfournprice'), $reg))
+			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice'), $reg))
 			{
 				$idprod=$reg[1];
 				$res=$productsupplier->fetch($idprod);
@@ -1177,7 +1191,6 @@ if (empty($reshook))
 				$res=$productsupplier->fetch($idprod);
 			}
 
-			//Replaces $fk_unit with the product's
 			if ($idprod > 0)
 			{
 				$label = $productsupplier->label;
@@ -1185,15 +1198,17 @@ if (empty($reshook))
 				$desc = $productsupplier->description;
 				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
 
-				$tva_tx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
-				$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+				$type = $productsupplier->type;
+				$price_base_type = ($productsupplier->fourn_price_base_type?$productsupplier->fourn_price_base_type:'HT');
+
+				$ref_supplier = $productsupplier->ref_supplier;
+
+				$tva_tx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
+				$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 				if (empty($tva_tx)) $tva_npr=0;
 				$localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
 				$localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
-				$type = $productsupplier->type;
-				$price_base_type = 'HT';
-
 				$result=$object->addline(
 					$desc,
 					$productsupplier->fourn_pu,
@@ -1215,7 +1230,7 @@ if (empty($reshook))
 					$productsupplier->fk_unit,
 					0,
                     $productsupplier->fourn_multicurrency_unitprice,
-                    $productsupplier->fourn_ref
+                    $ref_supplier
 				);
 			}
 			if ($idprod == -99 || $idprod == 0)
@@ -1459,35 +1474,21 @@ if (empty($reshook))
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute', 'none'));
 		if ($ret < 0) $error++;
 
-		if (!$error)
+		if (! $error)
 		{
-			// Actions on extra fields (by external module or standard code)
-			// TODO le hook fait double emploi avec le trigger !!
-			$hookmanager->initHooks(array('supplierinvoicedao'));
-			$parameters=array('id'=>$object->id);
-
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
-
-			if (empty($reshook))
+			// Actions on extra fields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$object->insertExtraFields('BILL_SUPPLIER_MODIFY');
+				if ($result < 0)
 				{
-
-					$result=$object->insertExtraFields('BILL_SUPPLIER_MODIFY');
-
-					if ($result < 0)
-					{
-						$error++;
-					}
-
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 		}
-		else
-		{
+
+		if ($error)
 			$action = 'edit_extras';
-		}
 	}
 
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->facture->creer)
@@ -2006,7 +2007,7 @@ if ($action == 'create')
 	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 	print '</tr>';
 
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields, 'edit');
 	}
@@ -2934,7 +2935,10 @@ else
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
 		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
-		$forceall=1; $senderissupplier=1; $dateSelector=0; $inputalsopricewithtax=1;
+		$forceall=1; $dateSelector=0; $inputalsopricewithtax=1;
+		$senderissupplier=2;	// $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
+		//if (! empty($conf->global->SUPPLIER_INVOICE_WITH_NOPRICEDEFINED)) $senderissupplier=2;
+		if (! empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier=1;
 
 		// Show object lines
 		if (! empty($object->lines))
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 5f8c5787773..1f0c9f86739 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -239,7 +239,7 @@ if ($object->id > 0)
 	// Nb of files
 	print '<tr><td class="titlefield nowrap">'.$langs->trans('NbOfAttachedFiles').'</td><td>'.count($filearray).'</td></tr>';
 
-	print '<tr><td>'.$langs->trans('TotalSizeOfAttachedFiles').'</td><td>'.$totalsize.' '.$langs->trans('bytes').'</td></tr>';
+	print '<tr><td>'.$langs->trans('TotalSizeOfAttachedFiles').'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 	print '</table>';
 	print '</div>';
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index fd081d5616d..c1c4be9fb76 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -223,7 +223,6 @@ if ($user->rights->fournisseur->facture->lire)
 
 		if ($num > 0)
 		{
-			$var=True;
 			$total_ht=0;
 			$total_ttc=0;
 			$total_paid=0;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index d3fdcdcba01..90240cf8688 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -108,7 +108,7 @@ if ($option == 'late') {
 }
 $filter = GETPOST('filtre','alpha');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
@@ -412,6 +412,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -474,7 +479,9 @@ if ($resql)
 	$newcardbutton='';
 	if ($user->rights->fournisseur->facture->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create">'.$langs->trans('NewBill').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create">'.$langs->trans('NewBill');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	$i = 0;
@@ -636,18 +643,18 @@ if ($resql)
 	// Date invoice
 	if (! empty($arrayfields['f.datef']['checked']))
 	{
-		print '<td class="liste_titre" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+		print '<td class="liste_titre nowraponall" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+		print '<input class="flat width25 valignmiddle" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
 		$formother->select_year($year?$year:-1,'year',1, 20, 5);
 		print '</td>';
 	}
 	// Date due
 	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
-		print '<td class="liste_titre" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.$month_lim.'">';
+		print '<td class="liste_titre nowraponall" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month_lim" value="'.$month_lim.'">';
 		$formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
 		print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
 		print '</td>';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index cc636718bb7..74593cb8675 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -66,7 +66,7 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="p.rowid";
 $optioncss = GETPOST('optioncss','alpha');
@@ -524,7 +524,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						if (!empty($conf->multicurrency->enabled)) print '<td align="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
 	                    print '</tr>';
 
-	                    $var=True;
 	                    $total=0;
 	                    $total_ttc=0;
 	                    $totalrecu=0;
@@ -725,7 +724,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
  */
 if (empty($action))
 {
-    $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+    $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
     $page=GETPOST("page",'int');
@@ -785,6 +784,11 @@ if (empty($action))
     {
         $result = $db->query($sql);
         $nbtotalofrecords = $db->num_rows($result);
+        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+        {
+        	$page = 0;
+        	$offset = 0;
+        }
     }
 
     $sql.= $db->plimit($limit+1, $offset);
@@ -794,7 +798,6 @@ if (empty($action))
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        $var=True;
 
         $param='';
         if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
@@ -848,8 +851,8 @@ if (empty($action))
         print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
         print '</td>';
         print '<td class="liste_titre" align="center">';
-        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-        print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
         $formother->select_year($year?$year:-1,'year',1, 20, 5);
         print '</td>';
         print '<td class="liste_titre" align="left">';
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 8f34077ab34..033bcc63a2a 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -57,7 +57,6 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 // Orders
-$commande = new CommandeFournisseur($db);
 $sql = "SELECT count(cf.rowid), cf.fk_statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
@@ -76,17 +75,15 @@ if ($resql)
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Orders").'</td><td align="center">'.$langs->trans("Nb").'</td><td>&nbsp;</td>';
 	print "</tr>\n";
-	$var=True;
 
 	while ($i < $num)
 	{
 		$row = $db->fetch_row($resql);
 
-
 		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans($commande->statuts[$row[1]]).'</td>';
+		print '<td>'.$commandestatic->LibStatut($row[1]).'</td>';
 		print '<td align="center">'.$row[0].'</td>';
-		print '<td align="center"><a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?statut='.$row[1].'">'.$commande->LibStatut($row[1],3).'</a></td>';
+		print '<td align="center"><a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?statut='.$row[1].'">'.$commandestatic->LibStatut($row[1],3).'</a></td>';
 
 		print "</tr>\n";
 		$i++;
@@ -129,11 +126,10 @@ if (! empty($conf->fournisseur->enabled))
 			print '<td colspan="3">'.$langs->trans("DraftOrders").' <span class="badge">'.$num.'</span></td></tr>';
 
 			$i = 0;
-			$var = true;
 			while ($i < $num)
 			{
-
 				$obj = $db->fetch_object($resql);
+
 				print '<tr class="oddeven"><td  class="nowrap">';
 				$commandestatic->id=$obj->rowid;
 				$commandestatic->ref=$obj->ref;
@@ -186,7 +182,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 			print '<td colspan="3">'.$langs->trans("DraftBills").' <span class="badge">'.$num.'</span></td></tr>';
 			$i = 0;
 			$tot_ttc = 0;
-			$var = True;
+
 			while ($i < $num && $i < 20)
 			{
 				$obj = $db->fetch_object($resql);
@@ -259,12 +255,8 @@ if ($resql)
 	print '<td align="right">'.$langs->trans("DateModification")."</td>\n";
 	print "</tr>\n";
 
-	$var=True;
-
 	while ($obj = $db->fetch_object($resql) )
 	{
-
-
 		print '<tr class="oddeven">';
 		print '<td><a href="card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowSupplier"),"company").'</a>';
 		print "&nbsp;<a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
@@ -296,12 +288,10 @@ if (count($companystatic->SupplierCategories))
 	print '<tr class="liste_titre"><td colspan="2">';
 	print $langs->trans("Category");
 	print "</td></tr>\n";
-	$var=True;
 
 	foreach ($companystatic->SupplierCategories as $rowid => $label)
 	{
-
-		print "<tr ".$bc[$var].">\n";
+		print '<tr class="oddeven">'."\n";
 		print '<td>';
 		$categstatic->id=$rowid;
 		$categstatic->ref=$label;
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 529feb86897..daa452d0c29 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -288,8 +288,6 @@ if ($result > 0)
 
 		if ($num > 0)
 		{
-			$var=True;
-
 			$facturestatic=new FactureFournisseur($db);
 
 			while ($i < $num)
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index c71825eda0f..47bc949a758 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -157,14 +157,22 @@ if ($fourn_id > 0)
 {
 	$sql .= " AND ppf.fk_soc = ".$fourn_id;
 }
+
+$sql .= $db->order($sortfield,$sortorder);
+
 // Count total nb of records without orderby and limit
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
-$sql .= $db->order($sortfield,$sortorder);
+
 $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("fourn/product/list.php:", LOG_DEBUG);
@@ -253,7 +261,7 @@ if ($resql)
 	print "</tr>\n";
 
 	$oldid = '';
-	$var=True;
+
 	while ($i < min($num,$limit))
 	{
 		$objp = $db->fetch_object($resql);
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index c653c756bba..18039a1d47e 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -38,7 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 
 // Get parameters
-$myparam = GETPOST("myparam");
 $action=GETPOST('action', 'alpha');
 $id=GETPOST('id', 'int');
 $fuserid = (GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id);
@@ -864,7 +863,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
         print '<table class="border" width="100%">';
         print '<tbody>';
 
-        // User
+        // User for leave request
         print '<tr>';
         print '<td class="titlefield fieldrequired">'.$langs->trans("User").'</td>';
         print '<td>';
@@ -932,11 +931,24 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
         print '</td>';
         print '</tr>';
 
-        // Approved by
+        // Approver
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
         print '<td>';
-        print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
+
+        $object = new Holiday($db);
+        $include_users = $object->fetch_users_approver_holiday();
+        if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
+        else
+        {
+        	$defaultselectuser=$user->fk_user;	// Will work only if supervisor has permission to approve so is inside include_users
+        	if (! empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser=$conf->global->HOLIDAY_DEFAULT_VALIDATOR;   // Can force default approver
+        	if (GETPOST('valideur', 'int') > 0) $defaultselectuser=GETPOST('valideur', 'int');
+        	$s=$form->select_dolusers($defaultselectuser, "valideur", 1, "", 0, $include_users);
+        	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+        }
+
+        //print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
         print '</td>';
         print '</tr>';
 
@@ -1181,7 +1193,13 @@ else
                 	print '<tr>';
                     print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
                     print '<td>';
-        			print $form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
+                    $include_users = $object->fetch_users_approver_holiday();
+                    if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
+                    else
+                    {
+                    	$s=$form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id)), 0, $include_users);
+                    	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+                    }
                     print '</td>';
                     print '</tr>';
                 }
@@ -1279,20 +1297,15 @@ else
 		            print '<div class="tabsAction">';
 
                     // Boutons d'actions
-                    if ($cancreate && $object->statut == 1)
+		            if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
                     }
-                    if ($cancreate && $object->statut == 1)		// If draft
+                    if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)		// If draft
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
                     }
-                    if ($user->rights->holiday->delete && ($object->statut == 1 || $object->statut == 4 || $object->statut == 5))	// If draft or canceled or refused
-                    {
-                    	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
-                    }
-
-                    if ($object->statut == 2)	// If validated
+                    if ($object->statut == Holiday::STATUS_VALIDATED)	// If validated
                     {
                         if ($user->id == $object->fk_validator)
                         {
@@ -1305,17 +1318,19 @@ else
                             print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
                         }
                     }
-
                     if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
                     {
                     	if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
                     	else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
                     }
-
-                    if ($cancreate && $object->statut == 4)
+                    if ($cancreate && $object->statut == Holiday::STATUS_CANCELED)
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
                     }
+                    if ($user->rights->holiday->delete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED))	// If draft or canceled or refused
+                    {
+                    	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
+                    }
 
                     print '</div>';
                 }
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 950c297fb3b..03b2491ab59 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -35,6 +35,7 @@ class Holiday extends CommonObject
 	public $element='holiday';
 	public $table_element='holiday';
 	public $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	var $fk_element = 'fk_holiday';
 	public $picto = 'holiday';
 
 	/**
@@ -70,6 +71,27 @@ class Holiday extends CommonObject
 	var $optValue = '';
 	var $optRowid = '';
 
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 1;
+	/**
+	 * Validated status
+	 */
+	const STATUS_VALIDATED = 2;
+	/**
+	 * Approved
+	 */
+	const STATUS_APPROVED = 3;
+	/**
+	 * Canceled
+	 */
+	const STATUS_CANCELED = 4;
+	/**
+	 * Refused
+	 */
+	const STATUS_REFUSED = 5;
+
 
 	/**
 	 *   Constructor
@@ -779,25 +801,27 @@ class Holiday extends CommonObject
 
 
 	/**
-	 *	Check a user is not on holiday for a particular timestamp
+	 *	Check that a user is not on holiday for a particular timestamp
 	 *
 	 * 	@param 	int			$fk_user				Id user
 	 *  @param	timestamp	$timestamp				Time stamp date for a day (YYYY-MM-DD) without hours  (= 12:00AM in english and not 12:00PM that is 12:00)
+	 *  @param	string		$status					Filter on holiday status. '-1' = no filter.
 	 * 	@return array								array('morning'=> ,'afternoon'=> ), Boolean is true if user is available for day timestamp.
 	 *  @see verifDateHolidayCP
 	 */
-	function verifDateHolidayForTimestamp($fk_user, $timestamp)
+	function verifDateHolidayForTimestamp($fk_user, $timestamp, $status='-1')
 	{
 		global $langs, $conf;
 
 		$isavailablemorning=true;
 		$isavailableafternoon=true;
 
-		$sql = "SELECT cp.rowid, cp.date_debut as date_start, cp.date_fin as date_end, cp.halfday";
+		$sql = "SELECT cp.rowid, cp.date_debut as date_start, cp.date_fin as date_end, cp.halfday, cp.statut";
 		$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
 		$sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
 		$sql.= " AND cp.fk_user = ".(int) $fk_user;
-		$sql.= " AND date_debut <= '".$this->db->idate($timestamp)."' AND date_fin >= '".$this->db->idate($timestamp)."'";
+		$sql.= " AND cp.date_debut <= '".$this->db->idate($timestamp)."' AND cp.date_fin >= '".$this->db->idate($timestamp)."'";
+		if ($status != '-1') $sql.=" AND cp.statut IN (".$this->db->escape($status).")";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1545,6 +1569,48 @@ class Holiday extends CommonObject
 		}
 	}
 
+
+	/**
+	 * Return list of people with permission to validate leave requests.
+	 * Search for permission "approve leave requests"
+	 *
+	 * @return  array       Array of user ids
+	 */
+	function fetch_users_approver_holiday()
+	{
+		$users_validator=array();
+
+		$sql = "SELECT DISTINCT ur.fk_user";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
+		$sql.= " WHERE ur.fk_id = rd.id and rd.module = 'holiday' AND rd.perms = 'approve'";                                              // Permission 'Approve';
+		$sql.= "UNION";
+		$sql.= " SELECT DISTINCT ugu.fk_user";
+		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
+		$sql.= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'holiday' AND rd.perms = 'approve'";       // Permission 'Approve';
+		//print $sql;
+
+		dol_syslog(get_class($this)."::fetch_users_approver_holiday sql=".$sql);
+		$result = $this->db->query($sql);
+		if($result)
+		{
+			$num_lignes = $this->db->num_rows($result); $i = 0;
+			while ($i < $num_lignes)
+			{
+				$objp = $this->db->fetch_object($result);
+				array_push($users_validator,$objp->fk_user);
+				$i++;
+			}
+			return $users_validator;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch_users_approver_holiday  Error ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+
 	/**
 	 *	Compte le nombre d'utilisateur actifs dans Dolibarr
 	 *
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 94d32b3bc49..52386acf93c 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -59,7 +59,7 @@ $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortfield) $sortfield="position_name";
 
 
 $object = new Holiday($db);
@@ -211,7 +211,7 @@ if ($object->id)
     }
 
     print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
 
     print '</tbody>';
     print '</table>'."\n";
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 3397e6fced8..c5ea7c868e0 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -378,7 +378,13 @@ else
    	//print $num;
     //print count($holiday->holiday);
 
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/holiday/card.php?action=request">'.$langs->trans('MenuAddCP').'</a>';
+	$newcardbutton='';
+	if ($user->rights->holiday->write)
+	{
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/holiday/card.php?action=request">'.$langs->trans('MenuAddCP');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
+	}
 
 	print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm.png', 0, $newcardbutton, '', $limit);
 
@@ -461,15 +467,19 @@ else
 
 // Type
 print '<td class="liste_titre">';
-$typeleaves=$holidaystatic->getTypes(1,-1);
-$arraytypeleaves=array();
-foreach($typeleaves as $key => $val)
-{
-	$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
-    //$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
-    $arraytypeleaves[$val['rowid']]=$labeltoshow;
+if (empty($mysoc->country_id)) {
+	setEventMessages(null, array($langs->trans("ErrorSetACountryFirst"),$langs->trans("CompanyFoundation")),'errors');
+} else {
+	$typeleaves=$holidaystatic->getTypes(1,-1);
+	$arraytypeleaves=array();
+	foreach($typeleaves as $key => $val)
+	{
+		$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
+		//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
+		$arraytypeleaves[$val['rowid']]=$labeltoshow;
+	}
+	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
 }
-print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
 print '</td>';
 
 // Duration
@@ -524,7 +534,7 @@ if ($id && empty($user->rights->holiday->read_all) && ! in_array($id, $childids)
 	$result = 0;
 }
 // Lines
-elseif (! empty($holiday->holiday))
+elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
 {
 	$userstatic = new User($db);
 	$approbatorstatic = new User($db);
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 23e92b83004..8f3b6c6a838 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -61,7 +61,7 @@ if ($page == -1) {
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 
 $form = new Form($db);
 $establishmenttmp=new Establishment($db);
diff --git a/htdocs/includes/jsgantt/jsgantt.js b/htdocs/includes/jsgantt/jsgantt.js
index 7a26eecb9fc..04921b92405 100644
--- a/htdocs/includes/jsgantt/jsgantt.js
+++ b/htdocs/includes/jsgantt/jsgantt.js
@@ -331,7 +331,7 @@ JSGantt.GanttChart=function(pDiv, pFormat)
 	var vLangs={'en':
 			{'format':'Format','hour':'Hour','day':'Day','week':'Week','month':'Month','quarter':'Quarter','hours':'Hours','days':'Days',
 			 'weeks':'Weeks','months':'Months','quarters':'Quarters','hr':'Hr','dy':'Day','wk':'Wk','mth':'Mth','qtr':'Qtr','hrs':'Hrs',
-			 'dys':'Days','wks':'Wks','mths':'Mths','qtrs':'Qtrs','resource':'Resource','duration':'Duration','comp':'% Comp.',
+			 'dys':'Days','wks':'Wks','mths':'Mths','qtrs':'Qtrs','resource':'Resource','duration':'Duration','comp':'%',
 			 'completion':'Completion','startdate':'Start Date','enddate':'End Date','moreinfo':'More Information','notes':'Notes',
 			 'january':'January','february':'February','march':'March','april':'April','maylong':'May','june':'June','july':'July',
 			 'august':'August','september':'September','october':'October','november':'November','december':'December','jan':'Jan',
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index bba5ea85afa..112f742214d 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -62,7 +62,7 @@ pHeader('','');     // No next step for navigation buttons. Next step is defined
 //print "<br>\n";
 //print $langs->trans("InstallEasy")."<br><br>\n";
 
-print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/gear.svg" width="20" alt="Database"> '.$langs->trans("MiscellaneousChecks").":</h3>\n";
+print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Database"> '.$langs->trans("MiscellaneousChecks").":</h3>\n";
 
 // Check browser
 $useragent=$_SERVER['HTTP_USER_AGENT'];
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 0186e42809d..b0affb2218a 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -24,7 +24,7 @@
 /**
  *       \file       htdocs/install/fileconf.php
  *       \ingroup    install
- *       \brief      Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
+ *       \brief      Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page step1)
  */
 
 include_once 'inc.php';
@@ -111,7 +111,7 @@ if (! empty($force_install_message))
 
 	<tr>
 		<td colspan="3" class="label">
-		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
 		</td>
 	</tr>
 
@@ -234,7 +234,7 @@ if (! empty($force_install_message))
 
 	<tr>
 		<td colspan="3" class="label"><br>
-		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
 		</td>
 	</tr>
 
@@ -468,7 +468,7 @@ if (! empty($force_install_message))
 	?>
 	<tr class="hidesqlite hideroot">
 		<td colspan="3" class="label"><br>
-		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
 		</td>
 	</tr>
 
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index d821ad2b454..7c2895eb835 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -391,8 +391,9 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='',$css
     print '<!DOCTYPE HTML>'."\n";
     print '<html>'."\n";
     print '<head>'."\n";
-    print '<meta charset='.$conf->file->character_set_client.'">'."\n";
+    print '<meta charset="'.$conf->file->character_set_client.'">'."\n";
     print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+    print '<meta name="generator" content="Dolibarr installer">'."\n";
     print '<link rel="stylesheet" type="text/css" href="default.css">'."\n";
 
     print '<!-- Includes CSS for JQuery -->'."\n";
diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql
index 86ce4580d9e..e80de82b6ad 100644
--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_abc.sql
@@ -29,13 +29,13 @@
 --
 
 
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('VT', 'Sale Journal',           2, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AC', 'Purchase Journal',       3, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('BQ', 'Bank Journal',           4, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('OD', 'Other Journal',          1, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AN', 'Has new Journal',        9, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('ER', 'Expense Report Journal', 5, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('INV', 'Inventory Journal'    , 8, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('VT', 'ACCOUNTING_SELL_JOURNAL',           2, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AC', 'ACCOUNTING_PURCHASE_JOURNAL',       3, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('BQ', 'FinanceJournal',           4, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('OD', 'ACCOUNTING_MISCELLANEOUS_JOURNAL',          1, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AN', 'ACCOUNTING_HAS_NEW_JOURNAL',        9, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('ER', 'ExpenseReportsJournal', 5, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('INV', 'InventoryJournal'    , 8, 1, 1);
 
 
 -- Description of chart of account FR PCG99-ABREGE
@@ -44,7 +44,7 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account FR PCG99-BASE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  1, 'PCG99-BASE', 'The base accountancy french plan', 1);
 
--- Description of chart of account FR PCG14-BASE
+-- Description of chart of account FR PCG14-DEV
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  1, 'PCG14-DEV', 'The developed accountancy french plan 2014', 1);
 
 -- Description of chart of account BE PCMN-BASE
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 56659ea714c..502f7053106 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -304,10 +304,10 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   date_validated        datetime					-- FEC:ValidDate
 ) ENGINE=innodb;
 
-ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
-ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_fk_docdet (fk_docdet);
-ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte);
-ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_tmp_doc_date (doc_date);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_tmp_fk_docdet (fk_docdet);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_tmp_numero_compte (numero_compte);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_tmp_code_journal (code_journal);
 
 
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN debit double(24,8);
@@ -489,7 +489,7 @@ DELETE FROM llx_categorie_product WHERE fk_categorie NOT IN (SELECT rowid FROM l
 DELETE FROM llx_categorie_societe WHERE fk_categorie NOT IN (SELECT rowid FROM llx_categorie WHERE type IN (1, 2));
 DELETE FROM llx_categorie_member WHERE fk_categorie NOT IN (SELECT rowid FROM llx_categorie WHERE type = 3);
 DELETE FROM llx_categorie_contact WHERE fk_categorie NOT IN (SELECT rowid FROM llx_categorie WHERE type = 4);
-DELETE FROM llx_categorie_project WHERE fk_categorie NOT IN (SELECT rowid FROM llx_categorie WHERE type = 5);
+DELETE FROM llx_categorie_project WHERE fk_categorie NOT IN (SELECT rowid FROM llx_categorie WHERE type = 6);
 
 ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
 
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index c19530acd01..18c4cfe2246 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -99,6 +99,8 @@ 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_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24);
 
+-- VPGSQL8.4 ALTER TABLE llx_product_attribute DROP CONSTRAINT unique_ref;
+
 ALTER TABLE llx_product_attribute_value DROP INDEX unique_ref;
 ALTER TABLE llx_product_attribute_value ADD UNIQUE INDEX uk_product_attribute_value (fk_product_attribute, ref);
 
@@ -528,6 +530,9 @@ CREATE TABLE llx_comment (
 
 DELETE FROM llx_const where name = __ENCRYPT('MAIN_SHOW_WORKBOARD')__;
 
+-- Adherent - Update old constants
+UPDATE llx_const SET value = REPLACE(value, '%', '__') WHERE name LIKE 'ADHERENT%'; 
+
 -- Accountancy - Remove old constants
 DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_SELL_JOURNAL')__;
 DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_PURCHASE_JOURNAL')__;
@@ -572,21 +577,21 @@ ALTER TABLE llx_c_email_senderprofile ADD UNIQUE INDEX uk_c_email_senderprofile(
 -- Add new chart of account entries
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 67,'PC-MIPYME', 'The PYME accountancy Chile plan', 1);
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  7,'ENG-BASE',  'England plan', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 49,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 60,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 65,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 72,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 21,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 16,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 87,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (147,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (168,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 22,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 66,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 49,'SYSCOHADA-BJ', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 60,'SYSCOHADA-BF', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA-CM', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 65,'SYSCOHADA-CF', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA-KM', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 72,'SYSCOHADA-CG', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 21,'SYSCOHADA-CI', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 16,'SYSCOHADA-GA', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 87,'SYSCOHADA-GQ', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (147,'SYSCOHADA-ML', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (168,'SYSCOHADA-NE', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA-CD', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 22,'SYSCOHADA-SN', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 66,'SYSCOHADA-TD', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA-TG', 'Plan comptable Ouest-Africain', 1);
 
 
 -- Update old chart of account entries
@@ -705,6 +710,10 @@ ALTER TABLE llx_facture_rec_extrafields ADD INDEX idx_facture_rec_extrafields (f
 
 -- VMYSQL4.1 ALTER TABLE llx_product_association ADD COLUMN rowid integer AUTO_INCREMENT PRIMARY KEY;
 
-
+-- drop very old table (bad name)
 DROP TABLE llx_c_accountancy_category;
 
+
+UPDATE llx_cronjob set entity = 1 where entity = 0 and label in ('RecurringInvoices', 'SendEmailsReminders');
+UPDATE llx_cronjob set entity = 0 where entity = 1 and label in ('PurgeDeleteTemporaryFilesShort', 'MakeLocalDatabaseDumpShort');
+
diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
index 880bd4e7ca2..a57e02455cc 100644
--- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
+++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
@@ -9,12 +9,16 @@
 -- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
 -- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
 -- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
--- To drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
--- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
 -- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
 -- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
--- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
--- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
 -- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
 -- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
 -- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
@@ -36,6 +40,7 @@ ALTER TABLE llx_website_page ADD COLUMN fk_user_create integer;
 ALTER TABLE llx_website_page ADD COLUMN fk_user_modif integer; 
 ALTER TABLE llx_website_page ADD COLUMN type_container varchar(16) NOT NULL DEFAULT 'page';
 
+-- drop very old table (bad name)
 DROP TABLE llx_c_accountancy_category;
 DROP TABLE llx_c_accountingaccount;
 
@@ -46,6 +51,31 @@ ALTER TABLE llx_inventory ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_inventory ADD COLUMN fk_user_valid integer;
 ALTER TABLE llx_inventory ADD COLUMN import_key varchar(14);
 
+-- Missing Chart of accounts in migration 7.0.0
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  1, 'PCG14-DEV', 'The developed accountancy french plan 2014', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  6, 'PCG_SUISSE', 'Switzerland plan', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (140, 'PCN-LUXEMBURG', 'Plan comptable normalisé Luxembourgeois', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 80, 'DK-STD', 'Standardkontoplan fra SKAT', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 10, 'PCT', 'The Tunisia plan', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 12, 'PCG', 'The Moroccan chart of accounts', 1);
+
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 67,'PC-MIPYME', 'The PYME accountancy Chile plan', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  7,'ENG-BASE',  'England plan', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 49,'SYSCOHADA-BJ', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 60,'SYSCOHADA-BF', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA-CM', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 65,'SYSCOHADA-CF', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA-KM', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 72,'SYSCOHADA-CG', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 21,'SYSCOHADA-CI', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 16,'SYSCOHADA-GA', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 87,'SYSCOHADA-GQ', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (147,'SYSCOHADA-ML', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (168,'SYSCOHADA-NE', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA-CD', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 22,'SYSCOHADA-SN', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 66,'SYSCOHADA-TD', 'Plan comptable Ouest-Africain', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA-TG', 'Plan comptable Ouest-Africain', 1);
 
 -- For 8.0
 
@@ -115,12 +145,20 @@ ALTER TABLE llx_website_page ADD COLUMN aliasalt varchar(255) after pageurl;
 DELETE FROM llx_c_paiement WHERE code = '' or code = '-' or id = 0;
 ALTER TABLE llx_c_paiement DROP INDEX uk_c_paiement;
 ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement_code(entity, code);
-ALTER TABLE llx_c_paiement CHANGE COLUMN id id INTEGER AUTO_INCREMENT PRIMARY KEY;
+-- VMYSQL4.3 ALTER TABLE llx_c_paiement CHANGE COLUMN id id INTEGER AUTO_INCREMENT PRIMARY KEY;
+-- VPGSQL8.2 CREATE SEQUENCE llx_c_paiement_id_seq OWNED BY llx_c_paiement.id;
+-- VPGSQL8.2 ALTER TABLE llx_c_paiement ADD PRIMARY KEY (id);
+-- VPGSQL8.2 ALTER TABLE llx_c_paiement ALTER COLUMN id SET DEFAULT nextval('llx_c_paiement_id_seq');
+-- VPGSQL8.2 SELECT setval('llx_c_paiement_id_seq', MAX(id)) FROM llx_c_paiement;
 
 -- Add missing keys and primary key
 ALTER TABLE llx_c_payment_term DROP INDEX uk_c_payment_term;
-ALTER TABLE llx_c_payment_term CHANGE COLUMN rowid rowid INTEGER AUTO_INCREMENT PRIMARY KEY;
 ALTER TABLE llx_c_payment_term ADD UNIQUE INDEX uk_c_payment_term_code(entity, code);
+-- VMYSQL4.3 ALTER TABLE llx_c_payment_term CHANGE COLUMN rowid rowid INTEGER AUTO_INCREMENT PRIMARY KEY;
+-- VPGSQL8.2 CREATE SEQUENCE llx_c_payment_term_rowid_seq OWNED BY llx_c_payment_term.rowid;
+-- VPGSQL8.2 ALTER TABLE llx_c_payment_term ADD PRIMARY KEY (rowid);
+-- VPGSQL8.2 ALTER TABLE llx_c_payment_term ALTER COLUMN rowid SET DEFAULT nextval('llx_c_payment_term_rowid_seq');
+-- VPGSQL8.2 SELECT setval('llx_c_payment_term_rowid_seq', MAX(rowid)) FROM llx_c_payment_term;
 
 ALTER TABLE llx_oauth_token ADD COLUMN tokenstring text;
 
@@ -174,8 +212,8 @@ CREATE TABLE llx_ticketsup
 )ENGINE=innodb;
 
 ALTER TABLE llx_ticketsup ADD COLUMN notify_tiers_at_create integer;
-ALTER TABLE llx_ticketsup ADD UNIQUE uk_ticketsup_rowid_track_id (rowid, track_id);
-ALTER TABLE llx_ticketsup ADD INDEX id_ticketsup_track_id (track_id);
+ALTER TABLE llx_ticketsup DROP INDEX uk_ticketsup_rowid_track_id;
+ALTER TABLE llx_ticketsup ADD UNIQUE uk_ticketsup_track_id (track_id);
 
 CREATE TABLE llx_ticketsup_msg
 (
@@ -371,7 +409,6 @@ ALTER TABLE llx_asset ADD INDEX idx_asset_entity (entity);
 ALTER TABLE llx_asset ADD INDEX idx_asset_fk_soc (fk_soc);
 
 ALTER TABLE llx_asset ADD INDEX idx_asset_fk_asset_type (fk_asset_type);
-ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_asset_type FOREIGN KEY (fk_asset_type)    REFERENCES llx_asset_type (rowid);
 
 create table llx_asset_extrafields
 (
@@ -395,6 +432,8 @@ create table llx_asset_type
 
 ALTER TABLE llx_asset_type ADD UNIQUE INDEX uk_asset_type_label (label, entity);
 
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_asset_type FOREIGN KEY (fk_asset_type)    REFERENCES llx_asset_type (rowid);
+
 create table llx_asset_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
@@ -408,6 +447,29 @@ ALTER TABLE llx_asset_type_extrafields ADD INDEX idx_asset_type_extrafields (fk_
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (7,'INV', 'Inventory journal', 8, 1);
 
 UPDATE llx_accounting_account set account_parent = 0 WHERE account_parent = '' OR account_parent IS NULL;
-ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent integer DEFAULT 0;
+-- VMYSQL4.1 ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent integer DEFAULT 0;
+-- VPGSQL8.2 ALTER TABLE llx_accounting_account ALTER COLUMN account_parent DROP DEFAULT;
+-- VPGSQL8.2 ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent integer USING account_parent::integer;
+-- VPGSQL8.2 ALTER TABLE llx_accounting_account ALTER COLUMN account_parent SET DEFAULT 0;
 ALTER TABLE llx_accounting_account ADD INDEX idx_accounting_account_account_parent (account_parent);
 
+UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS NULL;
+
+ALTER TABLE llx_extrafields MODIFY COLUMN list VARCHAR(128);
+
+UPDATE llx_rights_def set module = 'asset' where module = 'assets';
+
+ALTER TABLE llx_c_accounting_category ADD COLUMN entity integer NOT NULL DEFAULT 1 AFTER rowid;
+-- VMYSQL4.1 DROP INDEX uk_c_accounting_category on llx_c_accounting_category;
+-- VPGSQL8.2 DROP INDEX uk_c_accounting_category;
+ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code,entity);
+-- VMYSQL4.1 DROP INDEX uk_accounting_journal_code on llx_accounting_journal;
+-- VPGSQL8.2 DROP INDEX uk_accounting_journal_code;
+ALTER TABLE llx_accounting_journal ADD UNIQUE INDEX uk_accounting_journal_code (code,entity);
+
+UPDATE llx_c_email_templates SET lang = '' WHERE lang IS NULL;
+
+-- Warehouse
+ALTER TABLE llx_entrepot ADD COLUMN model_pdf VARCHAR(255) AFTER fk_user_author;
+ALTER TABLE llx_stock_mouvement ADD COLUMN model_pdf VARCHAR(255) AFTER origintype;
+
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 69cd2a3bc79..9493ef6c7c9 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -175,7 +175,7 @@ delete from llx_categorie_fournisseur where fk_categorie not in (select rowid fr
 delete from llx_categorie_societe where fk_categorie not in (select rowid from llx_categorie where type = 2);
 delete from llx_categorie_member where fk_categorie not in (select rowid from llx_categorie where type = 3);
 delete from llx_categorie_contact where fk_categorie not in (select rowid from llx_categorie where type = 4);
-delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 5);
+delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 6);
 
 
 -- Fix: delete orphelin deliveries. Note: deliveries are linked to shipment by llx_element_element only. No other links.
@@ -429,3 +429,32 @@ drop table tmp_bank_url_expense_user;
 -- Backport a change of value into the hourly rate. 
 -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)
 
+
+-- select * from llx_facturedet as fd, llx_product as p where fd.fk_product = p.rowid AND fd.product_type != p.fk_product_type;
+update llx_facturedet set product_type = 0 where product_type = 1 AND fk_product > 0 AND fk_product IN (SELECT rowid FROM llx_product WHERE fk_product_type = 0);
+update llx_facturedet set product_type = 1 where product_type = 0 AND fk_product > 0 AND fk_product IN (SELECT rowid FROM llx_product WHERE fk_product_type = 1);
+
+update llx_facture_fourn_det set product_type = 0 where product_type = 1 AND fk_product > 0 AND fk_product IN (SELECT rowid FROM llx_product WHERE fk_product_type = 0);
+update llx_facture_fourn_det set product_type = 1 where product_type = 0 AND fk_product > 0 AND fk_product IN (SELECT rowid FROM llx_product WHERE fk_product_type = 1);
+ 
+ 
+UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS NULL;
+
+ 
+-- UPDATE llx_contratdet set label = NULL WHERE label IS NOT NULL;
+-- UPDATE llx_facturedet_rec set label = NULL WHERE label IS NOT NULL;
+
+
+
+-- Note to migrate from old counter aquarium to new one
+-- drop table tmp;
+-- create table tmp select rowid, code_client, concat(substr(code_client, 1, 6),'-0',substr(code_client, 8, 5)) as code_client2 from llx_societe where code_client like 'CU____-____';
+-- update llx_societe as s set code_client = (select code_client2 from tmp as t where t.rowid = s.rowid) where code_client like 'CU____-____';
+-- drop table tmp;
+-- create table tmp select rowid, code_fournisseur, concat(substr(code_fournisseur, 1, 6),'-0',substr(code_fournisseur, 8, 5)) as code_fournisseur2 from llx_societe where code_fournisseur like 'SU____-____';
+-- select * from tmp;
+-- update llx_societe as s set s.code_fournisseur = (select code_fournisseur2 from tmp as t where t.rowid = s.rowid) where s.code_fournisseur like 'SU____-____';
+-- update llx_societe set code_compta =  concat('411', substr(code_client, 3, 2),substr(code_client, 8, 5)) where client in (1,2,3) and code_compte is not null;
+-- update llx_societe set code_compta_fournisseur =  concat('401', substr(code_fournisseur, 3, 2),substr(code_fournisseur, 8, 5)) where fournisseur in (1,2,3) and code_fournisseur is not null;
+
+
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.key.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.key.sql
index 95a15ca0a0d..5fc53842284 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.key.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.key.sql
@@ -16,7 +16,7 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
-ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_fk_docdet (fk_docdet);
-ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte);
-ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_tmp_doc_date (doc_date);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_tmp_fk_docdet (fk_docdet);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_tmp_numero_compte (numero_compte);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_tmp_code_journal (code_journal);
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.key.sql b/htdocs/install/mysql/tables/llx_accounting_journal.key.sql
index e5083aa83d7..701c39e06a2 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.key.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.key.sql
@@ -17,4 +17,4 @@
 -- ===========================================================================
 
 
-ALTER TABLE llx_accounting_journal ADD UNIQUE INDEX uk_accounting_journal_code (code);
+ALTER TABLE llx_accounting_journal ADD UNIQUE INDEX uk_accounting_journal_code (code,entity);
diff --git a/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql b/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
index 6b2d520a156..be927f6e761 100644
--- a/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
@@ -17,5 +17,5 @@
 -- Table with category for accounting account
 -- ===================================================================
 
-ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code);
+ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code,entity);
 
diff --git a/htdocs/install/mysql/tables/llx_c_accounting_category.sql b/htdocs/install/mysql/tables/llx_c_accounting_category.sql
index 253ff6aef46..9df9a9d6ab0 100644
--- a/htdocs/install/mysql/tables/llx_c_accounting_category.sql
+++ b/htdocs/install/mysql/tables/llx_c_accounting_category.sql
@@ -22,6 +22,7 @@
 
 CREATE TABLE llx_c_accounting_category (
   rowid 				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  entity 				integer NOT NULL DEFAULT 1,
   code 					varchar(16) NOT NULL,
   label 				varchar(255) NOT NULL,
   range_account			varchar(255) NOT NULL,			 -- Comment
diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
index cfb17c55766..4c6f0480d5a 100644
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@@ -34,6 +34,7 @@ create table llx_entrepot
   fk_pays         integer DEFAULT 0,
   statut          tinyint DEFAULT 1,			-- 1 open, 0 close
   fk_user_author  integer,
-  import_key	  varchar(14),
+  model_pdf       varchar(255),
+  import_key	    varchar(14),
   fk_parent       integer DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 5c3a318b796..9acf239ee64 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -35,7 +35,7 @@ create table llx_extrafields
 	pos             integer DEFAULT 0,
 	alwayseditable  integer DEFAULT 0,							-- 1 if field can be edited whatever is element status
 	param			text,										-- extra parameters to define possible values of field
-	list			integer DEFAULT 1,							-- visibility of field. 0=Never visible, 1=Visible on list and forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing
+	list			varchar(255) DEFAULT '1',					-- visibility of field. 0=Never visible, 1=Visible on list and forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing
 	langs			varchar(64),								-- example: fileofmymodule@mymodule
 	fk_user_author	integer,									-- user making creation
 	fk_user_modif	integer,	                                -- user making last change
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
index 3ac42c0c852..1e78e7a9820 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
@@ -34,5 +34,6 @@ create table llx_stock_mouvement
   label           varchar(255),						-- Comment on movement
   inventorycode   varchar(128),						-- Code used to group different movement line into one operation (may be an inventory, a mass picking)
   fk_origin       integer,
-  origintype      varchar(32)
+  origintype      varchar(32),
+  model_pdf       varchar(255)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticketsup.key.sql b/htdocs/install/mysql/tables/llx_ticketsup.key.sql
index abf853e718c..3a47ae18201 100755
--- a/htdocs/install/mysql/tables/llx_ticketsup.key.sql
+++ b/htdocs/install/mysql/tables/llx_ticketsup.key.sql
@@ -14,5 +14,4 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ALTER TABLE llx_ticketsup ADD UNIQUE uk_ticketsup_rowid_track_id (rowid, track_id);
-ALTER TABLE llx_ticketsup ADD INDEX id_ticketsup_track_id (track_id);
+ALTER TABLE llx_ticketsup ADD UNIQUE uk_ticketsup_track_id (track_id);
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index e5b9d47a0ba..de6d98edf04 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -24,10 +24,10 @@ CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP(TIMESTAMP WITHOUT TIME ZONE) RETURNS B
 
 CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP(TIMESTAMP WITH TIME ZONE) RETURNS BIGINT LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT EXTRACT(EPOCH FROM $1)::bigint;';
 
-DROP FUNCTION date_format(timestamp without time zone,text);
+DROP FUNCTION IF EXISTS date_format(timestamp without time zone,text);
 CREATE OR REPLACE FUNCTION date_format(timestamp without time zone, text) RETURNS text AS $$ DECLARE i int := 1; temp text := ''; c text; n text; res text; BEGIN WHILE i <= pg_catalog.length($2) LOOP c := SUBSTRING ($2 FROM i FOR 1); IF c = '%' AND i != pg_catalog.length($2) THEN n := SUBSTRING ($2 FROM (i + 1) FOR 1); SELECT INTO res CASE WHEN n = 'a' THEN pg_catalog.to_char($1, 'Dy') WHEN n = 'b' THEN pg_catalog.to_char($1, 'Mon') WHEN n = 'c' THEN pg_catalog.to_char($1, 'FMMM') WHEN n = 'D' THEN pg_catalog.to_char($1, 'FMDDth') WHEN n = 'd' THEN pg_catalog.to_char($1, 'DD') WHEN n = 'e' THEN pg_catalog.to_char($1, 'FMDD') WHEN n = 'f' THEN pg_catalog.to_char($1, 'US') WHEN n = 'H' THEN pg_catalog.to_char($1, 'HH24') WHEN n = 'h' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'I' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'i' THEN pg_catalog.to_char($1, 'MI') WHEN n = 'j' THEN pg_catalog.to_char($1, 'DDD') WHEN n = 'k' THEN pg_catalog.to_char($1, 'FMHH24') WHEN n = 'l' THEN pg_catalog.to_char($1, 'FMHH12') WHEN n = 'M' THEN pg_catalog.to_char($1, 'FMMonth') WHEN n = 'm' THEN pg_catalog.to_char($1, 'MM') WHEN n = 'p' THEN pg_catalog.to_char($1, 'AM') WHEN n = 'r' THEN pg_catalog.to_char($1, 'HH12:MI:SS AM') WHEN n = 'S' THEN pg_catalog.to_char($1, 'SS') WHEN n = 's' THEN pg_catalog.to_char($1, 'SS') WHEN n = 'T' THEN pg_catalog.to_char($1, 'HH24:MI:SS') WHEN n = 'U' THEN pg_catalog.to_char($1, '?') WHEN n = 'u' THEN pg_catalog.to_char($1, '?') WHEN n = 'V' THEN pg_catalog.to_char($1, '?') WHEN n = 'v' THEN pg_catalog.to_char($1, '?') WHEN n = 'W' THEN pg_catalog.to_char($1, 'FMDay') WHEN n = 'w' THEN EXTRACT(DOW FROM $1)::text WHEN n = 'X' THEN pg_catalog.to_char($1, '?') WHEN n = 'x' THEN pg_catalog.to_char($1, '?') WHEN n = 'Y' THEN pg_catalog.to_char($1, 'YYYY') WHEN n = 'y' THEN pg_catalog.to_char($1, 'YY') WHEN n = '%' THEN pg_catalog.to_char($1, '%') ELSE NULL END; temp := temp operator(pg_catalog.||) res; i := i + 2; ELSE temp = temp operator(pg_catalog.||) c; i := i + 1; END IF; END LOOP; RETURN temp; END $$ IMMUTABLE STRICT LANGUAGE plpgsql;
 
-DROP FUNCTION date_format(timestamp with time zone,text);
+DROP FUNCTION IF EXISTS date_format(timestamp with time zone,text);
 CREATE OR REPLACE FUNCTION date_format(timestamp with time zone, text) RETURNS text AS $$ DECLARE i int := 1; temp text := ''; c text; n text; res text; BEGIN WHILE i <= pg_catalog.length($2) LOOP c := SUBSTRING ($2 FROM i FOR 1); IF c = '%' AND i != pg_catalog.length($2) THEN n := SUBSTRING ($2 FROM (i + 1) FOR 1); SELECT INTO res CASE WHEN n = 'a' THEN pg_catalog.to_char($1, 'Dy') WHEN n = 'b' THEN pg_catalog.to_char($1, 'Mon') WHEN n = 'c' THEN pg_catalog.to_char($1, 'FMMM') WHEN n = 'D' THEN pg_catalog.to_char($1, 'FMDDth') WHEN n = 'd' THEN pg_catalog.to_char($1, 'DD') WHEN n = 'e' THEN pg_catalog.to_char($1, 'FMDD') WHEN n = 'f' THEN pg_catalog.to_char($1, 'US') WHEN n = 'H' THEN pg_catalog.to_char($1, 'HH24') WHEN n = 'h' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'I' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'i' THEN pg_catalog.to_char($1, 'MI') WHEN n = 'j' THEN pg_catalog.to_char($1, 'DDD') WHEN n = 'k' THEN pg_catalog.to_char($1, 'FMHH24') WHEN n = 'l' THEN pg_catalog.to_char($1, 'FMHH12') WHEN n = 'M' THEN pg_catalog.to_char($1, 'FMMonth') WHEN n = 'm' THEN pg_catalog.to_char($1, 'MM') WHEN n = 'p' THEN pg_catalog.to_char($1, 'AM') WHEN n = 'r' THEN pg_catalog.to_char($1, 'HH12:MI:SS AM') WHEN n = 'S' THEN pg_catalog.to_char($1, 'SS') WHEN n = 's' THEN pg_catalog.to_char($1, 'SS') WHEN n = 'T' THEN pg_catalog.to_char($1, 'HH24:MI:SS') WHEN n = 'U' THEN pg_catalog.to_char($1, '?') WHEN n = 'u' THEN pg_catalog.to_char($1, '?') WHEN n = 'V' THEN pg_catalog.to_char($1, '?') WHEN n = 'v' THEN pg_catalog.to_char($1, '?') WHEN n = 'W' THEN pg_catalog.to_char($1, 'FMDay') WHEN n = 'w' THEN EXTRACT(DOW FROM $1)::text WHEN n = 'X' THEN pg_catalog.to_char($1, '?') WHEN n = 'x' THEN pg_catalog.to_char($1, '?') WHEN n = 'Y' THEN pg_catalog.to_char($1, 'YYYY') WHEN n = 'y' THEN pg_catalog.to_char($1, 'YY') WHEN n = '%' THEN pg_catalog.to_char($1, '%') ELSE NULL END; temp := temp operator(pg_catalog.||) res; i := i + 2; ELSE temp = temp operator(pg_catalog.||) c; i := i + 1; END IF; END LOOP; RETURN temp; END $$ IMMUTABLE STRICT LANGUAGE plpgsql;
 
 
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 229ae0a3c3e..896d6964bdd 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -267,7 +267,7 @@ if ($ok && GETPOST('standard', 'alpha'))
 	            if (! in_array($code,array_keys($arrayoffieldsfound)))
 	            {
 	                print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
-	                $type=$extrafields->attribute_type[$code]; $length=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null';
+	                $type=$extrafields->attributes[$elementtype]['type'][$code]; $length=$extrafields->attributes[$elementtype]['size'][$code]; $attribute=''; $default=''; $extra=''; $null='null';
 
            			if ($type=='boolean') {
         				$typedb='int';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 838ef34afa3..f313a7a9595 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -32,8 +32,8 @@ include 'inc.php';
 
 global $langs;
 
-$action=GETPOST('action','alpha');
-$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto');
+$action=GETPOST('action','aZ09')?GETPOST('action','aZ09'):(empty($argv[1])?'':$argv[1]);
+$setuplang=GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):(empty($argv[2])?'auto':$argv[2]);
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
@@ -41,24 +41,24 @@ $langs->load("install");
 $langs->load("errors");
 
 // Dolibarr pages directory
-$main_dir = GETPOST('main_dir');
+$main_dir = GETPOST('main_dir')?GETPOST('main_dir'):(empty($argv[3])?'':$argv[3]);
 // Directory for generated documents (invoices, orders, ecm, etc...)
-$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : $main_dir . '/documents';
+$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : (empty($argv[4])? ($main_dir . '/documents') :$argv[4]);
 // Dolibarr root URL
-$main_url = GETPOST('main_url');
+$main_url = GETPOST('main_url')?GETPOST('main_url'):(empty($argv[5])?'':$argv[5]);
 // Database login informations
-$userroot=GETPOST('db_user_root');
-$passroot=GETPOST('db_pass_root');
+$userroot=GETPOST('db_user_root')?GETPOST('db_user_root'):(empty($argv[6])?'':$argv[6]);
+$passroot=GETPOST('db_pass_root')?GETPOST('db_pass_root'):(empty($argv[7])?'':$argv[7]);
 // Database server
-$db_type=GETPOST('db_type','alpha');
-$db_host=GETPOST('db_host','alpha');
-$db_name=GETPOST('db_name','alpha');
-$db_user=GETPOST('db_user','alpha');
-$db_pass=GETPOST('db_pass');
-$db_port=GETPOST('db_port','int');
-$db_prefix=GETPOST('db_prefix','alpha');
-$db_create_database = GETPOST('db_create_database','none');
-$db_create_user = GETPOST('db_create_user','none');
+$db_type=GETPOST('db_type','alpha')?GETPOST('db_type','alpha'):(empty($argv[8])?'':$argv[8]);
+$db_host=GETPOST('db_host','alpha')?GETPOST('db_host','alpha'):(empty($argv[9])?'':$argv[9]);
+$db_name=GETPOST('db_name','alpha')?GETPOST('db_name','alpha'):(empty($argv[10])?'':$argv[10]);
+$db_user=GETPOST('db_user','alpha')?GETPOST('db_user','alpha'):(empty($argv[11])?'':$argv[11]);
+$db_pass=GETPOST('db_pass')?GETPOST('db_pass'):(empty($argv[12])?'':$argv[12]);
+$db_port=GETPOST('db_port','int')?GETPOST('db_port','int'):(empty($argv[13])?'':$argv[13]);
+$db_prefix=GETPOST('db_prefix','alpha')?GETPOST('db_prefix','alpha'):(empty($argv[14])?'':$argv[14]);
+$db_create_database = GETPOST('db_create_database','none')?GETPOST('db_create_database','none'):(empty($argv[15])?'':$argv[15]);
+$db_create_user = GETPOST('db_create_user','none')?GETPOST('db_create_user','none'):(empty($argv[16])?'':$argv[16]);
 // Force https
 $main_force_https = ((GETPOST("main_force_https",'alpha') && (GETPOST("main_force_https",'alpha') == "on" || GETPOST("main_force_https",'alpha') == 1)) ? '1' : '0');
 // Use alternative directory
@@ -356,7 +356,7 @@ if (! $error && $db->connected && $action == "set")
     }
 
     // Show title of step
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
+    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
     print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
 
     // Check parameter main_dir
@@ -800,10 +800,17 @@ function jsinfo()
 
 <?php
 
+$ret=0;
+if ($error && isset($argv[1])) $ret=1;
+dolibarr_install_syslog("Exit ".$ret);
+
 dolibarr_install_syslog("--- step1: end");
 
 pFooter($error?1:0,$setuplang,'jsinfo',1);
 
+// Return code if ran from command line
+if ($ret) exit($ret);
+
 
 /**
  *  Create main file. No particular permissions are set by installer.
@@ -871,7 +878,7 @@ function write_conf_file($conffile)
 
     $error=0;
 
-    $key = md5(uniqid(mt_rand(),TRUE)); // Generate random hash
+    $key = md5(uniqid(mt_rand(), true)); // Generate random hash
 
     $fp = fopen("$conffile", "w");
     if($fp)
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index a891a2f590e..30b3ff7d64f 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -42,8 +42,8 @@ error_reporting(0);		// Disable all errors
 @set_time_limit(900);	// Need 900 on some OS like Windows 7/64
 error_reporting($err);
 
-$action=GETPOST('action','aZ09');
-$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto');
+$action=GETPOST('action','aZ09')?GETPOST('action','aZ09'):(empty($argv[1])?'':$argv[1]);
+$setuplang=GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):(empty($argv[2])?'auto':$argv[2]);
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
@@ -86,7 +86,7 @@ if (! is_writable($conffile))
 
 if ($action == "set")
 {
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
+    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
 
     print '<table cellspacing="0" style="padding: 4px 4px 4px 0px" border="0" width="100%">';
     $error=0;
@@ -622,8 +622,17 @@ else
     print 'Parameter action=set not defined';
 }
 
+
+$ret=0;
+if (!$ok && isset($argv[1])) $ret=1;
+dolibarr_install_syslog("Exit ".$ret);
+
 dolibarr_install_syslog("--- step2: end");
 
 pFooter($ok?0:1,$setuplang);
 
 if (isset($db) && is_object($db)) $db->close();
+
+// Return code if ran from command line
+if ($ret) exit($ret);
+
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index 0fe8c6bbf06..92bcb3dc1a7 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -32,7 +32,7 @@ require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
 global $langs;
 
-$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto');
+$setuplang=GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):(empty($argv[1])?'auto':$argv[1]);
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
@@ -49,7 +49,7 @@ if (@file_exists($forcedfile)) {
 
 dolibarr_install_syslog("--- step4: entering step4.php page");
 
-$err=0;
+$error=0;
 $ok = 0;
 
 
@@ -69,7 +69,7 @@ if (! is_writable($conffile))
 }
 
 
-print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/key.svg" width="20" alt="Database"> '.$langs->trans("DolibarrAdminLogin").'</h3>';
+print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> '.$langs->trans("DolibarrAdminLogin").'</h3>';
 
 print $langs->trans("LastStepDesc").'<br><br>';
 
@@ -92,7 +92,7 @@ if ($db->ok)
     {
         print '<br>';
         print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>';
-        $err=0;	// We show button
+        $error=0;	// We show button
     }
 
     if (isset($_GET["error"]) && $_GET["error"] == 2)
@@ -101,20 +101,28 @@ if ($db->ok)
         print '<div class="error">';
         print $langs->trans("PleaseTypePassword");
         print '</div>';
-        $err=0;	// We show button
+        $error=0;	// We show button
     }
 
     if (isset($_GET["error"]) && $_GET["error"] == 3)
     {
         print '<br>';
         print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>';
-        $err=0;	// We show button
+        $error=0;	// We show button
     }
 
 }
 
+
+$ret=0;
+if ($error && isset($argv[1])) $ret=1;
+dolibarr_install_syslog("Exit ".$ret);
+
 dolibarr_install_syslog("--- step4: end");
 
-pFooter($err,$setuplang);
+pFooter($error,$setuplang);
 
 $db->close();
+
+// Return code if ran from command line
+if ($ret) exit($ret);
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index aa6e1f3e3c1..79fead3c51d 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -33,11 +33,11 @@ require_once $dolibarr_main_document_root . '/core/lib/security.lib.php'; // for
 
 global $langs;
 
-$setuplang=GETPOST("selectlang",'aZ09',3)?GETPOST("selectlang",'aZ09',3):'auto';
-$langs->setDefaultLang($setuplang);
 $versionfrom=GETPOST("versionfrom",'alpha',3)?GETPOST("versionfrom",'alpha',3):(empty($argv[1])?'':$argv[1]);
 $versionto=GETPOST("versionto",'alpha',3)?GETPOST("versionto",'alpha',3):(empty($argv[2])?'':$argv[2]);
-$action=GETPOST('action','alpha');
+$setuplang=GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):(empty($argv[3])?'auto':$argv[3]);
+$langs->setDefaultLang($setuplang);
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):(empty($argv[4])?'':$argv[4]);
 
 // Define targetversion used to update MAIN_VERSION_LAST_INSTALL for first install
 // or MAIN_VERSION_LAST_UPGRADE for upgrade.
@@ -55,9 +55,9 @@ if (! empty($action) && preg_match('/upgrade/i', $action))	// If it's an old upg
 $langs->load("admin");
 $langs->load("install");
 
-$login = GETPOST('login', 'alpha');
-$pass = GETPOST('pass', 'alpha');
-$pass_verif = GETPOST('pass_verif', 'alpha');
+$login = GETPOST('login', 'alpha')?GETPOST('login', 'alpha'):(empty($argv[5])?'':$argv[5]);
+$pass = GETPOST('pass', 'alpha')?GETPOST('pass', 'alpha'):(empty($argv[6])?'':$argv[6]);
+$pass_verif = GETPOST('pass_verif', 'alpha')?GETPOST('pass_verif', 'alpha'):(empty($argv[7])?'':$argv[7]);
 
 $success=0;
 
@@ -77,6 +77,8 @@ if (@file_exists($forcedfile)) {
 
 dolibarr_install_syslog("--- step5: entering step5.php page");
 
+$error=0;
+
 
 /*
  *	Actions
@@ -461,6 +463,14 @@ else
 clearstatcache();
 
 
+$ret=0;
+if ($error && isset($argv[1])) $ret=1;
+dolibarr_install_syslog("Exit ".$ret);
+
 dolibarr_install_syslog("--- step5: Dolibarr setup finished");
 
 pFooter(1,$setuplang);
+
+// Return code if ran from command line
+if ($ret) exit($ret);
+
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index fce91f7925d..c2ee6e93ad4 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -61,7 +61,7 @@ $langs->setDefaultLang($setuplang);
 $versionfrom=GETPOST("versionfrom",'alpha',3)?GETPOST("versionfrom",'alpha',3):(empty($argv[1])?'':$argv[1]);
 $versionto=GETPOST("versionto",'alpha',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]);
 $dirmodule=((GETPOST("dirmodule",'alpha',3) && GETPOST("dirmodule",'alpha',3) != 'ignoredbversion'))?GETPOST("dirmodule",'alpha',3):((empty($argv[3]) || $argv[3] == 'ignoredbversion')?'':$argv[3]);
-$ignoredbversion=(GETPOST('ignoredbversion','',3)=='ignoredbversion')?GETPOST('ignoredbversion','',3):((empty($argv[3]) || $argv[3] != 'ignoredbversion')?'':$argv[3]);
+$ignoredbversion=(GETPOST('ignoredbversion','alpha',3)=='ignoredbversion')?GETPOST('ignoredbversion','alpha',3):((empty($argv[3]) || $argv[3] != 'ignoredbversion')?'':$argv[3]);
 
 $langs->load("admin");
 $langs->load("install");
@@ -106,7 +106,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
 {
     $actiondone=1;
 
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="Database"> '.$langs->trans("DatabaseMigration").'</h3>';
+    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("DatabaseMigration").'</h3>';
 
     print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
     $error=0;
@@ -183,7 +183,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
         print '<td align="right">'.$version.'</td></tr>';
         dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
-        if ($db->type == 'mysqli')
+        if ($db->type == 'mysqli' && function_exists('mysqli_get_charset'))
         {
         	$tmparray = $db->db->get_charset();
         	print '<tr><td>'.$langs->trans("ClientCharset").'</td>';
@@ -254,6 +254,8 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         if (count($versioncommande) && count($versionarray)
         && versioncompare($versioncommande,$versionarray) <= 0)	// Si mysql >= 4.0
         {
+        	dolibarr_install_syslog("Clean database from bad named constraints");
+
             // Suppression vieilles contraintes sans noms et en doubles
             // Les contraintes indesirables ont un nom qui commence par 0_ ou se termine par ibfk_999
             $listtables=array(
@@ -310,6 +312,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
     {
         $dir = "mysql/migration/";		// We use mysql migration scripts whatever is database driver
 		if (! empty($dirmodule)) $dir=dol_buildpath('/'.$dirmodule.'/sql/',0);
+		dolibarr_install_syslog("Scan sql files for migration files in ".$dir);
 
 		// Clean last part to exclude minor version x.y.z -> x.y
         $newversionfrom=preg_replace('/(\.[0-9]+)$/i','.0',$versionfrom);
@@ -420,7 +423,7 @@ if (empty($actiondone))
 
 $ret=0;
 if (! $ok && isset($argv[1])) $ret=1;
-dol_syslog("Exit ".$ret);
+dolibarr_install_syslog("Exit ".$ret);
 
 dolibarr_install_syslog("--- upgrade: end ".((! $ok && empty($_GET["ignoreerrors"])) || $dirmodule));
 $nonext = (! $ok && empty($_GET["ignoreerrors"]))?2:0;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 560bf3d2593..1a40d2eb9c5 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -106,7 +106,7 @@ pHeader('','step5',GETPOST('action','aZ09')?GETPOST('action','aZ09'):'upgrade','
 
 if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09')))
 {
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="Database"> '.$langs->trans('DataMigration').'</h3>';
+    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans('DataMigration').'</h3>';
 
     print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
 
@@ -405,11 +405,12 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         }
     }
 
-	// Code executed only if migrate is LAST ONE. Must always be done.
+	// Code executed only if migration is LAST ONE. Must always be done.
 	if (versioncompare($versiontoarray,$versionranarray) >= 0 || versioncompare($versiontoarray,$versionranarray) <= -3)
 	{
 		// Reload modules (this must be always done and only into last targeted version, because code to reload module may need table structure of last version)
 		$listofmodule=array(
+			'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
 			'MAIN_MODULE_AGENDA'=>'newboxdefonly',
 			'MAIN_MODULE_BARCODE'=>'newboxdefonly',
 			'MAIN_MODULE_CRON'=>'newboxdefonly',
@@ -422,17 +423,14 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
 			'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
 			'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
 			'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
+			'MAIN_MODULE_PRINTING'=>'newboxdefonly',
 			'MAIN_MODULE_PRODUIT'=>'newboxdefonly',
+			'MAIN_MODULE_SALARIES'=>'newboxdefonly',
 			'MAIN_MODULE_SOCIETE'=>'newboxdefonly',
 			'MAIN_MODULE_SERVICE'=>'newboxdefonly',
-			'MAIN_MODULE_USER'=>'newboxdefonly',
-			'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
-			'MAIN_MODULE_BARCODE'=>'newboxdefonly',
-			'MAIN_MODULE_CRON'=>'newboxdefonly',
-			'MAIN_MODULE_PRINTING'=>'newboxdefonly',
-			'MAIN_MODULE_SALARIES'=>'newboxdefonly',
-
-			'MAIN_MODULE_USER'=>'newboxdefonly',        //This one must be always done and only into last targeted version)
+			'MAIN_MODULE_USER'=>'newboxdefonly',		//This one must be always done and only into last targeted version)
+			'MAIN_MODULE_VARIANTS'=>'newboxdefonly',
+			'MAIN_MODULE_WEBSITE'=>'newboxdefonly',
 		);
 		migrate_reload_modules($db,$langs,$conf,$listofmodule);
 
@@ -525,7 +523,7 @@ else
 
 $ret=0;
 if ($error && isset($argv[1])) $ret=1;
-dol_syslog("Exit ".$ret);
+dolibarr_install_syslog("Exit ".$ret);
 
 dolibarr_install_syslog("--- upgrade2: end");
 pFooter($error?2:0,$setuplang);
@@ -4524,7 +4522,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_API')
+		elseif ($moduletoreload == 'MAIN_MODULE_API')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Rest API module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modApi.class.php';
@@ -4534,7 +4532,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_BARCODE')
+		elseif ($moduletoreload == 'MAIN_MODULE_BARCODE')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php';
@@ -4544,7 +4542,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_CRON')
+		elseif ($moduletoreload == 'MAIN_MODULE_CRON')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php';
@@ -4554,7 +4552,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_SOCIETE')
+		elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
@@ -4564,7 +4562,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
+		elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
@@ -4574,7 +4572,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
+		elseif ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
@@ -4584,7 +4582,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
+		elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
@@ -4594,7 +4592,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
+		elseif ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
@@ -4604,7 +4602,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
+		elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
@@ -4614,7 +4612,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
+		elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Leave Request module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modHoliday.class.php';
@@ -4624,7 +4622,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
+		elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
@@ -4634,7 +4632,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
+		elseif ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
@@ -4644,7 +4642,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
+		elseif ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
@@ -4654,7 +4652,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
+		elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
@@ -4664,7 +4662,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
+		elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Supplier Proposal module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSupplierProposal.class.php';
@@ -4674,7 +4672,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
+		elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module");
 			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
@@ -4684,34 +4682,24 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array(),$force=0)
 				$mod->init($reloadmode);
 			}
 		}
-		if ($moduletoreload == 'MAIN_MODULE_SALARIES')    // Permission has changed into 6.0
+		else
 		{
-			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Salaries module");
-			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSalaries.class.php';
-			if ($res) {
-				$mod=new modSalaries($db);
-				//$mod->remove('noboxes');
-				$mod->init($reloadmode);
+			$tmp = preg_match('/MAIN_MODULE_([a-zA-Z0-9]+)/', $moduletoreload, $reg);
+			if (! empty($reg[1]))
+			{
+				$moduletoreloadshort = ucfirst(strtolower($reg[1]));
+				dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ".$moduletoreloadshort);
+				$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$moduletoreloadshort.'.class.php';
+				if ($res) {
+					$classname = 'mod'.$moduletoreloadshort;
+					$mod=new $classname($db);
+					//$mod->remove('noboxes');
+					$mod->init($reloadmode);
+				}
 			}
-		}
-		if ($moduletoreload == 'MAIN_MODULE_USER')    // Permission has changed into 3.0
-		{
-			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate User module");
-			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php';
-			if ($res) {
-				$mod=new modUser($db);
-				//$mod->remove('noboxes');
-				$mod->init($reloadmode);
-			}
-		}
-		if ($moduletoreload == 'MAIN_MODULE_WEBSITE')    // Module added in 7.0
-		{
-			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Website module");
-			$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modWebsite.class.php';
-			if ($res) {
-				$mod=new modWebsite($db);
-				//$mod->remove('noboxes');
-				$mod->init($reloadmode);
+			else
+			{
+				print "Error, can't find module name";
 			}
 		}
 
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 0acd030c5db..b0851c20d2c 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=جدول الحسابات
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=نوع الوثيقة
 Docdate=التاريخ
 Docref=مرجع
-Code_tiers=الطرف الثالث
 LabelAccount=حساب التسمية
 LabelOperation=Label operation
 Sens=السيناتور
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=دفتر المالية اليومي
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=دفعة فاتورة العميل
-ThirdPartyAccount=حساب طرف ثالث
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=خطأ، لا يمكنك حذف هذا الحس
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=طبيعة
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=مبيعات
 AccountingJournalType3=مشتريات
 AccountingJournalType4=بنك
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=معادلة
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 1430de9a55e..0d26639a000 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=خطأ، لا يمكن استخدام الخيار
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خطأ ، لا يمكن للمستخدم الخيار في حال تسلسل @ (ذ ذ م م)) ((سنة أو ملم)) (لا تخفي.
 UMask=معلمة جديدة UMask صورة يونيكس / لينكس / بي إس دي نظام الملفات.
 UMaskExplanation=تسمح لك هذه المعلمة لتحديد الاذونات التي حددها تقصير من الملفات التي أنشأتها Dolibarr على الخادم (خلال تحميلها على سبيل المثال). <br> يجب أن يكون ثمانية القيمة (على سبيل المثال ، 0666 وسائل القراءة والكتابة للجميع). <br> م شمال شرق paramètre سرت sous الامم المتحدة لتقييم الأداء ويندوز serveur.
-SeeWikiForAllTeam=إلقاء نظرة على صفحة ويكي قائمة كاملة لجميع الجهات الفاعلة والمنظمة
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= التخزين المؤقت للتأخير في الرد على الصادرات ثانية (0 فارغة أو لا مخبأ)
 DisableLinkToHelpCenter=الاختباء وصلة <b>"هل تحتاج إلى مساعدة أو دعم"</b> على صفحة تسجيل الدخول
 DisableLinkToHelp=إخفاء تصل إلى التعليمات الفورية <b>"٪ ق"</b>
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=تعديل على الأسعار مع القيمة الم
 MassConvert=إطلاق تحويل الشامل
 String=سلسلة
 TextLong=نص طويل
+HtmlText=Html text
 Int=عدد صحيح
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=رابط إلى كائن
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=بعض البلدان تطبق 2 أو 3 الضرائب على كل خط الفاتورة. إذا كان هذا هو الحال، واختيار نوع لضريبة الثانية والثالثة ومعدل. نوع ممكن هي: <br> 1: يتم تطبيق الضرائب المحلية على المنتجات والخدمات دون الضريبة على القيمة المضافة (يحسب localtax على كمية بدون ضريبة) <br> 2: الضرائب المحلية تنطبق على المنتجات والخدمات بما في ذلك ضريبة القيمة المضافة (يحسب localtax على كمية + ضريبة الرئيسي) <br> 3: تطبيق الضرائب المحلية على المنتجات بدون ضريبة القيمة المضافة (يحسب localtax على كمية بدون ضريبة) <br> 4: الضرائب المحلية تنطبق على المنتجات بما في ذلك ضريبة القيمة المضافة (يحسب localtax على كمية + ضريبة القيمة المضافة الرئيسية) <br> 5: تطبق الضرائب المحلية على الخدمات دون الضريبة على القيمة المضافة (يحسب localtax على كمية بدون ضريبة) <br> 6: الضرائب المحلية تنطبق على الخدمات بما في ذلك ضريبة القيمة المضافة (يحسب localtax على كمية + الضريبة)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=& مجموعات المستخدمين
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=هوامش
 Module59000Desc=وحدة لإدارة الهوامش
 Module60000Name=العمولات
 Module60000Desc=وحدة لإدارة اللجان
+Module62000Name=شروط التجارة الدولية
+Module62000Desc=إضافة ميزات لإدارة شروط التجارة الدولية
 Module63000Name=مصادر
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=قراءة الفواتير
@@ -833,11 +838,11 @@ Permission1251=ادارة الدمار الواردات الخارجية الب
 Permission1321=تصدير العملاء والفواتير والمدفوعات والصفات
 Permission1322=Reopen a paid bill
 Permission1421=التصدير طلبات الزبائن وصفاته
-Permission20001=قراءة طلبات الإجازة (لك والمرؤوسين لديك)
-Permission20002=إنشاء / تعديل طلبات الإجازات الخاصة بك
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=حذف طلبات الإجازة
-Permission20004=قراءة جميع طلبات الإجازة (حتى المستخدم لا المرؤوسين)
-Permission20005=إنشاء / تعديل طلبات الإجازة للجميع
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=طلبات الإجازة المشرف (إعداد وتحديث التوازن)
 Permission23001=قراءة مهمة مجدولة
 Permission23002=إنشاء / تحديث المجدولة وظيفة
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=كمية من طوابع الواردات
 DictionaryPaymentConditions=شروط الدفع
 DictionaryPaymentModes=وسائل الدفع
 DictionaryTypeContact=الاتصال / أنواع العناوين
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=ضرائب بيئية (WEEE)
 DictionaryPaperFormat=تنسيقات ورقة
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=إدارة الضريبة على القيمة المضافة
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=افتراضي المقترحة 0 ضريبة القيمة المضافة هو الذي يمكن أن يستخدم في حالات مثل الجمعيات والأفراد والشركات الصغيرة où.
-VATIsUsedExampleFR=في فرنسا ، فإن ذلك يعني وجود منظمات أو شركات حقيقية في النظام المالي (المبسطة حقيقية أو طبيعية حقيقية). نظام ضريبة القيمة المضافة هي التي أعلنت.
-VATIsNotUsedExampleFR=في فرنسا ، فإن ذلك يعني أن الجمعيات غير المعلنة ضريبة القيمة المضافة أو شركات أو مؤسسات المهن الحرة التي اختارت المشاريع الصغيرة النظام الضريبي (ضريبة القيمة المضافة في الانتخاب) ، ودفع ضريبة القيمة المضافة في الانتخاب دون أي إعلان من ضريبة القيمة المضافة. هذا الخيار سيتم عرض المرجعي "غير الضريبة على القيمة المضافة المطبقة -- الفن - 293B من المجموعة الاستشارية لاندونيسيا" على الفواتير.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=معدل
 LocalTax1IsNotUsed=لا تستخدم الضريبة الثانية
@@ -977,7 +983,7 @@ Host=الخادم
 DriverType=سائق نوع
 SummarySystem=نظام معلومات موجزة
 SummaryConst=قائمة بجميع Dolibarr الإعداد البارامترات
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= معيار مدير القائمة
 DefaultMenuSmartphoneManager=الهاتف الذكي القائمة مدير
 Skin=موضوع الجلد
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليم
 DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة)
 EnableMultilangInterface=تتيح واجهة متعددة اللغات
 EnableShowLogo=عرض الشعار على اليسار القائمة
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=اسم
 CompanyAddress=عنوان
 CompanyZip=الرمز البريدي
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
 SystemAreaForAdminOnly=هذا المجال المتاح لمدير المستخدمين فقط. أيا من Dolibarr أذونات يمكن أن تقلل من هذا الحد.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=يمكنك ان تختار كل معلمة إلى Dolibarr هنا الشكل والمظهر
 AvailableModules=Available app/modules
 ToActivateModule=لتفعيل وحدات ، على الإعداد منطقة الصفحة الرئيسية&gt; الإعداد -> الوحدات).
@@ -1441,6 +1448,9 @@ SyslogFilename=اسم الملف ومسار
 YouCanUseDOL_DATA_ROOT=يمكنك استخدام DOL_DATA_ROOT / dolibarr.log لملف الدخول في Dolibarr "وثائق" دليل. يمكنك أن تحدد مسارا مختلفا لتخزين هذا الملف.
 ErrorUnknownSyslogConstant=ثابت %s ليس ثابت سيسلوغ معروفة
 OnlyWindowsLOG_USER=نوافذ يعتمد فقط LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=وحدة الإعداد للتبرع
 DonationsReceiptModel=قالب من استلام التبرع
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=فشل في تهيئة القائمة
 ##### Tax #####
 TaxSetup=الضرائب، الضرائب الاجتماعية أو المالية وتوزيعات الأرباح الإعداد حدة
 OptionVatMode=ضريبة القيمة المضافة المستحقة
-OptionVATDefault=الأساس النقدي
+OptionVATDefault=Standard basis
 OptionVATDebitOption=أساس الاستحقاق
 OptionVatDefaultDesc=ومن المقرر ان ضريبة القيمة المضافة : <br> -- التسليم / الدفع للسلع <br> -- على دفع تكاليف الخدمات
 OptionVatDebitOptionDesc=ومن المقرر ان ضريبة القيمة المضافة : <br> -- التسليم / الدفع للسلع <br> -- على الفاتورة (الخصم) للخدمات
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=وقت exigibility VAT افتراضيا وفقا لخيار المختار:
 OnDelivery=التسليم
 OnPayment=عن الدفع
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=فاتورة تاريخ المستخدمة
 Buy=يشتري
 Sell=يبيع
 InvoiceDateUsed=فاتورة تاريخ المستخدمة
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=حساب بيع. رمز
 AccountancyCodeBuy=شراء الحساب. رمز
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=تظهر بشكل افتراضي على عرض القائمة
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=مثال على رسالة يمكنك استخدامها ليعلن هذا الإصدار الرئيسي (لا تتردد في استخدامها على مواقع الويب الخاص بك)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 439c76d41c7..f0f918ce9d1 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -7,7 +7,7 @@ Agendas=جداول الأعمال
 LocalAgenda=التقويم الداخلي
 ActionsOwnedBy=الحدث مملوك بواسطة
 ActionsOwnedByShort=مالك
-AffectedTo=مناط لـ
+AffectedTo=مخصص ل
 Event=حدث
 Events=الأحداث
 EventsNb=عدد الأحداث
@@ -31,29 +31,31 @@ ViewWeek=عرض اسبوعي
 ViewPerUser=لكل وجهة نظر المستخدم
 ViewPerType=العرض حسب النوع
 AutoActions= إكمال تلقائي
-AgendaAutoActionDesc= تحديد الأحداث هنا التي تريد دوليبار لخلق تلقائيا حدثا في جدول الأعمال. إذا لم يتم تحديد أي شيء، فقط الإجراءات اليدوية المكتوبةوالمرئية سيتم تضمينها في جدول الأعمال فقط. لن يتم حفظ إجراءات التتبع التلقائي للأعمال التجارية التي تتم على الكائنات (التحقق من الصحة، تغيير الوضع).
-AgendaSetupOtherDesc= تسمح لك هذه الصفحة بتصدير الأحداث إلى تقويم خارجي مثل (جوجل, تندربيرد وغيرها, ...)
-AgendaExtSitesDesc=تسمح لك هذه الصفحة بالإعلان عن مصادر خارجية للتقويم وذلك لرؤية الأحداث الخاصة بهم في جدول أعمال دوليبار.
+AgendaAutoActionDesc= تحديد الأحداث هنا التي تريد دوليبار ان ينشأها تلقائيا في جدول الأعمال. إذا لم يتم فحص أي شيء، سيتم تضمين الإجراءات اليدوية فقط في تسجيل و اظهارها في جدول الأعمال. لن يتم حفظ تتبع تلقائي للأعمال التجارية التي تتم على الكائنات (التحقق من الصحة، تغيير الوضع).
+AgendaSetupOtherDesc= توفر هذه الصفحة خيارات للسماح بتصدير أحداث دوليبار إلى تقويم خارجي (ثوندربيرد، تقويم غوغل، ...)
+AgendaExtSitesDesc=تسمح هذه الصفحة بإعلان المصادر الخارجية للتقاويم لمشاهدة أحداثها في جدول أعمال دوليبار.
 ActionsEvents=الأحداث التي سيقوم دوليبار بإنشاء أعمال في جدول الأعمال بشكل تلقائي
 EventRemindersByEmailNotEnabled=لم يتم تمكين تذكيرات الأحداث عبر البريد الإلكتروني في إعدادات نموذج جدول الأعمال.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=تم إنشاء الطرف الثالث %s
-ContractValidatedInDolibarr=عقد%s التأكد من صلاحيتها
+ContractValidatedInDolibarr=العقد%s  تم التأكد من صلاحيته
 PropalClosedSignedInDolibarr=الإقتراح%sتم توقعية
 PropalClosedRefusedInDolibarr=الإقتراح%s تم رفضة
-PropalValidatedInDolibarr=تم تفعيل %s من الإقتراح
+PropalValidatedInDolibarr=اقتراح %s التحقق من صحة
 PropalClassifiedBilledInDolibarr=الإقتراح%s تصنف تم دفعة
-InvoiceValidatedInDolibarr=الفاتورة %s تم التحقق من صحتها
+InvoiceValidatedInDolibarr=تم التحقق من صحة الفاتورة %s
 InvoiceValidatedInDolibarrFromPos=الفاتورة%s تم التأكد من صلاحيتها من نقاط البيع
 InvoiceBackToDraftInDolibarr=الفاتورة %s تم إعادتها إلى حالة المسودة
-InvoiceDeleteDolibarr=الفاتورة %s تم حذفها
+InvoiceDeleteDolibarr=تم حذف الفاتورة %s
 InvoicePaidInDolibarr=الفاتورة%s تغييرت الى تم الدفع
 InvoiceCanceledInDolibarr=فاتورة%s تم إلغاؤها
 MemberValidatedInDolibarr=العضو%s التأكد من صلاحيته
 MemberModifiedInDolibarr=العضو %sتم تعديلة
 MemberResiliatedInDolibarr=العضو %sتم إنهاؤه
 MemberDeletedInDolibarr=العضو %s تم حذفة
-MemberSubscriptionAddedInDolibarr= اشتراك العضو %s تمت إضافتة
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=شحنة%s التأكد من صلاحيتها
 ShipmentClassifyClosedInDolibarr=الشحنة %sتم تصنيفها مدفوعة
 ShipmentUnClassifyCloseddInDolibarr=الشحنة %s تم تصنيفها معاد فتحها
@@ -66,7 +68,7 @@ OrderBilledInDolibarr=الطلب%s  مصنف تم الدفع
 OrderApprovedInDolibarr=الطلب %s تم الموافقة علية
 OrderRefusedInDolibarr=الطلب %s تم رفضه
 OrderBackToDraftInDolibarr=الطلب  %s تم إرجاعة إلى حالة المسودة
-ProposalSentByEMail= العرض الرسمي %s  تم إرساله بواسطة البريد الإلكتروني
+ProposalSentByEMail= العرض التجاري %s  تم إرساله بواسطة البريد الإلكتروني
 ContractSentByEMail=العقد %s تم إرسالة بواسطة البريد الإلكتروني
 OrderSentByEMail=تم إرسال طلبية العميل %s بواسطة البريد الإلكتروني
 InvoiceSentByEMail=تم إرسال فاتورة العميل %s بواسطة البريد الإلكتروني
@@ -90,14 +92,15 @@ PROJECT_CREATEInDolibarr=مشروع٪ الصورة التي تم إنشاؤها
 PROJECT_MODIFYInDolibarr=المشروع %s تم تعديلة
 PROJECT_DELETEInDolibarr=المشروع %s تم حذفة
 ##### End agenda events #####
-AgendaModelModule=قوالب وثيقة الحدث
+AgendaModelModule=نماذج المستندات للحدث
 DateActionStart=تاريخ البدء
 DateActionEnd=تاريخ النهاية
 AgendaUrlOptions1=يمكنك أيضا إضافة المعايير التالية لتصفية النتائج :
 AgendaUrlOptions3=<b>وجينا =%sإلى</b> تقييد الإخراج إلى الإجراءات التي يملكها المستخدم<b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>لوجينا=!%s</b> لمنع اخراج الجراءات التى لا يمتلكها المستخدم <b>%s</b>.
 AgendaUrlOptions4=<b>لوجينت =%s</b> لتقييد الإخراج على الإجراءات المعينة للمستخدم <b>%s</b> (المالك والآخرين).
-AgendaUrlOptionsProject=<b>مشروع = PROJECT_ID</b> لتقييد الإخراج إلى الإجراءات المرتبطة المشروع <b>PROJECT_ID</b> .
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=عرض تواريخ ميلاد جهات الإتصال
 AgendaHideBirthdayEvents=إخفاء تواريخ ميلاد جهات الإتصال
 Busy=مشغول
@@ -109,11 +112,11 @@ ExportCal=تصدير التقويم
 ExtSites=استيراد التقويمات الخارجية
 ExtSitesEnableThisTool=عرض التقويمات الخارجية (المعرفة في الإعدادات العالمية) في جدول الأعمال. لا يؤثر على التقويمات الخارجية المحددة من قبل المستخدمين.
 ExtSitesNbOfAgenda=عدد التقويمات
-AgendaExtNb=رقم التقويم %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=عنوان المتصفح للدخول لملف .ical
 ExtSiteNoLabel=لا يوجد وصف
-VisibleTimeRange=النطاق الزمني مرئية
-VisibleDaysRange=أيام مرئية مجموعة
+VisibleTimeRange=نطاق زمني مرئي
+VisibleDaysRange=نطاق الأيام المرئية
 AddEvent=إنشاء الحدث
 MyAvailability=تواجدي
 ActionType=نوع الحدث
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index c91e56f9a7f..9b01a9586eb 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -2,74 +2,75 @@
 Bill=فاتورة
 Bills=فواتير
 BillsCustomers=فواتير العملاء
-BillsCustomer=الزبون فاتورة
+BillsCustomer=فاتورة العميل
 BillsSuppliers=فواتير الموردين
-BillsCustomersUnpaid=فواتير العملاء غير المسددة
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=فواتير الموردين غير المدفوعة
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
-BillsLate=في وقت متأخر المدفوعات
-BillsStatistics=عملاء الفواتير إحصاءات
-BillsStatisticsSuppliers=فواتير الموردين إحصاءات
+BillsCustomersUnpaid=فواتير العملاء غير المدفوعة
+BillsCustomersUnpaidForCompany=فواتير العملاء غير المدفوعة ل %s
+BillsSuppliersUnpaid=فواتير المورد غير المدفوعة
+BillsSuppliersUnpaidForCompany=فواتير المورد غير المدفوعة ل %s
+BillsLate=المدفوعات المتأخرة
+BillsStatistics=إحصاءات فواتير العملاء
+BillsStatisticsSuppliers=إحصاءات فواتير الموردين 
 DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
 DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Disabled because cannot be erased
-InvoiceStandard=فاتورة موحدة
-InvoiceStandardAsk=فاتورة موحدة
+DisabledBecauseNotErasable=معطل لأنه لا يمكن محوه
+InvoiceStandard=الفاتورة القياسية
+InvoiceStandardAsk=الفاتورة القياسية
 InvoiceStandardDesc=هذا النوع من الفاتورة هي فاتورة عام.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
-InvoiceProForma=Proforma الفاتورة
+InvoiceDeposit=فاتورة الدفعة الأولى
+InvoiceDepositAsk=فاتورة الدفعة الأولى
+InvoiceDepositDesc=يتم هذا النوع من الفاتورة عند استلام دفعة أولى.
+InvoiceProForma=الفاتورة الأولية
 InvoiceProFormaAsk=الفاتورة الأولية
-InvoiceProFormaDesc=<b>Proforma الفاتورة</b> هو صورة حقيقية فاتورة المحاسبة ولكن ليس له قيمة.
+InvoiceProFormaDesc=<b> الفاتورة المبدئية </b> عبارة عن صورة فاتورة حقيقية ولكنها لا تحتوي على قيمة للمحاسبة.
 InvoiceReplacement=استبدال الفاتورة
-InvoiceReplacementAsk=استبدال فاتورة الفاتورة
-InvoiceReplacementDesc=يستخدم <b>فاتورة استبدال</b> لإلغاء واستبدال تماما فاتورة مع دفع أي مبلغ حصل بالفعل. <br><br> ملاحظة: فقط الفواتير مع دفع أي مبلغ على ذلك يمكن استبدالها. إذا كانت الفاتورة التي استبدال ليست مغلقة حتى الآن، فإنه سيتم إغلاق تلقائيا إلى "التخلي عن '.
-InvoiceAvoir=علما الائتمان
-InvoiceAvoirAsk=علما الائتمان لتصحيح الفاتورة
-InvoiceAvoirDesc=<b>الفضل</b> في <b>المذكرة</b> سلبية الفاتورة تستخدم لحل كون فاتورة بمبلغ قد يختلف عن المبلغ المدفوع فعلا (لأنه دفع الكثير من العملاء عن طريق الخطأ ، أو لن تدفع بالكامل منذ عودته لبعض المنتجات على سبيل المثال).
+InvoiceReplacementAsk=فاتورة استبدال الفاتورة
+InvoiceReplacementDesc=<b> الفاتورة البديلة</b> يتم استخدامها لإلغاء واستبدال بالكامل الفاتورة التي لا تتضمن أية دفعات عليها. <br> <br> ملاحظة: لا يمكن استبدال سوى الفواتير التي لا تتضمن أية دفعات عليها. إذا لم يتم إغلاق الفاتورة التي استبدلتها بعد، فسيتم إغلاقها تلقائيا إلى "مهمل".
+InvoiceAvoir=ملاحظة ائتمانية
+InvoiceAvoirAsk=ملاحظة ائتمانية لتصحيح الفاتورة
+InvoiceAvoirDesc=<b> الملاحظة الائتمانية</b> عبارة عن فاتورة سلبية تستخدم لحل حقيقة أن الفاتورة تحتوي على مبلغ يختلف عن المبلغ المدفوع فعلا (لأن العميل دفع مبالغ كبيرة عن طريق الخطأ، أو لن يدفعوا بشكل كامل حيث أنه اعاد بعض المنتجات على سبيل المثال).
 invoiceAvoirWithLines=إنشاء الائتمان ملاحظة مع خطوط من الفاتورة الأصلية
 invoiceAvoirWithPaymentRestAmount=إنشاء الائتمان ملاحظة مع المتبقية غير المسددة من الفاتورة الأصلية
 invoiceAvoirLineWithPaymentRestAmount=ملاحظة الائتمان للبقاء المبلغ غير المدفوع
-ReplaceInvoice=يستعاض عن فاتورة %s
+ReplaceInvoice=استبدل الفاتورة %s
 ReplacementInvoice=استبدال الفاتورة
-ReplacedByInvoice=تم استبدالها بالفاتورة  %s
-ReplacementByInvoice=استعيض عن الفاتورة
-CorrectInvoice=تصحيح الفاتورة %s
+ReplacedByInvoice=تم استبدالها بالفاتورة %s
+ReplacementByInvoice=تم استبدالها بالفاتورة
+CorrectInvoice=فاتورة صحيحة %s
 CorrectionInvoice=تصحيح الفاتورة
-UsedByInvoice=وتستخدم لدفع فاتورة %s
+UsedByInvoice=تستخدم لدفع فاتورة %s
 ConsumedBy=يستهلكها
-NotConsumed=لا يستهلك
-NoReplacableInvoice=لا الفواتير replacable
-NoInvoiceToCorrect=أي فاتورة لتصحيح
-InvoiceHasAvoir=Was source of one or several credit notes
-CardBill=فاتورة بطاقة
-PredefinedInvoices=الفواتير مسبقا
+NotConsumed=لا تستهلك
+NoReplacableInvoice=لا يوجد فواتير غير قابلة للاستبدال
+NoInvoiceToCorrect=لا توجد فاتورة للتصحيح
+InvoiceHasAvoir=كان مصدر لواحد أو عدة ملاحظات ائتمانيه
+CardBill=بطاقة الفاتورة
+PredefinedInvoices=فواتير محددة مسبقا
 Invoice=فاتورة
 PdfInvoiceTitle=فاتورة
 Invoices=فواتير
-InvoiceLine=فاتورة الخط
-InvoiceCustomer=الزبون فاتورة
-CustomerInvoice=الزبون فاتورة
-CustomersInvoices=العملاء والفواتير
+InvoiceLine=سطر الفاتورة
+InvoiceCustomer=فاتورة العميل
+CustomerInvoice=فاتورة العميل
+CustomersInvoices=فواتير العملاء
 SupplierInvoice=فاتورة المورد
-SuppliersInvoices=الموردين
+SuppliersInvoices=فواتير الموردين 
 SupplierBill=فاتورة المورد
-SupplierBills=فاتورة الاتصالات
-Payment=الدفع
-PaymentBack=دفع العودة
+SupplierBills=فواتير الموردين 
+Payment=دفعة
+PaymentBack=الدفع مرة أخرى
 CustomerInvoicePaymentBack=دفع العودة
 Payments=المدفوعات
 PaymentsBack=عودة المدفوعات
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=تسديدها
-DeletePayment=حذف الدفع
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-SupplierPayments=الموردين والمدفوعات
-ReceivedPayments=تلقت مدفوعات
-ReceivedCustomersPayments=المدفوعات المقبوضة من الزبائن
+DeletePayment=حذف الدفعة
+ConfirmDeletePayment=هل انت متأكد انك ترغب في حذف هذه الدفعة؟
+ConfirmConvertToReduc=هل تريد تحويل هذا %s إلى خصم مطلق؟<br> سيتم حفظ المبلغ حتى بين جميع الخصومات، ويمكن استخدامها كخصم لفاتورة الحالية أو المستقبلية لهذا العميل.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+SupplierPayments=مدفوعات الموردين
+ReceivedPayments=المدفوعات المستلمة
+ReceivedCustomersPayments=المدفوعات المستلمة من العملاء
 PayedSuppliersPayments=المدفوعات التي دفعت للموردين
 ReceivedCustomersPaymentsToValid=تلقى مدفوعات عملاء للمصادقة
 PaymentsReportsForYear=تقارير المدفوعات لل%s
@@ -91,7 +92,7 @@ PaymentAmount=دفع مبلغ
 ValidatePayment=تحقق من الدفع
 PaymentHigherThanReminderToPay=دفع أعلى من دفع تذكرة
 HelpPaymentHigherThanReminderToPay=الاهتمام ، على دفع مبلغ واحد أو أكثر من فواتير أعلى من الراحة على الدفع. <br> تعديل الدخول ، تؤكد خلاف ذلك والتفكير في إنشاء الائتمان علما الزائدة وتلقى كل الفواتير الزائدة.
-HelpPaymentHigherThanReminderToPaySupplier=انتباه، ومقدار دفع الفواتير واحد أو أكثر أعلى من بقية لدفع. <br> تعديل دخولك، تؤكد خلاف ذلك.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=تصنيف 'مدفوع'
 ClassifyPaidPartially=تصنيف 'مدفوع جزئيا'
 ClassifyCanceled=تصنيف 'المهجورة'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=تحويل الخصم في المستقبل
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء
 EnterPaymentDueToCustomer=من المقرر أن يسدد العميل
 DisabledBecauseRemainderToPayIsZero=تعطيل بسبب المتبقية غير المدفوعة صفر
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=مشروع (لا بد من التحقق من صحة)
 BillStatusPaid=دفع
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=وتحول إلى خصم
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=المهجورة
 BillStatusValidated=مصادق عليه (لا بد من دفعها)
 BillStatusStarted=بدأت
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=بانتظار
 AmountExpected=المبلغ المطالب به
 ExcessReceived=تلقى الزائدة
+ExcessPaid=Excess paid
 EscompteOffered=عرض الخصم (الدفع قبل الأجل)
 EscompteOfferedShort=تخفيض السعر
 SendBillRef=تقديم فاتورة%s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=خصم من دائن  %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=هذا النوع من الائتمان يمكن استخدامها على الفاتورة قبل المصادقة
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=تحديد خصم جديد
 NewRelativeDiscount=خصم جديد النسبية
+DiscountType=Discount type
 NoteReason=ملاحظة / السبب
 ReasonDiscount=السبب
 DiscountOfferedBy=التي تمنحها
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=مشروع قانون معالجة
 HelpEscompte=هذا الخصم هو الخصم الممنوح للعميل لأن الدفع قبل البعيد.
 HelpAbandonBadCustomer=هذا المبلغ قد تم التخلي عنها (وذكر أن العملاء سيئة العملاء) ، ويعتبر أحد exceptionnal فضفاضة.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 462051f8232..7d6b9857e4f 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -43,7 +43,8 @@ Individual=فرد
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=الشركة الأم
 Subsidiaries=الشركات التابعة
-ReportByCustomers=تقرير للعملاء
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=تقرير الربع
 CivilityCode=قانون الكياسة
 RegisteredOffice=المكتب المسجل
@@ -75,10 +76,12 @@ Town=مدينة
 Web=الويب
 Poste= موقف
 DefaultLang=اللغة افتراضيا
-VATIsUsed=وتستخدم ضريبة القيمة المضافة
-VATIsNotUsed=ضريبة القيمة المضافة لا يستخدم
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=اقتراحات
 OverAllOrders=أوامر
@@ -239,7 +242,7 @@ ProfId3TN=الأستاذ عيد 3 (قانون جمارك)
 ProfId4TN=الأستاذ عيد 4 (حظر)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=رقم الضريبة على القيمة المضافة
-VATIntraShort=رقم الضريبة على القيمة المضافة
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=تركيب صالحة
+VATReturn=VAT return
 ProspectCustomer=احتمال / العملاء
 Prospect=احتمال
 CustomerCard=بطاقة الزبون
 Customer=العميل
 CustomerRelativeDiscount=العميل الخصم النسبي
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=الخصم النسبي
 CustomerAbsoluteDiscountShort=مطلق الخصم
 CompanyHasRelativeDiscount=هذا العميل قد خصم <b>٪ ق ٪ ٪</b>
 CompanyHasNoRelativeDiscount=هذا العميل ليس لديها النسبية خصم افتراضي
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=ولا يزال هذا العميل الائتمانية ويلاحظ السابقة أو ودائع <b>ل%s ق ٪</b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=هذا العميل ليس الخصم الائتمان المتاح
-CustomerAbsoluteDiscountAllUsers=خصومات المطلقة (الممنوحة من جميع المستخدمين)
-CustomerAbsoluteDiscountMy=خصومات المطلقة) التي منحتها لنفسك)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=بلا
 Supplier=المورد
 AddContact=إنشاء اتصال
@@ -377,9 +390,9 @@ NoDolibarrAccess=لا Dolibarr الوصول
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=الاتصالات والعقارات
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=اتصالات / عناوين (من thirdparties أو لا) وسمات
-ImportDataset_company_3=التفاصيل المصرفية
-ImportDataset_company_4=الأطراف الثالث / مندوبي المبيعات (على مستخدمي مندوبي المبيعات للشركات)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=مستوى الأسعار
 DeliveryAddress=عنوان التسليم
 AddAddress=أضف معالجة
@@ -406,15 +419,16 @@ ProductsIntoElements=قائمة المنتجات / الخدمات إلى %s
 CurrentOutstandingBill=فاتورة المستحق حاليا
 OutstandingBill=ماكس. لمشروع قانون المتميز
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=عودة número مع الشكل nnnn - ٪ syymm الزبون ورمز وnnnn - ٪ syymm مورد للقانون حيث السنة هو السنة ، هو شهر ملم وnnnn هو تسلسل بلا كسر وعدم العودة إلى 0.
 LeopardNumRefModelDesc=العميل / المورد مدونة مجانية. هذا القانون يمكن تعديلها في أي وقت.
 ManagingDirectors=مدير (ق) اسم (CEO، مدير، رئيس ...)
 MergeOriginThirdparty=تكرار طرف ثالث (طرف ثالث كنت ترغب في حذف)
 MergeThirdparties=دمج أطراف ثالثة
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=تم دمج Thirdparties
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=كان هناك خطأ عند حذف thirdparties. يرجى التحقق من السجل. وقد عادت التغييرات.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index c596151663b..2ae8fa1b8b5 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -31,7 +31,7 @@ Credit=الائتمان
 Piece=تمثل الوثيقة.
 AmountHTVATRealReceived=جمعت HT
 AmountHTVATRealPaid=HT المدفوعة
-VATToPay=ضريبة القيمة المضافة وتبيع
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=الدفعات IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=رد
 SocialContributionsPayments=الاجتماعية المدفوعات / الضرائب المالية
 ShowVatPayment=وتظهر دفع ضريبة القيمة المضافة
@@ -157,30 +158,34 @@ RulesResultDue=- وتتضمن الفواتير غير المسددة، والن
 RulesResultInOut=- ويشمل المدفوعات الحقيقية المحرز في الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. <br> - لأنه يقوم على مواعيد دفع الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. تاريخ التبرع للتبرع.
 RulesCADue=- ويشمل الفواتير المستحقة على العميل سواء كانت بأجر أو لا. <br> - وهو يستند إلى تاريخ التحقق من هذه الفواتير. <br>
 RulesCAIn=-- ويشمل جميع الفعال دفع الفواتير الواردة من العملاء. <br> -- يقوم على دفع هذه الفواتير تاريخ <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=تقرير من قبل طرف ثالث IRPF
-LT1ReportByCustomersInInputOutputModeES=تقرير RE طرف ثالث
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=تقرير RE طرف ثالث
+LT2ReportByCustomersES=تقرير من قبل طرف ثالث IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=تقرير من ضريبة القيمة المضافة العملاء جمع ودفع
-VATReportByCustomersInDueDebtMode=تقرير من ضريبة القيمة المضافة العملاء جمع ودفع
-VATReportByQuartersInInputOutputMode=تقرير معدل ضريبة القيمة المضافة جمع ودفع
-LT1ReportByQuartersInInputOutputMode=تقرير معدل RE
-LT2ReportByQuartersInInputOutputMode=تقرير معدل IRPF
-VATReportByQuartersInDueDebtMode=تقرير معدل ضريبة القيمة المضافة جمع ودفع
-LT1ReportByQuartersInDueDebtMode=تقرير معدل RE
-LT2ReportByQuartersInDueDebtMode=تقرير معدل IRPF
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=تقرير معدل RE
+LT2ReportByQuartersES=تقرير معدل IRPF
 SeeVATReportInInputOutputMode=انظر التقرير <b>تغطية sVAT ٪ ق ٪</b> لحساب موحد
 SeeVATReportInDueDebtMode=انظر التقرير <b>عن تدفق sVAT ٪ ق ٪</b> لحساب مع خيار على تدفق
 RulesVATInServices=- للحصول على خدمات، يتضمن التقرير لوائح ضريبة القيمة المضافة تلقى فعلا أو الصادرة على أساس من تاريخ الدفع.
-RulesVATInProducts=- للحصول على الأصول المادية، فإنه يشمل ضريبة القيمة المضافة على الفواتير على أساس من تاريخ الفاتورة.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- للحصول على الخدمات، ويتضمن التقرير فواتير ضريبة القيمة المضافة المستحقة، مدفوعة الأجر أم لا، بناء على تاريخ الفاتورة.
-RulesVATDueProducts=- للحصول على الأصول المادية، فإنه يشمل ضريبة القيمة المضافة على الفواتير، بناء على تاريخ الفاتورة.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=ملاحظة : للحصول على الأصول المادية ، فإنه ينبغي استخدام تاريخ التسليم ليكون أكثر إنصافا.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=٪ ٪ / الفاتورة
 NotUsedForGoods=لا تستخدم على السلع
 ProposalStats=إحصاءات بشأن المقترحات
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=وفقا لالمورد، واختيار الطري
 TurnoverPerProductInCommitmentAccountingNotRelevant=تقرير دوران لكل منتج، وعند استخدام طريقة <b>المحاسبة النقدية</b> غير ذي صلة. متاح فقط هذا التقرير عند استخدام طريقة <b>المشاركة المحاسبة</b> (انظر إعداد وحدة المحاسبة).
 CalculationMode=وضع الحساب
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index b7438fd9aed..36980f15406 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=أي وظيفة سجلت
 CronPriority=الأولوية
 CronLabel=ملصق
 CronNbRun=ملحوظة. إطلاق
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=كل
 JobFinished=العمل بدأ وانتهى
 #Page card
@@ -74,9 +74,10 @@ CronFrom=من عند
 CronType=نوع العمل
 CronType_method=Call method of a PHP Class
 CronType_command=الأمر Shell
-CronCannotLoadClass=لا يمكن تحميل الطبقة %s أو الكائن %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=تعطيل وظيفة
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 668395b2676..a9e217aa0a1 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr - LDAP المطابقة وليس كاملا.
 ErrorLDAPMakeManualTest=ألف. ldif الملف قد ولدت في الدليل ٪ s. انها محاولة لتحميل يدويا من سطر في الحصول على مزيد من المعلومات عن الأخطاء.
 ErrorCantSaveADoneUserWithZeroPercentage=لا يمكن انقاذ عمل مع "المركز الخاص لم تبدأ" اذا الحقل "الذي قام به" كما شغلها.
 ErrorRefAlreadyExists=المرجع المستخدمة لإنشاء موجود بالفعل.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=لا يمكن حذف السجلات. وبالفعل استخدامه أو نشره على كائن آخر.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=فشل لاضافة التسجيلة٪ s إلى ق
 ErrorFailedToRemoveToMailmanList=فشل لإزالة سجل٪ s إلى قائمة ميلمان٪ الصورة أو قاعدة SPIP
 ErrorNewValueCantMatchOldValue=قيمة جديدة لا يمكن أن يكون مساويا لالقديم
 ErrorFailedToValidatePasswordReset=فشل في reinit كلمة المرور. قد يكون وقد تم بالفعل reinit (هذا الرابط يمكن استخدامها مرة واحدة فقط). إن لم يكن، في محاولة لاستئناف عملية reinit.
-ErrorToConnectToMysqlCheckInstance=الاتصال فشلت قاعدة البيانات. تحقق من خادم MySQL تشغيل (في معظم الحالات، يمكنك تشغيله من سطر الأوامر مع "سودو /etc/init.d/mysql بدء ').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=فشل في إضافة جهة اتصال
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=وتم تشكيل لطريقة الدفع لكتابة٪ الصورة ولكن لم يكتمل الإعداد من وحدة الفاتورة لتحديد المعلومات لاظهار هذه طريقة الدفع.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/ar_SA/loan.lang b/htdocs/langs/ar_SA/loan.lang
index 1a3b7c89876..8953f884b1b 100644
--- a/htdocs/langs/ar_SA/loan.lang
+++ b/htdocs/langs/ar_SA/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=التكوين للقرض وحدة
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 043ceca60ed..b6debd81eb6 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=نتيجة لإرسال البريد الإلكتروني ا
 NbSelected=ملحوظة مختارة
 NbIgnored=ملحوظة تجاهلها
 NbSent=أرسلت ملحوظة
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=العدد الحالي من رسائل البريد الإ
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 06e6f59eae7..f3457f3dd39 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=المعلمة %s غير معرف
 ErrorUnknown=خطأ غير معروف
 ErrorSQL=خطأ SQL
 ErrorLogoFileNotFound=لم يتم العثور على ملف شعار '٪ ق'
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=الذهاب إلى الوحدة الإعداد لإصلاح هذه
 ErrorFailedToSendMail=فشل في إرسال البريد (المرسل =٪ ق، استقبال =٪ ق)
 ErrorFileNotUploaded=ويتم تحميل الملف. تحقق لا يتجاوز هذا الحجم الأقصى المسموح به، أن المساحة الحرة المتوفرة على القرص والتي لا يوجد بالفعل ملف بنفس الاسم في هذا الدليل.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=خطأ، لا معدلات ضريبة ال
 ErrorNoSocialContributionForSellerCountry=خطأ، لا الاجتماعي / المالي نوع الضرائب المحددة للبلد '٪ ق'.
 ErrorFailedToSaveFile=خطأ، فشل في حفظ الملف.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=غير مصرح لك ان تفعل ذلك.
 SetDate=التاريخ المحدد
 SelectDate=تحديد تاريخ
 SeeAlso=انظر أيضا الصورة٪
 SeeHere=انظر هنا
+ClickHere=اضغط هنا
+Here=Here
 Apply=تطبيق
 BackgroundColorByDefault=لون الخلفية الافتراضية
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=حلقة الوصل
 Select=اختار
 Choose=أختر
 Resize=تغيير
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=مؤلف
 User=المستعمل
@@ -325,8 +328,10 @@ Default=افتراضي
 DefaultValue=القيمة الافتراضية
 DefaultValues=Default values
 Price=السعر
+PriceCurrency=Price (currency)
 UnitPrice=سعر الوحدة
 UnitPriceHT=سعر الوحدة (صافي)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=سعر الوحدة
 PriceU=إلى أعلى
 PriceUHT=UP (صافي)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=UP (شركة الضريبة)
 Amount=كمية
 AmountInvoice=قيمة الفاتورة
+AmountInvoiced=Amount invoiced
 AmountPayment=مبلغ الدفع
 AmountHTShort=مبلغ (صافي)
 AmountTTCShort=المبلغ (المؤتمر الوطني العراقي. الضريبية)
@@ -353,6 +359,7 @@ AmountLT2ES=كمية IRPF
 AmountTotal=الكمية الكلية
 AmountAverage=متوسط ​​كمية
 PriceQtyMinHT=دقيقة سعر الكمية. (صافية من الضرائب)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=نسبة مئوية
 Total=الإجمالي الكلي
 SubTotal=حاصل الجمع
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=معدل الضريبة
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=متوسط
 Sum=مجموع
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=تم الانتهاء من
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=اتصالات لهذا الطرف الثالث
 ContactsAddressesForCompany=اتصالات / عناوين لهذا الطرف الثالث
 AddressesForCompany=عناوين لهذا الطرف الثالث
@@ -427,6 +437,9 @@ ActionsOnCompany=الأحداث حول هذا الطرف الثالث
 ActionsOnMember=الأحداث عن هذا العضو
 ActionsOnProduct=Events about this product
 NActionsLate=٪ في وقت متأخر الصورة
+ToDo=لكى يفعل
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=طلب المسجل بالفعل
 Filter=فلتر
 FilterOnInto=معايير البحث <strong>'٪ ق'</strong> إلى حقول٪ الصورة
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=انذار ، كنت في وضع الصيانة 
 CoreErrorTitle=نظام خطأ
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=بطاقة الائتمان
+ValidatePayment=تحقق من الدفع
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=حقول إلزامية مع <b>%s</b>
 FieldsWithIsForPublic=<b>%s</b> تظهر الحقول التي تحتوي على قائمة العامة للأعضاء. إذا كنت لا تريد هذا ، والتحقق من "العامة" مربع.
 AccordingToGeoIPDatabase=(وفقا لGeoIP التحويل)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=تصنيف الفواتير
+ClassifyUnbilled=Classify unbilled
 Progress=تقدم
-ClickHere=اضغط هنا
 FrontOffice=Front office
 BackOffice=المكتب الخلفي
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=المشروع
 Projects=مشاريع
 Rights=الصلاحيات
+LineNb=Line no.
+IncotermLabel=شروط التجارة الدولية
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
@@ -890,7 +907,7 @@ Select2MoreCharacters=أحرف أو أكثر
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=تحميل المزيد من النتائج ...
 Select2SearchInProgress=بحث في التقدم ...
-SearchIntoThirdparties=الأطراف الثالثة
+SearchIntoThirdparties=أطراف ثالثة
 SearchIntoContacts=جهات الاتصال
 SearchIntoMembers=أعضاء
 SearchIntoUsers=المستخدمين
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=مشاريع مشتركة
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=مخصص ل
diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
index e7b09386706..294c0e77b08 100644
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -3,42 +3,42 @@
 Margin=هامش
 Margins=هوامش
 TotalMargin=إجمالي الهامش
-MarginOnProducts=هامش / المنتجات
-MarginOnServices=هامش / الخدمات
+MarginOnProducts=الهامش / المنتجات
+MarginOnServices=الهامش / الخدمات
 MarginRate=معدل الهامش
 MarkRate=معدل العلامة
 DisplayMarginRates=معدلات هامش العرض
-DisplayMarkRates=أسعار عرض علامة
-InputPrice=أسعار المدخلات
+DisplayMarkRates=معدلات علامة العرض
+InputPrice=سعر الإدخال
 margin=إدارة هوامش الربح
-margesSetup=هوامش الربح الإعداد إدارة
+margesSetup=إعداد إدارة هوامش الربح
 MarginDetails=تفاصيل الهامش
 ProductMargins=هوامش المنتج
 CustomerMargins=هوامش العملاء
-SalesRepresentativeMargins=مبيعات هوامش التمثيلية
+SalesRepresentativeMargins=هوامش ممثل المبيعات
 UserMargins=هوامش المستخدم
 ProductService=المنتج أو الخدمة
 AllProducts=جميع المنتجات والخدمات
 ChooseProduct/Service=اختيار المنتج أو الخدمة
-ForceBuyingPriceIfNull=شراء قوة السعر / التكلفة إلى سعر البيع إذا لم تحدد
-ForceBuyingPriceIfNullDetails=إن لم يكن سعر الشراء / تكلفة محددة، وهذا الخيار "ON"، سوف يكون هامش الصفر على خط (شراء / تكلفة سعر = سعر البيع)، وإلا ("OFF")، زبدة نباتية سوف يكون مساويا لالافتراضية المقترحة.
-MARGIN_METHODE_FOR_DISCOUNT=طريقة هامش للحصول على تخفيضات عالمية
+ForceBuyingPriceIfNull=فرض سعر  شراء / تكلفة إلى سعر البيع إذا لم يتم تحديدها
+ForceBuyingPriceIfNullDetails=إذا لم يتم تحديد سعر الشراء / التكلفة، وهذا الخيار "تشغيل"، فإن الهامش سيكون صفرا على الخط (سعر الشراء / التكلفة = سعر البيع)، غير ذلك ("إيقاف")، فإن الهامش يساوي الافتراضي المقترح.
+MARGIN_METHODE_FOR_DISCOUNT=طريقة الهامش للخصومات العالمية
 UseDiscountAsProduct=كمنتج
 UseDiscountAsService=كخدمة
 UseDiscountOnTotal=على المجموع الفرعي
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=يحدد إذا يتم التعامل مع الخصم العالمي كمنتج أو خدمة، أو فقط على المجموع الفرعي لحساب الهامش.
-MARGIN_TYPE=شراء / سعر التكلفة اقترح افتراضيا لحساب الهامش
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=يحدد ما إذا كان يتم التعامل مع الخصم العالمي كمنتج أو خدمة أو فقط على المجموع الفرعي لحساب الهامش.
+MARGIN_TYPE=سعر الشراء / التكلفة المقترحة افتراضيا لحساب الهامش
 MargeType1=هامش على أفضل سعر المورد
-MargeType2=هامش على المتوسط ​​المرجح لسعر (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MargeType2=الهامش على متوسط ​​السعر المرجح (واب)
+MargeType3=هامش على سعر التكلفة
+MarginTypeDesc=* سعر الهامش على أفضل سعر شراء = سعر البيع - أفضل سعر للمورد محدد على بطاقة المنتج <br> * هامش على متوسط ​​السعر المرجح (واب) = سعر البيع - متوسط ​​السعر المرجح للمنتج (واب) أو أفضل سعر للمورد إذا لم يتم تعريف واب بعد <br>* هامش على سعر التكلفة = سعر البيع - سعر التكلفة المحدد على بطاقة المنتج أو واب إذا لم يتم تحديد سعر التكلفة، أو أفضل سعر المورد إذا لم يتم تعريف واب حتى الآن
 CostPrice=سعر الكلفة
-UnitCharges=رسوم حدة
+UnitCharges=رسوم الوحدة
 Charges=الرسوم
-AgentContactType=وكيل تجاري نوع الاتصال
-AgentContactTypeDetails=سوف تحدد ما نوع (مرتبط على الفواتير) الاتصال أن تستخدم لتقرير هامش لكل ممثل بيع
-rateMustBeNumeric=سعر يجب أن تكون قيمة رقمية
-markRateShouldBeLesserThan100=وينبغي أن يكون معدل علامة أقل من 100
-ShowMarginInfos=عرض بقية المقال الهامش
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=تقرير الهامش لكل مستخدم استخدام الارتباط بين الأطراف الثالثة وممثلي البيع لحساب هامش كل مستخدم. ونظرا لأن بعض الأطراف الثالثة قد لا تكون مرتبطة بأي ممثل بيع وقد يتم ربط بعض الأطراف الثالثة بعدة مستخدمين، قد لا تظهر بعض الهوامش في هذا التقرير أو قد تظهر في عدة أسطر مختلفة.
+AgentContactType=نوع اتصال الوكيل التجاري 
+AgentContactTypeDetails=حدد نوع الاتصال (المرتبط بالفواتير) الذي سيتم استخدامه لتقرير الهامش لكل ممثل بيع
+rateMustBeNumeric=يجب أن يكون السعر قيمة رقمية
+markRateShouldBeLesserThan100=يجب أن يكون معدل العلامة أقل من 100
+ShowMarginInfos=إظهار معلومات الهامش
+CheckMargins=تفاصيل الهوامش
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 8ba979e12a4..021ca092cb8 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=قائمة الأعضاء العامة المصاد
 ErrorThisMemberIsNotPublic=ليست عضوا في هذا العام
 ErrorMemberIsAlreadyLinkedToThisThirdParty=عضو آخر (الاسم : <b>٪ ق</b> ، ادخل : <b>٪)</b> مرتبطة بالفعل الى طرف ثالث <b>٪ ق.</b> إزالة هذه الوصلة الاولى بسبب طرف ثالث لا يمكن أن يرتبط فقط عضو (والعكس بالعكس).
 ErrorUserPermissionAllowsToLinksToItselfOnly=لأسباب أمنية ، يجب أن تمنح أذونات لتحرير جميع المستخدمين لتكون قادرة على ربط عضو لمستخدم هذا ليس لك.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=مضمون البطاقة الخاصة بك عضوا
 SetLinkToUser=وصلة إلى مستخدم Dolibarr
 SetLinkToThirdParty=وصلة إلى طرف ثالث Dolibarr
 MembersCards=أعضاء طباعة البطاقات
@@ -108,17 +106,33 @@ PublicMemberCard=عضو بطاقة العامة
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=إنشاء الاشتراك
 ShowSubscription=وتظهر اكتتاب
-SendAnEMailToMember=البريد الإلكتروني لإرسال معلومات العضو
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=مضمون البطاقة الخاصة بك عضوا
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=موضوع البريد الإلكتروني وردت في حالة لصناعة السيارات في نقش أحد النزلاء
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=البريد الإلكتروني وردت في حالة لصناعة السيارات في نقش أحد النزلاء
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=بريد إلكتروني الموضوع لautosubscription الأعضاء
-DescADHERENT_AUTOREGISTER_MAIL=البريد الإلكتروني لعضو autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=البريد الإلكتروني لعضو في موضوع المصادقة
-DescADHERENT_MAIL_VALID=البريد الإلكتروني لعضو المصادقة
-DescADHERENT_MAIL_COTIS_SUBJECT=موضوع البريد الالكتروني للاكتتاب
-DescADHERENT_MAIL_COTIS=البريد الالكتروني للاكتتاب
-DescADHERENT_MAIL_RESIL_SUBJECT=موضوع البريد الإلكتروني لعضو resiliation
-DescADHERENT_MAIL_RESIL=البريد الإلكتروني لعضو resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=البريد الإلكتروني للمرسل البريد الإلكتروني التلقائي
 DescADHERENT_ETIQUETTE_TYPE=علامات الشكل
 DescADHERENT_ETIQUETTE_TEXT=النص المطبوع على أوراق عنوان الأعضاء
@@ -177,3 +191,8 @@ NoVatOnSubscription=لا TVA للاشتراكات
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=المنتج يستخدم لخط الاشتراك في فاتورة و:٪ الصورة
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 00885a1d0b5..ea66f672541 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=رسالة على الصفحة التحقق من صحة الدفع عودة
 MessageKO=رسالة في إلغاء دفع الصفحة عودة
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=ربط وجوه
 NbOfActiveNotifications=عدد الإخطارات (ملحوظة من رسائل البريد الإلكتروني المستلم)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=بدء التحميل
 CancelUpload=إلغاء التحميل
 FileIsTooBig=ملفات كبيرة جدا
 PleaseBePatient=يرجى التحلي بالصبر...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=وقد وردت طلب لتغيير كلمة المرور الخاصة بك Dolibarr
 NewKeyIs=هذا هو مفاتيح جديدة لتسجيل الدخول
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=العنوان
 WEBSITE_DESCRIPTION=الوصف
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/ar_SA/paypal.lang b/htdocs/langs/ar_SA/paypal.lang
index 08c06ab4a9c..3aabb4a93e7 100644
--- a/htdocs/langs/ar_SA/paypal.lang
+++ b/htdocs/langs/ar_SA/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=باي بال فقط
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=هذا هو معرف من الصفقة: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=إضافة رابط الدفع باي بال عند إرسال مستند عبر البريد
-PredefinedMailContentLink=يمكنك النقر على الرابط أدناه آمن لجعل الدفع (باي بال) إذا لم تكن قد فعلت ذلك. ٪ الصورة
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=رمز الخطأ
 ErrorSeverityCode=خطأ خطورة مدونة
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index fabeb3972b4..432876eb8df 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=المنتج أو الخدمة
 ProductsAndServices=المنتجات والخدمات
 ProductsOrServices=منتجات أو خدمات
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=منتجات ليست للبيع ولا الشراء
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=هل أنت متأكد من أنك تريد حذف خط
 ProductSpecial=خاص
 QtyMin=الحد الأدنى من الكمية
 PriceQtyMin=ثمن هذا الحد الادنى (ث / س الخصم)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=معدل ضريبة القيمة المضافة (لهذا المورد / المنتج)
 DiscountQtyMin=الخصم الإفتراضي للكمية
 NoPriceDefinedForThisSupplier=لا يوجد سعر أو كمية محددة لهذا المورد / المنتج
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 11f389ec67d..a19286641e1 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=مشروع اتصالات
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=جميع المشاريع
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسمح لك قراءة.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=يمثل هذا العرض جميع المشاريع والمهام يسمح لك للقراءة.
 ProjectsDesc=ويعرض هذا الرأي جميع المشاريع (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=المشاريع المفتوحة فقط مرئية (المشاريع في مشروع أو وضع مغلقة غير مرئية).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=المهام على المشاريع المفتوحة
 WorkloadNotDefined=عبء العمل غير محددة
 NewTimeSpent=قضى وقتا
 MyTimeSpent=وقتي قضى
+BillTime=Bill the time spent
 Tasks=المهام
 Task=مهمة
 TaskDateStart=تاريخ بدء العمل
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=قائمة التبرعات المرتبطة با
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=قائمة الإجراءات المرتبطة بالمشروع
 ListTaskTimeUserProject=قائمة الوقت المستهلك في مهام المشروع
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=النشاط على المشروع اليوم
 ActivityOnProjectYesterday=النشاط على المشروع أمس
 ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر
 ActivityOnProjectThisYear=نشاط المشروع هذا العام
 ChildOfProjectTask=طفل من مشروع / مهمة
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=لا صاحب هذا المشروع من القطاع الخاص
 AffectedTo=إلى المتضررين
 CantRemoveProject=هذا المشروع لا يمكن إزالتها كما هي المرجعية بعض أشياء أخرى (الفاتورة ، أو غيرها من الأوامر). انظر referers تبويبة.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=من المستحيل تحويل التاريخ المهمة وفقا لتاريخ بدء المشروع الجديد
 ProjectsAndTasksLines=المشاريع والمهام
 ProjectCreatedInDolibarr=مشروع٪ الصورة التي تم إنشاؤها
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=المشروع %s تم تعديلة
 TaskCreatedInDolibarr=مهمة٪ الصورة التي تم إنشاؤها
 TaskModifiedInDolibarr=مهمة٪ الصورة المعدلة
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/ar_SA/propal.lang b/htdocs/langs/ar_SA/propal.lang
index ade1ce1051b..ae9dd34a4a3 100644
--- a/htdocs/langs/ar_SA/propal.lang
+++ b/htdocs/langs/ar_SA/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=وقعت (لمشروع القانون)
 PropalStatusNotSigned=لم يتم التوقيع (مغلقة)
 PropalStatusBilled=فواتير
 PropalStatusDraftShort=مسودة
+PropalStatusValidatedShort=التحقق من صحة
 PropalStatusClosedShort=مغلقة
 PropalStatusSignedShort=وقعت
 PropalStatusNotSignedShort=لم يتم التوقيع
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index 7f4a2ed341c..0dfa991f0a0 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=يمكن استخدام هذه القيمة لحساب تكلفة
 TJMDescription=هذه القيمة هي حاليا فقط كمعلومات وليس لاستخدامها في أي حساب
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index abaf07a7c26..82ff9e856b2 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=تعديل مستودع
 MenuNewWarehouse=مستودع جديد
 WarehouseSource=مصدر مخزن
 WarehouseSourceNotDefined=لا يعرف مستودع،
+AddWarehouse=Create warehouse
 AddOne=أضف واحدا
+DefaultWarehouse=Default warehouse
 WarehouseTarget=الهدف مخزن
 ValidateSending=حذف ارسال
 CancelSending=الغاء ارسال
@@ -22,6 +24,7 @@ Movements=حركات
 ErrorWarehouseRefRequired=مستودع الاشارة اسم مطلوب
 ListOfWarehouses=لائحة المخازن
 ListOfStockMovements=قائمة الحركات الأسهم
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/ar_SA/stripe.lang b/htdocs/langs/ar_SA/stripe.lang
index d321f7bc6d0..9e187dc0d78 100644
--- a/htdocs/langs/ar_SA/stripe.lang
+++ b/htdocs/langs/ar_SA/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang
index af23afca8e2..afdd0790bf1 100644
--- a/htdocs/langs/ar_SA/trips.lang
+++ b/htdocs/langs/ar_SA/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=عرض تقرير حساب
 NewTrip=تقرير حساب جديد
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=كم المبلغ أو
 DeleteTrip=حذف تقرير حساب
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=تنتظر الموافقة
 ExpensesArea=منطقة تقارير المصاريف
 ClassifyRefunded=تصنيف "ردها"
 ExpenseReportWaitingForApproval=وقد قدم تقرير حساب جديد للموافقة عليها
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=تقرير حساب الهوية
 AnyOtherInThisListCanValidate=شخص إبلاغ عن التحقق من الصحة.
 TripSociete=شركة المعلومات
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=لقد أعلن تقرير حساب آخر في نطاق تاريخ مماثل.
 AucuneLigne=لا يوجد تقرير مصروفات تعلن بعد
 
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index b3647285d3c..efc3cebfa8b 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -69,8 +69,8 @@ InternalUser=المستخدم الداخلي
 ExportDataset_user_1=Dolibarr مستخدمي وممتلكاتهم
 DomainUser=النطاق المستخدم ق ٪
 Reactivate=تنشيط
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=منح إذن لأن الموروث من واحد من المستخدم.
 Inherited=موروث
 UserWillBeInternalUser=وسوف يكون المستخدم إنشاء مستخدم داخلية (لأنه لا يرتبط طرف ثالث خاص)
@@ -93,6 +93,7 @@ NameToCreate=اسم طرف ثالث لخلق
 YourRole=الأدوار الخاص
 YourQuotaOfUsersIsReached=يتم التوصل إلى حصة الخاص بك من المستخدمين النشطين!
 NbOfUsers=ملحوظة من المستخدمين
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=يمكن فقط superadmin تقليله a superadmin
 HierarchicalResponsible=المشرف
 HierarchicView=الهرمي
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 649c60e3080..caceee19920 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=قرأ
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 3fd633c38e8..95a32e010e3 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=لعملية
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=طرف ثالث بنك مدونة
-NoInvoiceCouldBeWithdrawed=أي فاتورة withdrawed بالنجاح. تأكد من أن الفاتورة على الشركات الحظر ساري المفعول.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=تصنيف حساب
 ClassCreditedConfirm=هل أنت متأكد من أن يصنف هذا الانسحاب كما تلقي على حساب حسابك المصرفي؟
 TransData=تاريخ الإرسال
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=إحصاءات عن طريق وضع خطوط
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index a6c9ecd1cfe..56dcc576180 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Тип на документа
 Docdate=Дата
 Docref=Справка
-Code_tiers=Трета страна
 LabelAccount=Етикет на сметка
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не мо
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Същност
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Банка
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 335646d2b1d..9e9ce88cd40 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Грешка, не могат да използват @ опция, ако последователност {гг} {mm} или {гггг} {mm} не е маска.
 UMask=Umask параметър за нови файлове в Unix / Linux / BSD файловата система.
 UMaskExplanation=Този параметър ви позволи да се определят правата, определени по подразбиране на файлове, създадени от Dolibarr на сървъра (по време на качването например). <br> Тя трябва да бъде осмична стойност (например, 0666 средства четат и пишат за всеки). <br> Този параметър е безполезно на предприятието на сървъра на Windows.
-SeeWikiForAllTeam=Обърнете внимание на уики страницата за пълния списък на всички участници и тяхната организация
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Забавяне за кеширане износ отговор в секунда (0 или празно за не кеш)
 DisableLinkToHelpCenter=Скриване на връзката <b>Нуждаете се от помощ или поддръжка</b> от страницата за вход
 DisableLinkToHelp=Скриване на линка към онлайн помощ "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Промяна на цените с база рефере
 MassConvert=Стартиране маса конвертирате
 String=Низ
 TextLong=Дълъг текст
+HtmlText=Html text
 Int=Цяло число
 Float=Десетично число
 DateAndTime=Дата и час
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Потребители и групи
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Полета
 Module59000Desc=Модул за управление на маржовете
 Module60000Name=Комисии
 Module60000Desc=Модул за управление на комисии
+Module62000Name=Инкотерм
+Module62000Desc=Добяване на свойства за управление на Инкотерм
 Module63000Name=Ресурси
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Клиентите фактури
@@ -833,11 +838,11 @@ Permission1251=Пусни масов внос на външни данни в б
 Permission1321=Износ на клиентите фактури, атрибути и плащания
 Permission1322=Reopen a paid bill
 Permission1421=Износ на клиентски поръчки и атрибути
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Управление на ДДС
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=По подразбиране предложената ДДС е 0, които могат да бъдат използвани за подобни случаи сдружения, лицата ОУ малките фирми.
-VATIsUsedExampleFR=Във Франция, това означава, фирми или организации, с реална фискална система (опростен реални или нормални реално). Система, в която ДДС е обявен.
-VATIsNotUsedExampleFR=Във Франция, това означава, асоциации, които са извън декларирания ДДС или фирми, организации или свободните професии, които са избрали фискалната система на микропредприятие (с ДДС франчайз) и се изплаща франчайз ДДС без ДДС декларация. Този избор ще покаже позоваване на &quot;неприлаганите ДДС - арт-293B CGI&quot; във фактурите.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Курс
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Сървър
 DriverType=Шофьор тип
 SummarySystem=Резюме на информационна система
 SummaryConst=Списък на всички параметри за настройка Dolibarr
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Стандартно меню мениджър
 DefaultMenuSmartphoneManager=Smartphone Menu Manager
 Skin=Кожата тема
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Постоянна форма за търсене в л
 DefaultLanguage=Език по подразбиране (код на езика)
 EnableMultilangInterface=Разрешаване на многоезичен интерфейс
 EnableShowLogo=Показване на логото в лявото меню
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Име
 CompanyAddress=Адрес
 CompanyZip=П. код
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
 SystemAreaForAdminOnly=Тази област е достъпна само за администратори. Никой не може да промени това ограничение.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=От тук можете да изберете параметрите свързани с външния вид на Dolibar
 AvailableModules=Available app/modules
 ToActivateModule=За да активирате модули, отидете на настройка пространство (Начало-> Setup-> модули).
@@ -1441,6 +1448,9 @@ SyslogFilename=Име на файла и пътя
 YouCanUseDOL_DATA_ROOT=Можете да използвате DOL_DATA_ROOT / dolibarr.log за лог файл в Dolibarr директория &quot;документи&quot;. Можете да зададете различен път, за да се съхранява този файл.
 ErrorUnknownSyslogConstant=Постоянни %s не е известен Syslog постоянно
 OnlyWindowsLOG_USER=Windows поддържа само LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Настройка на модул Дарение
 DonationsReceiptModel=Шаблон на получаване на дарение
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Неуспешно инициализиране на ме
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Дължимия ДДС
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=Се дължи ДДС: <br> - При доставка на стоки (ние използваме датата на фактурата) <br> - Плащания за услуги
 OptionVatDebitOptionDesc=Се дължи ДДС: <br> - При доставка на стоки (ние използваме датата на фактурата) <br> - По фактура (дебитно) за услуги
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=При доставка
 OnPayment=На плащане
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Дата на фактура използва
 Buy=Купувам
 Sell=Продажба
 InvoiceDateUsed=Дата на фактура използва
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Показване по подразбиране при показа на списък
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index 43d822e140e..653b504a007 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Член %s е валидиран
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Член %s е изтрит
-MemberSubscriptionAddedInDolibarr=Абонамет за член %s е добавен
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Доставка %s е валидирана
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Можете да добавите и следните пар
 AgendaUrlOptions3=<b>logina=%s</b> за да ограничи показването до действия притежавани от потребител <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> за да ограничи показването до действия свързани с проект <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Зает
@@ -109,7 +112,7 @@ ExportCal=Изнасяне на календар
 ExtSites=Импортиране на външни календари
 ExtSitesEnableThisTool=Показване на външни календари (определени в главната конфигурация) в дневния ред. Не засяга външните календари определени от потребители.
 ExtSitesNbOfAgenda=Брой календари
-AgendaExtNb=Календар No %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL адрес за достъп до файла .Ical
 ExtSiteNoLabel=Няма описание
 VisibleTimeRange=Видим времеви диапазон
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 3a3ef0beeef..1cc890e3ca9 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Платено обратно
 DeletePayment=Изтрий плащане
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Плащания към доставчици
 ReceivedPayments=Получени плащания
 ReceivedCustomersPayments=Плащания получени от клиенти
@@ -91,7 +92,7 @@ PaymentAmount=Сума за плащане
 ValidatePayment=Валидирай плащане
 PaymentHigherThanReminderToPay=Плащането е по-високо от напомнянето за плащане
 HelpPaymentHigherThanReminderToPay=Внимание, сумата на плащане на една или повече сметки е по-висока, отколкото останала за плащане част. <br> Редактирайте, или потвърдете, но тогава мислете за създаване на кредитно известие от превишението по всяека надвнесена фактура.
-HelpPaymentHigherThanReminderToPaySupplier=Внимание, сумата за плащане по една или повече сметки е по-голяма от остатъка за плащане. <br> Редактирайте или потвърдете.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Класифицирай 'Платено'
 ClassifyPaidPartially=Класифицирай 'Платено частично'
 ClassifyCanceled=Класифицирай 'Изоставено'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Конвертиране в бъдеще отстъпка
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Въведете плащане получено от клиент
 EnterPaymentDueToCustomer=Дължимото плащане на клиента
 DisabledBecauseRemainderToPayIsZero=Деактивирано понеже остатъка за плащане е нула
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Чернова (трябва да се валидира)
 BillStatusPaid=Платена
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Платена (готова за окончателна фактура)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Изоставена
 BillStatusValidated=Валидирана (трябва да се плати)
 BillStatusStarted=Започната
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Чакаща
 AmountExpected=Претендирана сума
 ExcessReceived=Получено превишение
+ExcessPaid=Excess paid
 EscompteOffered=Предложена отстъпка (плащане преди срока)
 EscompteOfferedShort=Отстъпка
 SendBillRef=Изпращане на фактура %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Отстъпка от кредитно известие %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Този вид кредит може да се използва по фактура преди нейното валидиране
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Нова абсолютна отстъпка
 NewRelativeDiscount=Нова относителна отстъпка
+DiscountType=Discount type
 NoteReason=Бележка/Причина
 ReasonDiscount=Причина
 DiscountOfferedBy=Предоставено от
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Фактурен адрес
 HelpEscompte=Тази отстъпка е предоставена на клиента, тъй като плащането е извършено преди срока.
 HelpAbandonBadCustomer=Тази сума е изоставена (клиентът се оказва лош клиент) и се счита като извънредна загуба.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 9a1f225090e..a22dde5f8b1 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -43,7 +43,8 @@ Individual=Частно лице
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Фирма майка
 Subsidiaries=Филиали
-ReportByCustomers=Отчет по клиенти
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Отчет по оценка
 CivilityCode=Граждански код
 RegisteredOffice=Седалище
@@ -75,10 +76,12 @@ Town=Град
 Web=Уеб
 Poste= Позиция
 DefaultLang=Език по подразбиране
-VATIsUsed=ДДС се използва
-VATIsNotUsed=ДДС не се използва
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Предложения
 OverAllOrders=Поръчки
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Номер по ДДС
-VATIntraShort=ДДС номер
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Синтаксиса е валиден
+VATReturn=VAT return
 ProspectCustomer=Потенциален / Клиент
 Prospect=Потенциален
 CustomerCard=Клиентска карта
 Customer=Клиент
 CustomerRelativeDiscount=Относителна клиентска отстъпка
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Относителна отстъпка
 CustomerAbsoluteDiscountShort=Абсолютна отстъпка
 CompanyHasRelativeDiscount=Този клиент има по подразбиране отстъпка <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Този клиент няма относителна отстъпка по подразбиране
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Този клиент все още има кредити за <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Този клиент не разполага с наличен кредит за отстъпка
-CustomerAbsoluteDiscountAllUsers=Абсолютни отстъпки (предоставена от всички потребители)
-CustomerAbsoluteDiscountMy=Абсолютни отстъпки (предоставени от вас)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Няма
 Supplier=Доставчик
 AddContact=Създай контакт
@@ -377,9 +390,9 @@ NoDolibarrAccess=Няма Dolibarr достъп
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Контакти и свойства
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Контакти/адреси (на контрагенти или не) и атрибути
-ImportDataset_company_3=Банкови данни
-ImportDataset_company_4=Контрагети/Търговски представители (Засяга потребителите, търговски представители на фирми)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Ценово ниво
 DeliveryAddress=Адрес за доставка
 AddAddress=Добавяне на адрес
@@ -406,15 +419,16 @@ ProductsIntoElements=Списък на продуктите/услугите в
 CurrentOutstandingBill=Текуща висяща сметка
 OutstandingBill=Макс. за висяща сметка
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Кодът е безплатен. Този код може да бъде променен по всяко време.
 ManagingDirectors=Име на управител(и) (гл. изп. директор, директор, президент...)
 MergeOriginThirdparty=Дублиращ контрагент (контрагентът, който искате да изтриете)
 MergeThirdparties=Сливане на контрагенти
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Контрагентите бяха обединени
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=Има грешка при изтриването на контрагентите. Моля проверете системните записи. Промените са възвърнати.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index de8ae929f5e..b8e3848cfec 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -31,7 +31,7 @@ Credit=Кредит
 Piece=Счетоводен док.
 AmountHTVATRealReceived=Нето събрани
 AmountHTVATRealPaid=Нето платени
-VATToPay=ДДС продажби
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Плащания
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Покажи плащане на ДДС
@@ -157,30 +158,34 @@ RulesResultDue=- Показани Сумите са с включени всич
 RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
 RulesCADue=- Тя включва дължимите на клиента фактури, независимо дали са платени или не. <br> - Тя се основава на датата на валидиране тези фактури. <br>
 RulesCAIn=- То включва всички ефективни плащания на фактурите, получени от клиенти. <br> - Тя се основава на датата на плащане на тези фактури <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Доклад от контрагент IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Доклад от контрагент IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Виж да докладва <b>%sVAT encasement%s</b> за изчислението на стандартната
 SeeVATReportInDueDebtMode=Виж доклада <b>%sVAT за flow%s</b> за изчисление, с опция върху потока
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- Материални активи, включва ДДС фактури въз основа на датата на фактурата.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Услуги, в доклада се включва ДДС фактури дължи платена или не, въз основа на датата на фактурата.
-RulesVATDueProducts=- Материални активи, включва ДДС фактури, въз основа на датата на фактурата.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Забележка: За материални активи, трябва да използват датата на доставка, за да бъде по-справедлива.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=% / Фактура
 NotUsedForGoods=Не се използва върху стоки
 ProposalStats=Статистика за представяне на предложения
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index 64be16ffccc..e9c9679325f 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Няма регистрирани задачи
 CronPriority=Приоритет
 CronLabel=Етикет
 CronNbRun=Nb. зареждане
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Всеки
 JobFinished=Задачи заредени и приключили
 #Page card
@@ -74,9 +74,10 @@ CronFrom=От
 CronType=Тип задача
 CronType_method=Call method of a PHP Class
 CronType_command=Терминална команда
-CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Неактивирани задачи
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 451c05c6fc5..df9bf2472c3 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr LDAP съвпадение не е пълна.
 ErrorLDAPMakeManualTest=. LDIF файл е генериран в директорията %s. Опитайте се да го заредите ръчно от командния ред, за да има повече информация за грешките,.
 ErrorCantSaveADoneUserWithZeroPercentage=Не може да се запази действието с &quot;статут не е започнал&quot;, ако поле &quot;, направено от&quot; е пълен.
 ErrorRefAlreadyExists=Ref използван за създаване вече съществува.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Не може да изтрие запис. Той вече е използван или включен в друг обект.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Неуспешно добавяне на запи
 ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
 ErrorNewValueCantMatchOldValue=Новата стойност не може да бъде равна на стария
 ErrorFailedToValidatePasswordReset=Неуспешно преинициализиране на паролата. Може би преинициализирането вече е било направено (този линк може да се използва само веднъж). Ако не е така, опитайте да рестартирате преинициализиращия процес.
-ErrorToConnectToMysqlCheckInstance=Свързването към базата данни беше неуспешно. Проверете дали работи Mysql сървъра (в повечето случаи можете да го стартирате от командния ред с 'sudo /etc/init.d/mysql start').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Неуспешно добавяне на контакт
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Режим на заплащане е зададен като тип %s, но настройката на модул Фактури не е попълнена с информация, която да се показва за този режим на плащане.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=Парола е зададено за този член. Обаче, няма създаден потребителски акаунт. Следователно тази парола е записана, но не може да бъде използвана за влизане в Dolibarr. Може да бъде използвана от външен модул/интерфейс, но ако нямате нужда да определите нито потребителско име нито парола за член, можете да деактивирате тази опция. Ако имате нужда да управлявате потребителско име, но нямата нужда от парола, можете да оставите това поле празно, за да избегнете това предупреждение. Забележка: Имейл също може да бъде използван като потребителско име ако члена с свързан към потребител.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/bg_BG/loan.lang b/htdocs/langs/bg_BG/loan.lang
index 6e01b77ac6f..1fead286203 100644
--- a/htdocs/langs/bg_BG/loan.lang
+++ b/htdocs/langs/bg_BG/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Конфигурация на модула заем
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 90bc7cb30a9..09fc6466251 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Резултат от масово изпращане на 
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 474023f0913..d63f97d916c 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Параметър %s не е дефиниран
 ErrorUnknown=Неизвестна грешка
 ErrorSQL=Грешка в SQL
 ErrorLogoFileNotFound=Файлът с лого '%s' не е открит
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Отидете в настройки на Модули, за да коригирате това
 ErrorFailedToSendMail=Неуспешно изпращане на имейл (подател = %s, получател = %s)
 ErrorFileNotUploaded=Файлът не беше качен. Уверете се, че размерът му не надвишава максимално допустимия, че е на разположение свободно пространство на диска и че няма файл със същото име в тази директория.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Грешка, за държавата '%s'
 ErrorNoSocialContributionForSellerCountry=Грешка, за държава '%s' няма дефинирани ставки за социални осигуровки.
 ErrorFailedToSaveFile=Грешка, неуспешно записване на файл.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Не сте упълномощен да правите това.
 SetDate=Настройка на дата
 SelectDate=Изберете дата
 SeeAlso=Вижте също %s
 SeeHere=Вижте тук
+ClickHere=Кликнете тук
+Here=Here
 Apply=Приложи
 BackgroundColorByDefault=Стандартен цвят на фона
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Връзка
 Select=Изберете
 Choose=Избор
 Resize=Преоразмери
+ResizeOrCrop=Resize or Crop
 Recenter=Възстанови
 Author=Автор
 User=Потребител
@@ -325,8 +328,10 @@ Default=По подразбиране
 DefaultValue=Стойност по подразбиране
 DefaultValues=Default values
 Price=Цена
+PriceCurrency=Price (currency)
 UnitPrice=Единична цена
 UnitPriceHT=Единична цена (нето)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Единична цена
 PriceU=Ед.ц.
 PriceUHT=Ед.ц. (нето)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=Ед.ц. (с данък)
 Amount=Сума
 AmountInvoice=Фактурна стойност
+AmountInvoiced=Amount invoiced
 AmountPayment=Сума за плащане
 AmountHTShort=Сума (нето)
 AmountTTCShort=Сума (с данък)
@@ -353,6 +359,7 @@ AmountLT2ES=Сума на IRPF
 AmountTotal=Обща сума
 AmountAverage=Средна сума
 PriceQtyMinHT=Цена за мин. количество (без данък)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Процент
 Total=Общо
 SubTotal=Междинна сума
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Данъчна ставка
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Средно
 Sum=Сума
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Завършено
 ActionUncomplete=Незавършено
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Контакти за този контрагент
 ContactsAddressesForCompany=Контакти/адреси за този контрагент
 AddressesForCompany=Адреси за този контрагент
@@ -427,6 +437,9 @@ ActionsOnCompany=Събития за този контрагент
 ActionsOnMember=Събития за този член
 ActionsOnProduct=Events about this product
 NActionsLate=%s закъснели
+ToDo=Да се направи
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Заявката вече е записана
 Filter=Филтър
 FilterOnInto=Критерий за търсене '<strong>%s</strong>' в полета %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Внимание, вие сте в режим н
 CoreErrorTitle=Системна грешка
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Кредитна карта
+ValidatePayment=Валидирай плащане
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Полетата с <b>%s</b> са задължителни
 FieldsWithIsForPublic=Полетата с <b>%s</b> се показват на публичен списък с членовете. Ако не искате това, отмаркирайте поле "публичен".
 AccordingToGeoIPDatabase=(Според GeoIP конверсията)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Класифицирай платени
+ClassifyUnbilled=Classify unbilled
 Progress=Прогрес
-ClickHere=Кликнете тук
 FrontOffice=Front office
 BackOffice=Бек офис
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Проект
 Projects=Проекти
 Rights=Права
+LineNb=Line no.
+IncotermLabel=Инкотермс
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
@@ -890,7 +907,7 @@ Select2MoreCharacters=или повече знаци
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Зараждане на повече резултати...
 Select2SearchInProgress=Търсене в ход...
-SearchIntoThirdparties=Трети лица
+SearchIntoThirdparties=Контрагенти
 SearchIntoContacts=Контакти
 SearchIntoMembers=Членове
 SearchIntoUsers=Потребители
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Всички
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Възложено на
diff --git a/htdocs/langs/bg_BG/margins.lang b/htdocs/langs/bg_BG/margins.lang
index 87dbd9d73b8..5ee0eeaeaeb 100644
--- a/htdocs/langs/bg_BG/margins.lang
+++ b/htdocs/langs/bg_BG/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 7a51a30538e..5077d468551 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Списък на настоящите публич
 ErrorThisMemberIsNotPublic=Този член не е публичен
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Друг член (име: <b>%s,</b>, потребител: <b>%s)</b> вече е свързан с третата страна <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=От съображения за сигурност, трябва да ви бъдат предоставени права за редактиране на всички потребители да могат свързват член към потребител, който не е ваш.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Съдържание на вашата карта на член
 SetLinkToUser=Връзка към Dolibarr потребител
 SetLinkToThirdParty=Линк към Dolibarr контрагент
 MembersCards=Визитни картички на членове
@@ -108,17 +106,33 @@ PublicMemberCard=Публична карта на член
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Покажи чл. внос
-SendAnEMailToMember=Изпращане на информационен имейл до член
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Съдържание на вашата карта на член
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Предмет на електронна поща, получена в случай на авто-надпис на гост
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-поща, получена в случай на авто-надпис на гост
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Имейл предмет за член autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=Имейл за член autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=Тема на e-mail за потвърждаване на член
-DescADHERENT_MAIL_VALID=E-mail за потвърждаване на член
-DescADHERENT_MAIL_COTIS_SUBJECT=Тема на e-mail за членски внос
-DescADHERENT_MAIL_COTIS=E-mail за членски внос
-DescADHERENT_MAIL_RESIL_SUBJECT=Тема на e-mail за изключване на член
-DescADHERENT_MAIL_RESIL=E-mail за изключване на член
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Имейл на подателя за автоматични имейли
 DescADHERENT_ETIQUETTE_TYPE=Формат на страницата за етикети
 DescADHERENT_ETIQUETTE_TEXT=Текст показван на адресната карта на член
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 3ff311bde1f..2f2e1937780 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Съобщение на валидирана страница плащане връщане
 MessageKO=Съобщение за анулиране страница плащане връщане
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Свързан обект
 NbOfActiveNotifications=Брой уведомления (брой имейли на получатели)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Започни качване
 CancelUpload=Анулирай качване
 FileIsTooBig=Файлът е твърде голям
 PleaseBePatient=Моля, бъдете търпеливи...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Получена е заявка за промяна на вашата парола за достъп
 NewKeyIs=Това е вашият нов ключ за влизане
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Заглавие
 WEBSITE_DESCRIPTION=Описание
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/bg_BG/paypal.lang b/htdocs/langs/bg_BG/paypal.lang
index 0d10ca2dbc2..1614593d1d4 100644
--- a/htdocs/langs/bg_BG/paypal.lang
+++ b/htdocs/langs/bg_BG/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Paypal само
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Това е номер на сделката: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Добавяне на URL адреса на Paypal плащане, когато ви изпрати документа по пощата
-PredefinedMailContentLink=Можете да кликнете върху сигурна връзка по-долу, за да направите плащане чрез PayPal \n\n %s \n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Код грешка
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index b86003da7f1..4e57b45fc4f 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Продукт или Услуга
 ProductsAndServices=Продукти и Услуги
 ProductsOrServices=Продукти или Услуги
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Сигурни ли сте, че желаете да и
 ProductSpecial=Специален
 QtyMin=Минимално Количество
 PriceQtyMin=Цена за това мин. к-во (без остъпка)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=ДДС процент (за този доставчик/продукт)
 DiscountQtyMin=Отстъпка по подразбиране за количество
 NoPriceDefinedForThisSupplier=Няма цена/количество, определени за този доставчик/продукт
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 2af3ec4a136..4cccbdb804e 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=ПРОЕКТА Контакти
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Всички проекти
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Този възглед представя всички проекти, по които могат да се четат.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Този изглед показва всички проекти и задачи, които са ви позволени да прочетете.
 ProjectsDesc=Този възглед представя всички проекти (потребителски разрешения ви даде разрешение да видите всичко).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Само отворени проекти са видими (планирани проекти или със затворен статус не са видими).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Този възглед представя всички проекти и задачи, които може да чете.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Задачи на отворени проекти
 WorkloadNotDefined=Работна натовареност не е определена
 NewTimeSpent=Времето, прекарано
 MyTimeSpent=Времето, прекарано
+BillTime=Bill the time spent
 Tasks=Задачи
 Task=Задача
 TaskDateStart=Начална дата на задача
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Списък на даренията асоции
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Списък на събития, свързани с проекта
 ListTaskTimeUserProject=Списък на отделеното време върху задачи на проект
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Дейност върху проект днес
 ActivityOnProjectYesterday=Дейност върху проект вчера
 ActivityOnProjectThisWeek=Дейности в проекта тази седмица
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Дейност по проект, този месец
 ActivityOnProjectThisYear=Дейности в проекта тази година
 ChildOfProjectTask=Дете на проекта / задачата
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Не собственик на този частен проект
 AffectedTo=Присъжда се
 CantRemoveProject=Този проект не може да бъде премахнато, тъй като е посочен от някои други предмети (фактура, заповеди или други). Виж препоръка раздела.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Невъзможно е да се смени датата на задача в съответствие с нова дата за началото на проекта
 ProjectsAndTasksLines=Проекти и задачи
 ProjectCreatedInDolibarr=Проект %s е създаден
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Задача %s е създадена
 TaskModifiedInDolibarr=Задача %s е променена
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/bg_BG/propal.lang b/htdocs/langs/bg_BG/propal.lang
index 3c6f7112944..9a52937b329 100644
--- a/htdocs/langs/bg_BG/propal.lang
+++ b/htdocs/langs/bg_BG/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Подписано (нужди фактуриране)
 PropalStatusNotSigned=Не сте (затворен)
 PropalStatusBilled=Таксува
 PropalStatusDraftShort=Проект
+PropalStatusValidatedShort=Валидирано
 PropalStatusClosedShort=Затворен
 PropalStatusSignedShort=Подписан
 PropalStatusNotSignedShort=Не сте
diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
index ec4f186a012..4f4a9b403c7 100644
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Тази стойност може да използва за и
 TJMDescription=Тази стойност е само сега като информация и не се използва за никакво изчисление
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 71bd7f216bb..451da0c98a2 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Промяна на склад
 MenuNewWarehouse=Нов склад
 WarehouseSource=Изпращащ склад
 WarehouseSourceNotDefined=Няма зададен склад,
+AddWarehouse=Create warehouse
 AddOne=Добавяне на един
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Получаващ склад
 ValidateSending=Изтриване на изпращане
 CancelSending=Отмяна на изпращане
@@ -22,6 +24,7 @@ Movements=Движения
 ErrorWarehouseRefRequired=Изисква се референтно име на склад
 ListOfWarehouses=Списък на складовете
 ListOfStockMovements=Списък на движението на стоковите наличности
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/bg_BG/stripe.lang b/htdocs/langs/bg_BG/stripe.lang
index 983b37bb8cd..c79261165d3 100644
--- a/htdocs/langs/bg_BG/stripe.lang
+++ b/htdocs/langs/bg_BG/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang
index 2e539afe9c5..16dc3438acc 100644
--- a/htdocs/langs/bg_BG/trips.lang
+++ b/htdocs/langs/bg_BG/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Показване на доклад за разходи
 NewTrip=Нов доклад за разходи
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Сума или км
 DeleteTrip=Изтриване на доклад за разходи
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Очаква одобрение
 ExpensesArea=Зона Доклади за разходи
 ClassifyRefunded=Класифициране като 'Рефинансиран'
 ExpenseReportWaitingForApproval=Нов доклад за разходи е бил изпратен за одобрение
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id на доклад за разходи
 AnyOtherInThisListCanValidate=Лице за информиране при валидация.
 TripSociete=Информация компания
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Създали сте друг доклад за разходи в подобен времеви отрязък.
 AucuneLigne=Няма все още деклариран доклад за разходи 
 
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 2c28b6cfbe0..e5a04c65d3e 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -69,8 +69,8 @@ InternalUser=Вътрешен потребител
 ExportDataset_user_1=Потребители на системата и свойства
 DomainUser=Домейн потребител %s
 Reactivate=Ре-активирайте
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Предоставени права поради наследяването им от права за група потребители.
 Inherited=Наследено
 UserWillBeInternalUser=Създаденият потребителят ще бъде вътрешен потребител (тъй като не е свързан с определен контрагент)
@@ -93,6 +93,7 @@ NameToCreate=Име на контрагент за създаване
 YourRole=Вашите роли
 YourQuotaOfUsersIsReached=Вашата квота за активни потребители е достигната!
 NbOfUsers=Брой потребители
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Само супер админстратор може да промени супер админстратор
 HierarchicalResponsible=Супервайзор
 HierarchicView=Йерархичен изглед
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index d4dafa45840..4e2478533be 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Изтрийте уебсайт
 ConfirmDeleteWebsite=Сигурни ли сте, че искате да изтриете този уебсайт? Всички негови страници и съдържание ще бъдат премахнати.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Име на страницата
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=Линк към външен CSS файл
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Покажи страницата в нов прозорец
 SetAsHomePage=Задай като основна страница
 RealURL=Релен URL
 ViewWebsiteInProduction=Покажи уеб сайта използвайки началното URL
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Чета
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 8d87ca5ec3a..af88b7b0fca 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=За обработка
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Банков код на контрагента
-NoInvoiceCouldBeWithdrawed=Не теглене фактура с успех. Уверете се, че фактура са дружества с валиден БАН.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Класифицирайте кредитирани
 ClassCreditedConfirm=Сигурен ли сте, че искате да класифицира тази получаване на отказ, кредитирани по вашата банкова сметка?
 TransData=Дата Предаване
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Статистики по статуса на линиите
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 78d5b8e3f16..fed6af9a6fa 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang
index 34ed1126045..9267e55860a 100644
--- a/htdocs/langs/bn_BD/agenda.lang
+++ b/htdocs/langs/bn_BD/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 69c18591c77..87122a4d31a 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 154550dae3b..840d927521d 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 9bf75178bea..cda96a546b8 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index 884e077b96e..d2da7ded67e 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/bn_BD/loan.lang b/htdocs/langs/bn_BD/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/bn_BD/loan.lang
+++ b/htdocs/langs/bn_BD/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 1ba8ff6dc6d..cedcd01066b 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 3ed337b50b9..46246394dde 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/bn_BD/margins.lang b/htdocs/langs/bn_BD/margins.lang
index 64e1a87864d..9f590ef3718 100644
--- a/htdocs/langs/bn_BD/margins.lang
+++ b/htdocs/langs/bn_BD/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index fd0adc4c264..7326f3b9950 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 1585504479e..2afabe43b06 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/bn_BD/paypal.lang b/htdocs/langs/bn_BD/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/bn_BD/paypal.lang
+++ b/htdocs/langs/bn_BD/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 53835bd7f06..b9ebefc91c9 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index c69302deecb..319a6e7e0e2 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/bn_BD/propal.lang b/htdocs/langs/bn_BD/propal.lang
index e64d97b1dad..914f287fd4b 100644
--- a/htdocs/langs/bn_BD/propal.lang
+++ b/htdocs/langs/bn_BD/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/bn_BD/salaries.lang
+++ b/htdocs/langs/bn_BD/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 4cdc262b847..7fbe2f6b82a 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/bn_BD/stripe.lang b/htdocs/langs/bn_BD/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/bn_BD/stripe.lang
+++ b/htdocs/langs/bn_BD/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/bn_BD/trips.lang b/htdocs/langs/bn_BD/trips.lang
index a741a9f6e5f..2ede3bc474e 100644
--- a/htdocs/langs/bn_BD/trips.lang
+++ b/htdocs/langs/bn_BD/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index c87ce3a9b02..8aa5d3749fc 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index defc8131b1c..b4e2dcadb2d 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,19 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
+<<<<<<< HEAD
+AccountingJournalType8=Inventory
+=======
+AccountingJournalType8=Inventar
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +288,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 5a7dc29570a..406baafc746 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Fondacijae
+Foundation=Fondacija
 Version=Verzija
 Publisher=Publisher
 VersionProgram=Verzija programa
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Greška, ne može se koristiti opcija @ za resetov
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Datum i vrijeme
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resursi
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Uslovi plaćanja
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -896,7 +902,7 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=Šabloni emaila
 DictionaryUnits=Jedinice
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Stopa
 LocalTax1IsNotUsed=Do not use second tax
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Naziv
 CompanyAddress=Adresa
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=Na isporuci
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index e21c9e99a49..7c02ab7ff46 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -4,8 +4,12 @@ Actions=Događaji
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agende
-LocalAgenda=Internal calendar
+LocalAgenda=Lokalni kalendar
+<<<<<<< HEAD
 ActionsOwnedBy=Event owned by
+=======
+ActionsOwnedBy=Događaj u vlasništvu
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ActionsOwnedByShort=Vlasnik
 AffectedTo=Dodijeljeno korisniku
 Event=Događaj
@@ -14,57 +18,74 @@ EventsNb=Broj događaja
 ListOfActions=Lista događaja
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Bilo koji korisnik u grupi
 EventOnFullDay=Događaj za cijeli dan(e)
 MenuToDoActions=Svi nepotpuni događaji
 MenuDoneActions=Sve završeni događaji
 MenuToDoMyActions=Moji nepotpuni događaji
 MenuDoneMyActions=Moji završeni događaji
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Spisak događaja (lokalni kalendar)
 ActionsAskedBy=Događaje izvijestio/la
 ActionsToDoBy=Događaji dodijeljeni korisniku
 ActionsDoneBy=Događaji završeni od strane korisnika
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=Događaj dodijeljen
 ViewCal=Mjesečni pregled
 ViewDay=Dnevni pregled
 ViewWeek=Sedmični pregled
-ViewPerUser=Per user view
-ViewPerType=Per type view
+ViewPerUser=Pregled po korisniku
+ViewPerType=Pregled po vrsti
 AutoActions= Automatsko popunjavanje
-AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaAutoActionDesc= Ovdje definirajte događaje za koje želite da Dolibarr automatski napravi događaj u kalendaru. Ako ništa nije obilježeno, samo ručno unesene akcije će biti uključene i vidljive u kalendaru. Automatsko praćenje biznis akcija urađenih na objektima (validacija, promjena statusa) neće biti spremljene.
 AgendaSetupOtherDesc= Ova stranica pruža mogućnosti izvoza svojih Dolibarr događaja u eksterni kalendar (Thunderbird, Google Calendar, ...)
 AgendaExtSitesDesc=Ova stranica omogućava definisanje eksternih izvora kalendara da vidite svoje događaje u Dolibarr agendi.
 ActionsEvents=Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
 ##### Agenda event labels #####
-NewCompanyToDolibarr=Third party %s created
+NewCompanyToDolibarr=Kreirana treća strana %s
+<<<<<<< HEAD
 ContractValidatedInDolibarr=Contract %s validated
 PropalClosedSignedInDolibarr=Proposal %s signed
 PropalClosedRefusedInDolibarr=Proposal %s refused
+=======
+ContractValidatedInDolibarr=Ugovor %s potvrđen
+PropalClosedSignedInDolibarr=Prijedlog %s potpisan
+PropalClosedRefusedInDolibarr=Prijedlog %s odbijen
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 PropalValidatedInDolibarr=Prijedlog %s potvrđen
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+PropalClassifiedBilledInDolibarr=Prijedlog %s klasificiran kao fakturisan
 InvoiceValidatedInDolibarr=Faktura %s potvrđena
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Račun %s odobren na POSu
 InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade
 InvoiceDeleteDolibarr=Faktura %s obrisana
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
+InvoicePaidInDolibarr=Faktura %s promijenjena u status plaćeno
+InvoiceCanceledInDolibarr=Faktura %s otkazana
+MemberValidatedInDolibarr=Član %s potvrđen
 MemberModifiedInDolibarr=Member %s modified
+<<<<<<< HEAD
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
+=======
+MemberResiliatedInDolibarr=Član %s ugašen
+MemberDeletedInDolibarr=Član%s obrisan
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Pošiljka %s odobrena
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
 ShipmentDeletedInDolibarr=Shipment %s deleted
 OrderCreatedInDolibarr=Order %s created
 OrderValidatedInDolibarr=Narudžba %s potvrđena
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Narudžba %s klasificirana kao isporučena
 OrderCanceledInDolibarr=Narudžba %s otkazana
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Narudžba %s klasificirana kao fakturisana
 OrderApprovedInDolibarr=Narudžba %s odobrena
-OrderRefusedInDolibarr=Order %s refused
+OrderRefusedInDolibarr=Narudžba %s odbijena
 OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade
 ProposalSentByEMail=Poslovni prijedlog %s poslan putem e-maila
 ContractSentByEMail=Contract %s sent by EMail
@@ -72,12 +93,16 @@ OrderSentByEMail=Narudžba za kupca %s poslana putem e-maila
 InvoiceSentByEMail=Fakture za kupca %s poslana putem e-maila
 SupplierOrderSentByEMail=Narudžba za dobavljača %s poslan putem e-maila
 SupplierInvoiceSentByEMail=Predračun dobavljača %s poslan putem e-maila
-ShippingSentByEMail=Shipment %s sent by EMail
+ShippingSentByEMail=Pošiljka%s poslana emailom
+<<<<<<< HEAD
 ShippingValidated= Shipment %s validated
+=======
+ShippingValidated= Pošiljka %s odobrena
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 InterventionSentByEMail=Intervencija %s poslana putem e-maila
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
+ProposalDeleted=Ponuda obrisana
+OrderDeleted=Narudžba obrisana
+InvoiceDeleted=Faktura obrisana
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -97,32 +122,54 @@ AgendaUrlOptions1=Također možete dodati sljedeće parametre za filtriranje pri
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Show birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
+AgendaShowBirthdayEvents=Pokaži rođendane kontakata
+AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
 ExportDataset_event1=Lista događaja u agendi
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Postavljeni period radnih dana u sedmici (naprimjer: 1-5, 1-6)
+DefaultWorkingHours=Postavljeni radni sati u danu (naprimjer: 9-18)
 # External Sites ical
 ExportCal=Export kalendara
 ExtSites=Import eksternih kalendara
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Prikazuje vanjske kalendare (definirane gobalnim postavkama) u agendi. Ne utječe na vanjske kalendare koje definiraju korisnici.
 ExtSitesNbOfAgenda=Broj kalendara
-AgendaExtNb=Kalendar broj %s
+<<<<<<< HEAD
+AgendaExtNb=Calendar no. %s
+=======
+AgendaExtNb=Kalendar br. %s
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ExtSiteUrlAgenda=URL za pristup .ical fajla
 ExtSiteNoLabel=Nema opisa
+<<<<<<< HEAD
 VisibleTimeRange=Visible time range
 VisibleDaysRange=Visible days range
-AddEvent=Create event
-MyAvailability=My availability
-ActionType=Event type
+AddEvent=Napravi događaj
+MyAvailability=Moja dostupnost
+ActionType=Vrsta događaja
 DateActionBegin=Start event date
-CloneAction=Clone event
+CloneAction=Kloniraj događaj
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
-EveryWeek=Every week
-EveryMonth=Every month
+EveryWeek=Svake sedmice
+EveryMonth=Svakog mjeseca
 DayOfMonth=Day of month
 DayOfWeek=Day of week
 DateStartPlusOne=Date start + 1 hour
+=======
+VisibleTimeRange=Vidljivi raspon vremena
+VisibleDaysRange=Vidljivi raspon dana
+AddEvent=Napravi događaj
+MyAvailability=Moja dostupnost
+ActionType=Vrsta događaja
+DateActionBegin=Početni datum događaja
+CloneAction=Kloniraj događaj
+ConfirmCloneEvent=Jeste li sigurni da želite duplirati događaj <b>%s</b>?
+RepeatEvent=Ponovi događaj
+EveryWeek=Svake sedmice
+EveryMonth=Svakog mjeseca
+DayOfMonth=Dan u mjesecu
+DayOfWeek=Dan u sedmici
+DateStartPlusOne=Datum početka + 1 sat
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 325ac7bed89..21815f586ee 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -1,12 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
 MenuBankCash=Banka/Novac
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+MenuVariousPayment=Razna plaćanja
+MenuNewVariousPayment=Novo ostalo plaćanje
 BankName=Naziv banke
 FinancialAccount=Račun
 BankAccount=Žiro račun
 BankAccounts=Žiro računi
+BankAccountsAndGateways=Bankovni računi | Portali
 ShowAccount=Prikaži račun
 AccountRef=Finansijski račun ref
 AccountLabel=Naziv za finansijski račun
@@ -154,10 +155,10 @@ CheckRejectedAndInvoicesReopened=Ček vraćen i fakture ponovno otvorene
 BankAccountModelModule=Šabloni dokumenata za bankovne račune
 DocumentModelSepaMandate=Šablon za SEPA mandat. Koristan je samo za evropske zemlje članice EU.
 DocumentModelBan=Šablon za štampanje stranice sa BAN podacima.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+NewVariousPayment=Novo ostalo plaćanje
+VariousPayment=Razna plaćanja
+VariousPayments=Razna plaćanja
+ShowVariousPayment=Pokaži ostala plaćanja
+AddVariousPayment=Dodaj ostala plaćanja
+YourSEPAMandate=Vaš SEPA mandat
+FindYourSEPAMandate=Ovo je vaš SEPA mandat za potvrđivanje vaše kompanije za izradu zahtjeva za direktno plaćanje vašoj banci. Vratite banci potpisan (skeniran potpisan dokument) ili ga pošaljite poštom
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 4e80cee91ce..c140e99384a 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
 ConfirmDeletePayment=Da li ste sigurni da želite obrisati ovu uplatu?
 ConfirmConvertToReduc=Da li želite ovo %s pretvoriti u apsolutni popust ?<br>Iznos će biti spremljen među sve popuste i može se koristiti kao poput za trenutnu ili neke buduće fakture za ovog kupca.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Uplate dobavljača
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -91,7 +92,7 @@ PaymentAmount=Iznos plaćanja
 ValidatePayment=Potvrditi uplatu
 PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga
 HelpPaymentHigherThanReminderToPay=Upozorenje, plaćanje iznosa jedne ili više faktura je veće od ostatka duga. <br> Izmijenite vaš unos, u suprotnom potvrdite i napravite knjižnu obavijest za višak primljen za svaku više plaćenu fakturu.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Označi kao 'Plaćeno'
 ClassifyPaidPartially=Označi kao 'Djelimično plaćeno'
 ClassifyCanceled=Označi kao 'Otkazano'
@@ -110,6 +111,7 @@ DoPayment=Unesi uplatu
 DoPaymentBack=Unesi refundaciju
 ConvertToReduc=Pretvori u budući popust
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
 EnterPaymentDueToCustomer=Unesi rok plaćanja za kupca
 DisabledBecauseRemainderToPayIsZero=Onemogućeno jer je ostatak duga nula
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Uzorak (Potrebna je potvrda)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Refundacija knjiž.obavijesti ili pretvoreno u popust
-BillStatusConverted=Plaćeno (spremno za konačnu fakturu)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Otkazano
 BillStatusValidated=Potvrđeno (Potrebno platiti)
 BillStatusStarted=Započeto
@@ -220,6 +222,7 @@ RemainderToPayBack=Ostatak iznosa za povrat
 Rest=Čekanje
 AmountExpected=Iznos za potraživati
 ExcessReceived=Višak primljen
+ExcessPaid=Excess paid
 EscompteOffered=Popust ponuđen (uplata prije roka)
 EscompteOfferedShort=Popust
 SendBillRef=Slanje fakture %s
@@ -283,16 +286,20 @@ Deposit=Akontacija
 Deposits=Akontacije
 DiscountFromCreditNote=Popust z dobropisa %s
 DiscountFromDeposit=Akontacije po računu %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ova vrsta kredita može se koristiti na fakturi prije potvrde
 CreditNoteDepositUse=Faktura mora biti potvrđena da bi se koristio ova vrsta kredita
 NewGlobalDiscount=Nov fiksni popust
 NewRelativeDiscount=Nov relativni popust
+DiscountType=Discount type
 NoteReason=Bilješka/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobreno od strane
 DiscountStillRemaining=ostalo popusta
 DiscountAlreadyCounted=Popusti već iskorišteni
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Adresa fakture
 HelpEscompte=Ovaj popust je odobren za kupca jer je isplata izvršena prije roka.
 HelpAbandonBadCustomer=Ovaj iznos je otkazan (kupac je loš kupac) i smatra se kao potencijalni gubitak.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -447,7 +454,7 @@ ChequeDeposits=Depoziti čekova
 Cheques=Čekovi
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+CreditNoteConvertedIntoDiscount=Ova %s je konvertirana u %s
 UsBillingContactAsIncoiveRecipientIfExist=Za pošiljanje računa uporabi naslov kontakta za račune pri kupcu namesto naslova partnerja
 ShowUnpaidAll=Prikaži sve neplaćene fakture
 ShowUnpaidLateOnly=Prikaži samo zakašnjele neplaćene fakture
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index c381b807afe..d70d6e34842 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Podkategorije
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -70,7 +70,7 @@ ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
+CatProdList=Spisak oznaka proizvoda/kategorija
 CatMemberList=List of members tags/categories
 CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index b9564217797..8e611ebd64d 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -29,7 +29,7 @@ AliasNameShort=Nadimak
 Companies=Kompanije
 CountryIsInEEC=Zemlja je unutar Evropske ekonomske zajednice
 ThirdPartyName=Ime subjekta
-ThirdPartyEmail=Third party email
+ThirdPartyEmail=Email treće strane
 ThirdParty=Subjekt
 ThirdParties=Subjekti
 ThirdPartyProspects=Mogući klijenti
@@ -43,6 +43,7 @@ Individual=Fizičko lice
 ToCreateContactWithSameName=Automatski pravi kontakt/adresu sa istim informacijama kao i subjekt ispod. U većini slučajeva, čak i kada je subjekt fizička osoba, samo pravljenje subjekta je dovoljno.
 ParentCompany=Matična kompanija
 Subsidiaries=Podružnice
+ReportByMonth=Izvještaj po mjesecima
 ReportByCustomers=Izvještaj po kupcima
 ReportByQuarter=Izvještaj po stopama
 CivilityCode=Pravila ponašanja
@@ -51,12 +52,12 @@ Lastname=Prezime
 Firstname=Ime
 PostOrFunction=Pozicija
 UserTitle=Titula
-NatureOfThirdParty=Nature of Third party
+NatureOfThirdParty=Vrsta treće strane
 Address=Adresa
 State=Država/Provincija
 StateShort=Pokrajina
 Region=Region
-Region-State=Region - State
+Region-State=Regija - Zemlja
 Country=Država
 CountryCode=Šifra države
 CountryId=ID države
@@ -75,10 +76,12 @@ Town=Grad
 Web=Web
 Poste= Pozicija
 DefaultLang=Defaultni jezik
-VATIsUsed=Oporeziva osoba
-VATIsNotUsed=Neoporeziva osoba
+VATIsUsed=Porez na promet je obračunat
+VATIsUsedWhenSelling=Ovim se definira da li treća strana uključuje porez ili ne kada pravi fakture svojim kupcima
+VATIsNotUsed=Porez na promet nije obračunat
 CopyAddressFromSoc=Popuni adresu sa adresom subjekta
 ThirdpartyNotCustomerNotSupplierSoNoRef=Subjekt nije kupac niti dobavljač, nema dostupnih referentnih objekata
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Treća strana nije niti dobavljač ni kupac, popusti nisu dostupni
 PaymentBankAccount=Bankovni račun za plaćanje
 OverAllProposals=Prijedlozi
 OverAllOrders=Narudžbe
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (carinski broj)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof ID (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,38 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=PDV broj
-VATIntraShort=PDV broj
+VATIntra=ID poreza na promet
+VATIntraShort=Porezni ID
 VATIntraSyntaxIsValid=Sintaksa je nevažeća
+VATReturn=Povrat PDV
 ProspectCustomer=Mogući klijent / Kupac
 Prospect=Mogući klijent
 CustomerCard=Kartica kupca
 Customer=Kupac
 CustomerRelativeDiscount=Relativni popust kupca
+<<<<<<< HEAD
+SupplierRelativeDiscount=Relative supplier discount
+=======
+SupplierRelativeDiscount=Relativni popust dobavljača
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Fiksni popust
 CompanyHasRelativeDiscount=Ovaj kupca ima defaultni popust od <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ovaj kupac nema relativnog popusta po defaultu
+HasRelativeDiscountFromSupplier=Imate ugovoreni popust od <b>%s%%</b> od strane ovog dobavljača
+HasNoRelativeDiscountFromSupplier=Nemate ugovoreni relativni popust od ovog dobavljača
 CompanyHasAbsoluteDiscount=Ovaj kupac ima dostupno odobrenje (Knjižne obavijesti ili avansno plaćanje) za <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Ovaj kupac ima dostupan diskont (komercijalni, uplaćen avans) za <b>%s</b> %s
 CompanyHasCreditNote=Ovaj kupac i dalje ima knjižno odobrenje za <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=Nemate dostupan diskontni popust od ovog dobavljača
+HasAbsoluteDiscountFromSupplier=Imate dostupne popuste (knjižne obavjesti ili avanse) od <b>%s</b> %s od strane ovog dobavljača
+HasDownPaymentOrCommercialDiscountFromSupplier=Imate dostupne popuste (komercijalne, avanse) od <b>%s</b> %s od strane ovog dobavljača
+HasCreditNoteFromSupplier=Imate knjižne obavijesti od <b>%s</b> %s od strane ovogo dobavljača
 CompanyHasNoAbsoluteDiscount=Ovaj kupac nema zasluga za popust
-CustomerAbsoluteDiscountAllUsers=Fiksni popust (odobren od strane svih korisnika)
-CustomerAbsoluteDiscountMy=Fiksni popust (odobren od strane sebe)
+CustomerAbsoluteDiscountAllUsers=Apsolutni popusti kupcima (odobreni od svih korisnika)
+CustomerAbsoluteDiscountMy=Apsolutni popusti kupcima (koje ste vi odobrili)
+SupplierAbsoluteDiscountAllUsers=Apsolutni popusti dobavljača (odobreni od svih korisnika)
+SupplierAbsoluteDiscountMy=Apsolutni popusti dobavljača (koje ste vi odobrili)
 DiscountNone=Ništa
 Supplier=Dobavljač
 AddContact=Napravi kontakt
@@ -299,7 +316,7 @@ SupplierCodeDesc=Šifra dobavljača, jedinstvena za sve dobavljače
 RequiredIfCustomer=Potrebno ako je subjekt kupac ili mogući klijent
 RequiredIfSupplier=Potrebno ako je subjekt dobavljač
 ValidityControledByModule=Porvjera valjanosti se kontroliše modulom
-ThisIsModuleRules=Ovo us pravila za ovaj modul
+ThisIsModuleRules=Ovo su pravila za ovaj modul
 ProspectToContact=Mogući klijent za kontaktirati
 CompanyDeleted=Kompanija"%s" obrisana iz baze podataka
 ListOfContacts=Lista kontakta/adresa
@@ -377,9 +394,9 @@ NoDolibarrAccess=Nema Dolibarr pristupa
 ExportDataset_company_1=Subjekti (kompanije/fondacije/fizička lica) i svojstva
 ExportDataset_company_2=Kontakti i osobine
 ImportDataset_company_1=Subjekti (kompanije/fondacije/fizička lica) i svojstva
-ImportDataset_company_2=Kontakti/Adrese (od subjekata ili ne) i atributi
-ImportDataset_company_3=Detalji banke
-ImportDataset_company_4=Subjekti/predstavnici prodaje (Odnosi se na predstavnike prodaje korisnike u kompanijama)
+ImportDataset_company_2=Kontakti/adrese (trećih strana ili ne) i osobine
+ImportDataset_company_3=Bankovni računi trećih strana
+ImportDataset_company_4=Predstavnici prodaje/treće strane (dodavanje korisnika predstavnika prodaje kompanijama)
 PriceLevel=Visina cijene
 DeliveryAddress=Adresa za dostavu
 AddAddress=Dodaj adresu
@@ -406,15 +423,16 @@ ProductsIntoElements=Spisak proizvoda/usluga u %s
 CurrentOutstandingBill=Trenutni neplaćeni račun
 OutstandingBill=Max. za neplaćeni račun
 OutstandingBillReached=Dostignut maksimum za neplaćene račune
+OrderMinAmount=Najmanja količina za naručiti
 MonkeyNumRefModelDesc=Vratiti broj sa formatom %syymm-nnnn za šifru kupca i $syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
 LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.
 ManagingDirectors=Ime menadžer(a) (CEO, direktor, predsjednik...)
 MergeOriginThirdparty=Umnoži subjekta (subjekt kojeg želite obrisati)
 MergeThirdparties=Spoji subjekte
 ConfirmMergeThirdparties=Da li ste sigurni da želite spojiti ovaj subjekt u trenutno prikazani? Svi povezani objekti (fakture, narudžbe, ...) će biti premještene trenutnom subjektu, a zatim će prethodni subjekt biti obrisan.
-ThirdpartiesMergeSuccess=Subjekti su spojeni
+ThirdpartiesMergeSuccess=Treće strane su spojene
 SaleRepresentativeLogin=Pristup za predstavnika prodaje
 SaleRepresentativeFirstname=Ime predstavnika prodaje
 SaleRepresentativeLastname=Prezime predstavnika prodaje
-ErrorThirdpartiesMerge=Nastala greška pri brisanju subjekta. Molimo provjeriti zapisnik. Promjene su vraćene.
+ErrorThirdpartiesMerge=Nastala je greška pri brisanju treće strane. Molimo vas da provjerite zapisnik. Izmjene su vraćene.
 NewCustomerSupplierCodeProposed=Kod novog kupca ili dobavljača predložen za duplikat koda
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index a310dc641db..dc3db7a2ad5 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -31,7 +31,7 @@ Credit=Potražuje
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Neto prikupljeno
 AmountHTVATRealPaid=Neto plaćeno
-VATToPay=PDV izlazni
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index 24315d2778a..32e49dd3bde 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Nema registrovanih poslova
 CronPriority=Prioritet
 CronLabel=Oznaka
 CronNbRun=Broj pokretanja
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Od
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell komanda
-CronCannotLoadClass=Ne može se otvoriti klada %s ili objekat %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index a86b46e6d79..32ec89f38ab 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -4,12 +4,12 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=EMail %s is wrong
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s je pogrešan
+ErrorBadUrl=Url %s je pogrešan
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %s already exists.
-ErrorRecordNotFound=Record not found.
+ErrorLoginAlreadyExists=Prijava %s već postoji.
+ErrorGroupAlreadyExists=Grupa %s već postoji.
+ErrorRecordNotFound=Zapis nije pronađen.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/bs_BA/loan.lang b/htdocs/langs/bs_BA/loan.lang
index 221115f9311..c11a2dfc08c 100644
--- a/htdocs/langs/bs_BA/loan.lang
+++ b/htdocs/langs/bs_BA/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index af88c241039..45df990dc52 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 05be90288ca..6b8ad5ad4c3 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -24,10 +24,10 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Veza baze podataka
-NoTemplateDefined=No template available for this email type
+NoTemplateDefined=Šablon za ovu vrstu emaila nije dostupan
 AvailableVariables=Dostupne zamjenske varijable
 NoTranslation=Nema prevoda
-Translation=Translation
+Translation=Prevod
 NoRecordFound=Nije pronađen zapis
 NoRecordDeleted=Nijedan zapis nije obrisan
 NotEnoughDataYet=Nema dovoljno podataka
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametar %s nije definiran
 ErrorUnknown=Nepoznata greška
 ErrorSQL=SQL greška
 ErrorLogoFileNotFound=Datoteka logotipa '%s' nije pronađena
-ErrorGoToGlobalSetup=Idite u postavke 'Kompanija/Organizacija' da popravite ovo
+ErrorGoToGlobalSetup=Idite na podešavanja 'Kompanija/organizacija' da ovo popravite
 ErrorGoToModuleSetup=Idite u postavke modula da popravite ovo
 ErrorFailedToSendMail=Neuspjeh pri slanju maila (pošiljalac=%s, primalac=%s)
 ErrorFileNotUploaded=Datoteka nije postavljena. Provjerite da li joj je veličina iznad dozvoljene, da li ima dovoljno slobodnog mjesta na disku i da li već postoji datoteka istog imena u ovom direktoriju.
@@ -64,20 +64,30 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, nije definirana PDV stopa za drž
 ErrorNoSocialContributionForSellerCountry=Greška, nisu definirane vrste doprinosa i poreza za državu '%s'.
 ErrorFailedToSaveFile=Greška, neuspjelo spremanje datoteke.
 ErrorCannotAddThisParentWarehouse=Pokušavate dodati nadređeno skladište koje je već podređeno skladište ovom trenutnom
-MaxNbOfRecordPerPage=Maks. br. unosa po stranici
+<<<<<<< HEAD
+MaxNbOfRecordPerPage=Max number of record per page
+=======
+MaxNbOfRecordPerPage=Maks broj unosa po stranici
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 NotAuthorized=Niste ovlašteni da to uradite.
 SetDate=Postavi datum
 SelectDate=Odaberi datum
 SeeAlso=Također pogledajte %s
 SeeHere=Pogledaj ovdje
+ClickHere=Klikni ovdje
+<<<<<<< HEAD
+Here=Here
+=======
+Here=Ovdje
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Apply=Primijeniti
 BackgroundColorByDefault=Osnovna boja pozadine
 FileRenamed=Datoteka je uspješno preimenovana
 FileGenerated=Datoteka je uspješno generirana
-FileSaved=The file was successfully saved
+FileSaved=Datoteka je uspješno spremljena
 FileUploaded=Datoteka je uspješno postavljena
-FileTransferComplete=File(s) was uploaded successfully
-FilesDeleted=File(s) successfully deleted
+FileTransferComplete=Datoteka(e) su uspješno učitane
+FilesDeleted=Datoteka(e) uspješno obrisana
 FileWasNotUploaded=Datoteka je odabrana za prilog ali nije još postavljena. Kliknite na "Dodaj datoteku" da bi ste to uradili.
 NbOfEntries=Broj unosa
 GoToWikiHelpPage=Pročitajte online pomoć (neophodan pristup internetu)
@@ -104,8 +114,8 @@ RequestLastAccessInError=Posljednja greška pristupa bazi podataka
 ReturnCodeLastAccessInError=Vraća kod za posljednju grešku pristupa bazi podataka
 InformationLastAccessInError=Informacija za posljednju grešku pristupa bazi podataka
 DolibarrHasDetectedError=Dolibarr je otkrio tehničku grešku
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+YouCanSetOptionDolibarrMainProdToZero=Možete pročitati datoteku zapisa ili postaviti opciju $dolibarr_main_prod to '0' u vašoj konfiguracijskoj datoteci za više informacija.
+InformationToHelpDiagnose=Ova informacija može biti korisna u dijagnostičke svrhe (možete postaviti opciju $dolibarr_main_prod to '1' da bi uklonili ovakva upozorenja)
 MoreInformation=Više informacija
 TechnicalInformation=Tehničke informacije
 TechnicalID=Tehnički ID
@@ -131,8 +141,8 @@ Never=Nikad
 Under=ispod
 Period=Period
 PeriodEndDate=Krajnji datum perioda
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
+SelectedPeriod=Odaberi period
+PreviousPeriod=Prethodni period
 Activate=Aktiviranje
 Activated=Aktivirano
 Closed=Zatvoreno
@@ -185,6 +195,7 @@ ToLink=Link
 Select=Odaberi
 Choose=Izaberi
 Resize=Promjena veličine
+ResizeOrCrop=Promijeni veličinu ili izreži
 Recenter=Postavi centar
 Author=Autor
 User=Korisnik
@@ -201,7 +212,7 @@ Parameter=Parametar
 Parameters=Parametri
 Value=Vrijednost
 PersonalValue=Lična vrijednost
-NewObject=New %s
+NewObject=Novi %s
 NewValue=Nova vrijednost
 CurrentValue=Trenutna vrijednost
 Code=Kod
@@ -263,13 +274,13 @@ DateBuild=Datum izrade izvještaja
 DatePayment=Datum plaćanja
 DateApprove=Datum odobrenja
 DateApprove2=Datum odobrenja (drugo odobrenje)
-RegistrationDate=Registration date
+RegistrationDate=Datum registracije
 UserCreation=Kreiranje korisnika
 UserModification=Izmjena korisnika
-UserValidation=Validation user
+UserValidation=Odobravanje korisnika
 UserCreationShort=Napr. korisnika
 UserModificationShort=Izmj. korisnika
-UserValidationShort=Valid. user
+UserValidationShort=Odobr. korisnik
 DurationYear=godina
 DurationMonth=mjesec
 DurationWeek=sedmica
@@ -311,8 +322,8 @@ KiloBytes=kilobajta
 MegaBytes=megabajta
 GigaBytes=gigabajta
 TeraBytes=terabajta
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Korisnik koji je napravio
+UserModif=Korisnik posljednjeg ažuriranja
 b=b.
 Kb=Kb
 Mb=Mb
@@ -325,8 +336,10 @@ Default=Uobičajeni
 DefaultValue=Uobičajena vrijednost
 DefaultValues=Podrazumijevane vrijednosti
 Price=Cijena
+PriceCurrency=Cijena (valuta)
 UnitPrice=Jedinična cijena
 UnitPriceHT=Jedinična cijena (neto)
+UnitPriceHTCurrency=Jedinična cijena (neto) (valuta)
 UnitPriceTTC=Jedinična cijena
 PriceU=J.C.
 PriceUHT=J.C. (neto)
@@ -334,6 +347,7 @@ PriceUHTCurrency=J.C (valuta)
 PriceUTTC=J.C. (uklj. PDV)
 Amount=Iznos
 AmountInvoice=Iznos fakture
+AmountInvoiced=Fakturisani iznos
 AmountPayment=Iznos plaćanja
 AmountHTShort=Iznos (neto)
 AmountTTCShort=Iznos (uklj. PDV)
@@ -353,6 +367,7 @@ AmountLT2ES=Iznos IRPF
 AmountTotal=Ukupni iznos
 AmountAverage=Prosječni iznos
 PriceQtyMinHT=Min. cijena jedinice (neto porez)
+PriceQtyMinHTCurrency=Min. cijena jedinice (neto porez) (valuta)
 Percentage=Postotak
 Total=Ukupno
 SubTotal=Međuzbir
@@ -365,36 +380,38 @@ Totalforthispage=Ukupno za ovu stranicu
 TotalTTC=Ukupno (uklj. PDV)
 TotalTTCToYourCredit=Ukupno (uklj. PDV) u vašu korist
 TotalVAT=Ukupan porez
-TotalVATIN=Total IGST
+TotalVATIN=Ukupno IGST
 TotalLT1=Ukupan porez 2
 TotalLT2=Ukupan porez 3
 TotalLT1ES=Ukupno RE
 TotalLT2ES=Ukupno IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
+TotalLT1IN=Ukupno CGST
+TotalLT2IN=Ukupno SGST
 HT=Neto porez
 TTC=Uklj. porez
-INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
+INCVATONLY=Uklj. PDV
+INCT=Uklj. sve poreze
 VAT=Porez na promet
 VATIN=IGST
 VATs=PDV
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATINs=IGST porezi
+LT1=Porez na promet 2
+LT1Type=Vrsta poreza na promet 2
+LT2=Porez na promet 3
+LT2Type=Vrsta poreza na promet 3
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Stopa poreza
-DefaultTaxRate=Default tax rate
+VATCode=Šifra stope poreza
+VATNPR=NPR stopa poreza
+DefaultTaxRate=Pretpostavljena stopa poreza
 Average=Prosjek
 Sum=Zbir
 Delta=Delta
-Module=Module/Application
-Modules=Modules/Applications
+Module=Modul/aplikacija
+Modules=Moduli/aplikacije
 Option=Opcija
 List=Spisak
 FullList=Potpuni spisak
@@ -418,15 +435,19 @@ ActionRunningNotStarted=Treba započeti
 ActionRunningShort=U toku
 ActionDoneShort=Završeno
 ActionUncomplete=Nedovršeno
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=Posljednjih %s povezanih događaja
 CompanyFoundation=Kompanija/organizacija
+Accountant=Računovođa
 ContactsForCompany=Kontakti za ovaj subjekt
 ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekt
 AddressesForCompany=Adrese za ovaj subjekt
 ActionsOnCompany=Događaji o ovom subjektu
 ActionsOnMember=Događaji o ovom članu
-ActionsOnProduct=Events about this product
+ActionsOnProduct=Događaji o ovom proizvodu
 NActionsLate=%s kasne
+ToDo=To do
+Completed=Završeno
+Running=U toku
 RequestAlreadyDone=Zahtjev već zapisan
 Filter=Filter
 FilterOnInto=Pretraži kriterij '<strong>%s</strong>' u poljima %s
@@ -475,7 +496,7 @@ Discount=Popust
 Unknown=Nepoznat
 General=Opće
 Size=Veličina
-OriginalSize=Original size
+OriginalSize=Prvobitna veličina
 Received=Primljeno
 Paid=Plaćeno
 Topic=Tema
@@ -498,8 +519,8 @@ AddPhoto=Dodaj sliku
 DeletePicture=Obriši sliku
 ConfirmDeletePicture=Potvrdi brisanje slike?
 Login=Pristup
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginEmail=Prijava (email)
+LoginOrEmail=Prijava ili email
 CurrentLogin=Trenutni pristup
 EnterLoginDetail=Unesi detalje prijave
 January=januar
@@ -563,7 +584,7 @@ MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Priložene datoteke i dokumenti
-JoinMainDoc=Join main document
+JoinMainDoc=Spoji glavni dokument
 DateFormatYYYYMM=MM-YYYY
 DateFormatYYYYMMDD=DD-MM-YYYY
 DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
@@ -616,7 +637,7 @@ Undo=vrati
 Redo=ponovi
 ExpandAll=Proširi sve
 UndoExpandAll=Vrati proširenje
-SeeAll=See all
+SeeAll=Vidi sve
 Reason=Razlog
 FeatureNotYetSupported=Osobina još nije podržana
 CloseWindow=Zatvori prozor
@@ -692,8 +713,8 @@ Page=Stranica
 Notes=Napomene
 AddNewLine=Dodaj novi red
 AddFile=Dodaj datoteku
-FreeZone=Not a predefined product/service
-FreeLineOfType=Not a predefined entry of type
+FreeZone=Nije predefinisan proizvod/usluga
+FreeLineOfType=Nije predefinisana vrsta stavke
 CloneMainAttributes=Kloniraj objekt sa njegovim osnovnim osobinama
 PDFMerge=PDF spajanje
 Merge=Spajanje
@@ -704,6 +725,8 @@ WarningYouAreInMaintenanceMode=Upozorenje, sada ste u modu za održavanje, tako
 CoreErrorTitle=Sistemska greška
 CoreErrorMessage=Žao nam je, desila se greška. Kontaktirajte sistemskog administratora da provjeri zapisnik ili onemogući $dolibarr_main_prod=1 za dobijanje više informacija.
 CreditCard=Kreditna kartica
+ValidatePayment=Potvrditi uplatu
+CreditOrDebitCard=Kreditna kartica
 FieldsWithAreMandatory=Polja sa <b>%s</b> su obavezna
 FieldsWithIsForPublic=Polja sa <b>%s</b> su prikazana na javnom spisku članova. Ako ovo ne želite, deaktivirajte kućicu "javno".
 AccordingToGeoIPDatabase=(prema GeoIP konverziji)
@@ -740,9 +763,9 @@ LinkToIntervention=Link ka intervencijama
 CreateDraft=Kreiraj nacrt
 SetToDraft=Nazad na nacrt
 ClickToEdit=Klikni za uređivanje
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
+EditWithEditor=Uredi sa CKUređivačem
+EditWithTextEditor=Uredi sa tekstualnim uređivačem
+EditHTMLSource=Uredi HTML izvor
 ObjectDeleted=Objekat %s je obrisan
 ByCountry=Po državi
 ByTown=Po gradu
@@ -773,10 +796,10 @@ SaveUploadedFileWithMask=Spremi datoteku na server pod imenom "<strong>%s</stron
 OriginFileName=Originalno ime datoteke
 SetDemandReason=Postavi izvor
 SetBankAccount=Definiraj bankovni račun
-AccountCurrency=Account currency
+AccountCurrency=Valuta računa
 ViewPrivateNote=Vidi zabilješke
 XMoreLines=%s red(ova) skriveno
-ShowMoreLines=Show more/less lines
+ShowMoreLines=Pokaži više/manje redova
 PublicUrl=Javni URL
 AddBox=Dodaj kutijicu
 SelectElementAndClick=Odaberite element i kliknite %s
@@ -787,7 +810,7 @@ ShowContract=Prikaži ugovor
 GoIntoSetupToChangeLogo=Idite u  Početna - Postavke - Kompanija za promjenu logotipa ili Početna - Postavke - Prikaz za sakrivanje.
 Deny=Zabrani
 Denied=Zabranjeno
-ListOf=List of %s
+ListOf=Spisak %s
 ListOfTemplates=Spisak šablona
 Gender=Spol
 Genderman=Muškarac
@@ -795,7 +818,7 @@ Genderwoman=Žena
 ViewList=Lista
 Mandatory=Obavezno
 Hello=Zdravo
-GoodBye=GoodBye
+GoodBye=Zbogom
 Sincerely=S poštovanjem
 DeleteLine=Obriši red
 ConfirmDeleteLine=Da li ste sigurni da želite obrisati ovaj red?
@@ -804,12 +827,12 @@ TooManyRecordForMassAction=Previše zapisa odabrano za masovnu akciju. Akcija je
 NoRecordSelected=Nijedan zapis nije odabran
 MassFilesArea=Područje za datoteke napravljeno masovnim akcijama
 ShowTempMassFilesArea=Pokaži područje datoteka napravljeno masovnim akcijama
-ConfirmMassDeletion=Bulk delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
+ConfirmMassDeletion=Potvrda masovnog brisanja
+ConfirmMassDeletionQuestion=Da li ste sigurni da želite obrisati %s odabranih zapisa ?
 RelatedObjects=Povezani objekti
 ClassifyBilled=Klasificiraj kao fakturisano
+ClassifyUnbilled=Klasificiraj kao nefakturisano
 Progress=Napredak
-ClickHere=Klikni ovdje
 FrontOffice=Izlog
 BackOffice=Administracija
 View=Pogled
@@ -817,40 +840,46 @@ Export=Export
 Exports=Exports
 ExportFilteredList=Izvezi filtrirani spisak
 ExportList=Spisak za izvoz
-ExportOptions=Export Options
+ExportOptions=Opcije izvoza
 Miscellaneous=Razno
 Calendar=Kalendar
 GroupBy=Grupiranje po...
 ViewFlatList=Vidi čisti spisak
 RemoveString=Ukloni pojam '%s'
 SomeTranslationAreUncomplete=Neki jezici su možda djelimično prevedeni ili mogu sadržavati greške. Ako nađete neke, možete popraviti jezičke datoteke tako što ćete ih postaviti na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Direktni link preuzimanja (javni/vanjski)
+DirectDownloadInternalLink=Link direktnog skidanja (morate biti prijavljeni i imati potrebna dopuštenja)
 Download=Skidanje
-DownloadDocument=Download document
+DownloadDocument=Skidanje dokumenta
 ActualizeCurrency=Ažuriraj kurs valute
 Fiscalyear=Fiskalna godina
 ModuleBuilder=Kreator modula
 SetMultiCurrencyCode=Postavi valutu
 BulkActions=Masovne akcije
 ClickToShowHelp=Klikni za prikaz pomoći
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
-ExpenseReport=Expense report
+WebSite=Veb sajt
+WebSites=Veb sajtovi
+WebSiteAccounts=Računi veb sajta
+ExpenseReport=Izvještaj troškova
 ExpenseReports=Izvještaj o troškovima
 HR=LJR
 HRAndBank=LJR i banka
 AutomaticallyCalculated=Automatski izračunato
 TitleSetToDraft=Nazad na nacrt
 ConfirmSetToDraft=Da li ste sigurni da želite se vratiti u stanje nacrta?
-ImportId=Import id
+ImportId=Uvoz id
 Events=Događaji
-EMailTemplates=Emails templates
-FileNotShared=File not shared to exernal public
+EMailTemplates=Šabloni emaila
+FileNotShared=Datoteka nije dijeljena vanjskim korisnicima
 Project=Projekt
 Projects=Projekti
 Rights=Dozvole
+<<<<<<< HEAD
+LineNb=Line no.
+=======
+LineNb=Red br.
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+IncotermLabel=Incoterms
 # Week day
 Monday=Ponedjeljak
 Tuesday=Utorak
@@ -880,14 +909,14 @@ ShortThursday=Č
 ShortFriday=P
 ShortSaturday=S
 ShortSunday=N
-SelectMailModel=Select an email template
+SelectMailModel=Odaberite šablon emaila
 SetRef=Postavi ref.
 Select2ResultFoundUseArrows=Pronađeni neki rezultati. Koristite strelice za odabir.
 Select2NotFound=Nije pronađen rezultat
 Select2Enter=Potvrdi
 Select2MoreCharacter=ili više karaktera
 Select2MoreCharacters=ili više karaktera
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2MoreCharactersMore=<strong>Traži sintaksu:</strong><br><kbd><strong> |</strong></kbd><kbd> ili</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Bilo koji znak</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Počinje sa</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> Završava sa</kbd> (ab$)<br>
 Select2LoadingMoreResults=Učitavam više rezultata...
 Select2SearchInProgress=Pretraga u toku...
 SearchIntoThirdparties=Subjekti
@@ -909,10 +938,18 @@ SearchIntoCustomerShipments=Slanje kupcu
 SearchIntoExpenseReports=Izvještaj o troškovima
 SearchIntoLeaves=Odlasci
 CommentLink=Komentari
-NbComments=Number of comments
-CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
+NbComments=Broj komentara
+CommentPage=Prostor komentara
+CommentAdded=Dodan komentar
+CommentDeleted=Obrisan komentar
 Everybody=Zajednički projekti
-PayedBy=Payed by
-PayedTo=Payed to
+PayedBy=Platio
+PayedTo=Plaćeno
+Monthly=Mjesečno
+Quarterly=Tromjesečno
+Annual=Godišnje
+Local=Lokalni
+Remote=Udaljeni
+LocalAndRemote=Lokalni i udaljeni
+KeyboardShortcut=Prečica na tastaturi
+AssignedTo=Dodijeljeno korisniku
diff --git a/htdocs/langs/bs_BA/margins.lang b/htdocs/langs/bs_BA/margins.lang
index 64e1a87864d..9f590ef3718 100644
--- a/htdocs/langs/bs_BA/margins.lang
+++ b/htdocs/langs/bs_BA/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index f72dcd72faf..a937baddc92 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index d89c1d0190d..6801a401f2a 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index ee2a6e4e6fc..3e54ae37590 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -45,7 +47,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
 Notify_WITHDRAW_CREDIT=Credit withdrawal
 Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_COMPANY_CREATE=Trća stranka kreirana
+Notify_COMPANY_CREATE=Treća stranka kreirana
 Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,8 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titula
 WEBSITE_DESCRIPTION=Opis
 WEBSITE_KEYWORDS=Keywords
+<<<<<<< HEAD
+LinesToImport=Lines to import
+=======
+LinesToImport=Linija za uvoz
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/bs_BA/paypal.lang b/htdocs/langs/bs_BA/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/bs_BA/paypal.lang
+++ b/htdocs/langs/bs_BA/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 78c46bed191..48421c18acb 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi i usluge
 ProductsOrServices=Proizvodi ili usluge
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 10e9a9fcb0d..1abc7a6b648 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Kontakti projekta
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Svi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
 ProjectsDesc=Ovaj pregled predstavlja sve projekte (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Vrijeme provedeno
 MyTimeSpent=Moje provedeno vrijeme
+BillTime=Bill the time spent
 Tasks=Zadaci
 Task=Zadatak
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Lista događaja u vezi s projektom
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Aktivnost na projektu ove sedmice
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktivnost na projektu ovog mjeseca
 ActivityOnProjectThisYear=Aktivnost na projektu ove godine
 ChildOfProjectTask=Dijete projekta/zadatka
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Niste vlasnik ovog privatnog projekta
 AffectedTo=Dodijeljeno
 CantRemoveProject=Ovaj projekat se ne može ukloniti jer je u vezi sa nekim drugim objektom (faktura, narudžba i ostalo). Pogledajte tab sa odnosima.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,15 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+<<<<<<< HEAD
+SendProjectRef=About project %s
+=======
+SendProjectRef=O projektu %s
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/bs_BA/propal.lang b/htdocs/langs/bs_BA/propal.lang
index 58c1ba6566a..2b46f88d571 100644
--- a/htdocs/langs/bs_BA/propal.lang
+++ b/htdocs/langs/bs_BA/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Fakturisano
 PropalStatusDraftShort=Nacrt
+PropalStatusValidatedShort=Potvrđeno
 PropalStatusClosedShort=Zatvoreno
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index a1d75824cce..9db682cf5b8 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -8,7 +8,17 @@ WarehouseEdit=Modifikovanje skladišta
 MenuNewWarehouse=Novo skladište
 WarehouseSource=Izvorno skladište
 WarehouseSourceNotDefined=Nema definisanog skladišta,
+<<<<<<< HEAD
+AddWarehouse=Create warehouse
+=======
+AddWarehouse=Napravi skladište
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 AddOne=Dodaj jedno
+<<<<<<< HEAD
+DefaultWarehouse=Default warehouse
+=======
+DefaultWarehouse=Glavno skladište
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 WarehouseTarget=Ciljano skladište
 ValidateSending=Obriši slanje
 CancelSending=Poništi slanje
@@ -22,6 +32,11 @@ Movements=Kretanja
 ErrorWarehouseRefRequired=Referentno ime skladište je potrebno
 ListOfWarehouses=Lista skladišta
 ListOfStockMovements=Lista kretanja zaliha
+<<<<<<< HEAD
+ListOfInventories=List of inventories
+=======
+ListOfInventories=Spisak inventara
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
@@ -158,7 +173,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
+inventoryTitle=Inventar
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 inventoryCreateDelete=Create/Delete inventory
@@ -174,7 +189,7 @@ inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
+inventoryOnDate=Inventar
 INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
diff --git a/htdocs/langs/bs_BA/stripe.lang b/htdocs/langs/bs_BA/stripe.lang
index 5d762228925..9de79efff45 100644
--- a/htdocs/langs/bs_BA/stripe.lang
+++ b/htdocs/langs/bs_BA/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
index 4c0281e12ff..013909f2b8b 100644
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Iznos ili kilometri
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index f977a16b961..680735abf1b 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -69,8 +69,8 @@ InternalUser=Interni korisnik
 ExportDataset_user_1=Dolibarr korisnici i svojstva
 DomainUser=Korisnik domene %s
 Reactivate=Reaktivirati
-CreateInternalUserDesc=Ovaj obrazac omogućava da se napravi interni korisnik za vašu kompaniju/organizaciju. Da biste napravili eksternog korisnika (kupca, dobavljača, ...), koristite dugme  'Napravi Dolibarr korisnika' iz kartice za kontakte subjekta.
-InternalExternalDesc= <b>Interni</b> korisnik je korisnik koji je dio vaše kompanije/organizacije.<br> <b>Vanjski</b> korisnik je kupac, dobavljač ili neko drugi.<br><br>U oba slučaja, dozvole definiraju prava u Dolibarru, također vanjski korisnik može imati drugačiji meni od internog korisnika (Vidi Početna - Postavke - Prikaz)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Dozvola je prenesena od jedne korisničke grupe.
 Inherited=Preneseno
 UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije povezan sa nekim subjektom)
@@ -93,6 +93,7 @@ NameToCreate=Naziv subjekta za kreiranje
 YourRole=Vaše uloge
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je postignuta!
 NbOfUsers=Broj korisnika
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
 HierarchicalResponsible=Nadzornik
 HierarchicView=Hijerarhijski prikaz
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 630a62570b0..82654522a03 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Pročitaj
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,12 +61,24 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccounts=Računi veb sajta
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index db4ac8e7c83..7c60c9af042 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direktni nalog za plaćanje
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direktni nalog za plaćanje
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za obradu
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=Nihje faktura nije podignuta sa uspjehom. Provjerite da li su fakture na kompanijama sa važećim BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Označi na potraživanja
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,14 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+<<<<<<< HEAD
+ExecutionDate=Execution date
+=======
+ExecutionDate=Datum izvršenja
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 9c38a5038c8..dd7fb9db672 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable per defecte per als serveis ven
 Doctype=Tipus de document
 Docdate=Data
 Docref=Referència
-Code_tiers=Tercer
 LabelAccount=Etiqueta de compte
 LabelOperation=Etiqueta de l'operació
 Sens=Significat
@@ -169,7 +168,6 @@ DelYear=Any a eliminar
 DelJournal=Diari per esborrar
 ConfirmDeleteMvt=Això eliminarà totes les línies del Llibre Major de l'any i/o d'un diari específic. Es requereix com a mínim un criteri.
 ConfirmDeleteMvtPartial=Això eliminarà la transacció del Ledger (se suprimiran totes les línies relacionades amb la mateixa transacció)
-DelBookKeeping=Elimina el registre del libre major
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Informe-diari de despeses
 DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -220,7 +218,7 @@ ErrorAccountancyCodeIsAlreadyUse=Error, no pots eliminar aquest compte comptable
 MvtNotCorrectlyBalanced=Registre comptabilitzat incorrectament. Deure=%s. Haver=%s
 FicheVentilation=Fitxa de comptabilització
 GeneralLedgerIsWritten=Les transaccions s'han escrit al llibre major
-GeneralLedgerSomeRecordWasNotRecorded=Algunes de les transaccions no s'han registrat. Si no hi ha cap altre missatge d'error, probablement és perquè ja s'han registrat.
+GeneralLedgerSomeRecordWasNotRecorded=Algunes de les transaccions no van poder ser registrats al diari. Si no hi ha cap altre missatge d'error, probablement és perquè ja es van publicar.
 NoNewRecordSaved=No hi ha més registres pel diari
 ListOfProductsWithoutAccountingAccount=Llista de productes no comptabilitzats en cap compte comptable
 ChangeBinding=Canvia la comptabilització
@@ -236,13 +234,19 @@ AccountingJournal=Diari comptable
 NewAccountingJournal=Nou diari comptable
 ShowAccoutingJournal=Mostrar diari comptable
 Nature=Caràcter
-AccountingJournalType1=Operació miscel·lània  
+<<<<<<< HEAD
+AccountingJournalType1=Miscellaneous operations
+=======
+AccountingJournalType1=Operacions diverses
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 AccountingJournalType2=Vendes
 AccountingJournalType3=Compres
 AccountingJournalType4=Banc
 AccountingJournalType5=Informe de despeses
+AccountingJournalType8=Inventari
 AccountingJournalType9=Haver
 ErrorAccountingJournalIsAlreadyUse=Aquest diari ja està en ús
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Exportar esborranys del llibre 
@@ -284,6 +288,8 @@ Formula=Fórmula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=No s'han fet alguns passos obligatoris de configuració, si us plau, completeu-los
 ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup comptable disponible per al país %s (Veure Inici - Configuració - Diccionaris)
+ErrorInvoiceContainsLinesNotYetBounded=Intenta actualitzar algunes línies de la factura <strong> %s </strong>, però algunes altres encara no estan vinculades al compte de comptabilitat. Es rebutja el registre comptable de totes les línies d'aquesta factura.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Algunes línies a la factura no estan vinculades al compte de comptabilitat.
 ExportNotSupported=El format d'exportació configurat no està suportat en aquesta pàgina
 BookeppingLineAlreayExists=Les línies ja existeixen en la comptabilitat
 NoJournalDefined=Cap diari definit
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 61e7b142e91..c9649df73f0 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -269,10 +269,10 @@ MAIN_MAIL_SMTP_SERVER=Nom host o ip del servidor SMTP (Per defecte en php.ini: <
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port del servidor SMTP (No definit en PHP en sistemes de tipus Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom servidor o ip del servidor SMTP (No definit en PHP en sistemes de tipus Unix)
 MAIN_MAIL_EMAIL_FROM=Remitent del correu per a correus automàtics (Valor per defecte a php.ini: <b>1%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=E-mail a utilitzar per als e-mails d'error enviats
 MAIN_MAIL_AUTOCOPY_TO= Envia automàticament una còpia oculta de tots els e-mails enviats a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar l'enviament de tots els correus (per fer proves o en llocs tipus demo)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_FORCE_SENDTO=Envieu tots els correus electrònics a (en lloc de destinataris reals, amb finalitats d'assaig)
 MAIN_MAIL_SENDMODE=Mètode d'enviament d'e-mails
 MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP si es requereix autenticació SMTP
 MAIN_MAIL_SMTPS_PW=Contrasenya autentificació SMTP si es requereix autenticació SMTP
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error: no pot utilitzar l'opció @ per reiniciar e
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no es pot usar opció @ si la seqüència (yy) (mm) o (yyyy) (mm) no es troba a la màscara.
 UMask=Paràmetre UMask de nous fitxers en Unix/Linux/BSD.
 UMaskExplanation=Aquest paràmetre determina els drets dels arxius creats en el servidor Dolibarr (durant la pujada, per exemple).<br>Aquest ha de ser el valor octal (per exemple, 0666 significa lectura/escriptura per a tots).<br>Aquest paràmetre no té cap efecte sobre un servidor Windows.
-SeeWikiForAllTeam=Mireu el wiki per a més detalls de tots els actors i de la seva organització
+SeeWikiForAllTeam=Dona un cop d'ull a la wiki per més detalls de tots els actors i la seva organització
 UseACacheDelay= Demora en memòria cau de l'exportació en segons (0 o buit sense memòria)
 DisableLinkToHelpCenter=Amagar l'enllaç "Necessita suport o ajuda" a la pàgina de login
 DisableLinkToHelp=Amaga l'enllaç a l'ajuda en línia "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Canviar el preu on la referència de base és
 MassConvert=Convertir massivament
 String=Cadena
 TextLong=Text llarg
+HtmlText=Text Html
 Int=Enter
 Float=Decimal
 DateAndTime=Data i hora
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Caselles de verificació des de taula
 ExtrafieldLink=Enllaç a un objecte
 ComputedFormula=Camp calculat
 ComputedFormulaDesc=Podeu introduir aquí una fórmula usant altres propietats d'objecte o qualsevol codi PHP per obtenir un valor calculat dinàmic. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador "?" i els següents objectes globals: <strong> $db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong> AVÍS</strong>: Només algunes propietats de $object poden estar disponibles. Si necessiteu una propietat que no s'hagi carregat, tan sols busqueu l'objecte en la formula com en el segon exemple. <br> L'ús d'un camp calculat significa que no podeu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula potser no torni res.  <br><br> Exemple de fórmula: <br> $object->id <10? round($object->id/2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)  <br><br> Exemple de recarrega d'object<br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br> Un altre exemple de fórmula per forçar la càrrega de l'objecte i el seu objecte principal: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'emmagatzema sense xifrar (el camp només ha d'estar amagat amb una estrella sobre la pantalla). <br> Establiu aquí el valor 'auto' per utilitzar la regla de xifrat per defecte per guardar la contrasenya a la base de dades (el valor llegit serà només el "hash", no hi haurà cap manera de recuperar el valor original)
 ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un par del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple : <br>clau1,valor1<br>clau2,valor2<br>clau3,valor3<br>...<br><br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
 ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=Llista de valors que provenen d'una taula<br>Sintaxi:
 ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName: Classpath<br>Sintaxi: ObjectName:Classpath<br>Exemples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Llibreria utilitzada per generar PDF
-WarningUsingFPDF=Atenció: El seu arxiu <b>conf.php</b> conté la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.<br> Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la <a href="http://www.tcpdf.org/" target="_blank"> llibreria TCPDF </a>, i a continuació comentar o eliminar la línia <b>$dolibarr_pdf_force_fpdf=1</b>, i afegir al seu lloc <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
 LocalTaxDesc=Alguns països apliquen 2 o 3 impostos en cada línia de factura. Si aquest és el cas, escull el tipus pel segon i el tercer impost i el seu valor. Els tipus possibles són: <br>1: impostos locals aplicats en productes i serveis sense IVA (l'impost local serà calculat en el total sense impostos)<br>2: impost local aplicat en productes i serveis amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>3: impost local aplicat en productes sense IVA (l'impost local serà calculat en el total sense impost)<br>4: impost local aplicat en productes amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>5: impost local aplicat en serveis sense IVA (l'impost local serà calculat amb el total sense impost)<br>6: impost local aplicat en serveis amb IVA inclòs (l'impost local serà calculat amb el total + IVA)
 SMS=SMS
 LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=El codi comptable depèn del codi del Tercer. El codi està format pel caràcter "C" a la primera posició seguit dels 5 primers caràcters del codi del Tercer.
 Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per aprovar. Noteu que si un usuari te permisos tant per crear com per aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import es superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
-WarningPHPMail=ADVERTÈNCIA: Alguns proveïdors de correu electrònic (com Yahoo) no li permeten enviar un correu electrònic des d'un altre servidor que no sigui el servidor de Yahoo si l'adreça de correu electrònic utilitzada com a remitent és el seu correu correu electrònic de Yahoo (com myemail@yahoo.com, myemail@yahoo.fr, ...). La seva configuració actual utilitza el servidor de l'aplicació per enviar correu electrònic, de manera que alguns destinataris (compatibles amb el protocol restrictiu DMARC) li preguntaran a Yahoo si poden acceptar el seu e-mail i Yahoo respondrà "no" perquè el servidor no és un servidor Propietat de Yahoo, pel que alguns dels seus e-mails enviats poden no ser acceptats.<br>Si el proveïdor de correu electrònic (com Yahoo) té aquesta restricció, ha de canviar la configuració de correu electrònic per a triar el mètode "servidor SMTP" i introdudir el servidor SMTP i credencials proporcionades pel seu proveïdor de correu electrònic (pregunti al seu proveïdor de correu electrònic les credencials SMTP per al seu compte).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=Si el vostre proveïdor SMTP de correu electrònic necessita restringir el client de correu electrònic a algunes adreces IP (molt poc freqüent), aquesta és l'adreça IP de la vostra aplicació ERP CRM: <strong>%s</strong>.
 ClickToShowDescription=Clica per mostrar la descripció
 DependsOn=Aquest mòdul necesita el/s mòdul/s
 RequiredBy=Aquest mòdul és requerit pel/s mòdul/s
@@ -468,6 +470,11 @@ WatermarkOnDraftExpenseReports=Marca d'aigua en informes de despeses esborrany
 AttachMainDocByDefault=Establiu-lo a 1 si voleu adjuntar el document principal al correu electrònic de manera predeterminada (si escau)
 FilesAttachedToEmail=Adjuntar fitxer
 SendEmailsReminders=Enviar recordatoris d'agenda per correu electrònic
+<<<<<<< HEAD
+davDescription=Add a component to be a DAV server
+=======
+davDescription=Afegeix un component per ser un servidor DAV
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 # Modules
 Module0Name=Usuaris i grups
 Module0Desc=Gestió d'usuaris / empleats i grups
@@ -619,6 +626,8 @@ Module59000Name=Marges
 Module59000Desc=Mòdul per gestionar els marges
 Module60000Name=Comissions
 Module60000Desc=Mòdul per gestionar les comissions
+Module62000Name=Incoterm
+Module62000Desc=Afegir funcions per gestionar Incoterm
 Module63000Name=Recursos
 Module63000Desc=Gestiona els recursos (impressores, cotxes, habitacions...) que pots compartir en esdeveniments
 Permission11=Consulta factures de client
@@ -833,11 +842,21 @@ Permission1251=Llançar les importacions en massa a la base de dades (càrrega d
 Permission1321=Exporta factures de clients, atributs i cobraments
 Permission1322=Reobrir una factura pagada
 Permission1421=Exporta comandes de clients i atributs
-Permission20001=Consulta els dies de lliures disposició (propis i subordinats)
-Permission20002=Crea/modifica els teus dies lliures retribuïts
+<<<<<<< HEAD
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
+=======
+Permission20001=Consulta els dies de lliure disposició (els propis i els dels teus subordinats)
+Permission20002=Crea/modifica els teus dies de lliure disposició (els propis i els dels teus subordinats)
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Permission20003=Elimina les peticions de dies lliures retribuïts
+<<<<<<< HEAD
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+=======
 Permission20004=Consulta tots els dies de lliure disposició (inclòs els usuaris no subordinats)
-Permission20005=Crea/modifica dies lliures retribuïts per tothom
+Permission20005=Crea/modifica els dies de lliure disposició per tothom (inclòs els usuaris no subordinats)
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç)
 Permission23001=Consulta les tasques programades
 Permission23002=Crear/Modificar les tasques programades
@@ -884,6 +903,7 @@ DictionaryRevenueStamp=Imports de segells fiscals
 DictionaryPaymentConditions=Condicions de pagament
 DictionaryPaymentModes=Modes de pagament
 DictionaryTypeContact=Tipus de contactes/adreces
+DictionaryTypeOfContainer=Tipus de pàgines web / contenidors
 DictionaryEcotaxe=Barems CEcoParticipación (DEEE)
 DictionaryPaperFormat=Formats paper
 DictionaryFormatCards=Formats de fitxes
@@ -994,7 +1014,7 @@ DefaultLanguage=Idioma per defecte a utilitzar (codi d'idioma)
 EnableMultilangInterface=Activar interface multiidioma
 EnableShowLogo=Mostra el logotip en el menú de l'esquerra
 CompanyInfo=Informació de l'empresa/organització
-CompanyIds=Identitats de l'empresa/organització
+CompanyIds=Identificació reglamentària
 CompanyName=Nom/Raó social
 CompanyAddress=Adreça
 CompanyZip=Codi postal
@@ -1049,6 +1069,7 @@ AreaForAdminOnly=Els paràmetres de configuració només poden ser establerts pe
 SystemInfoDesc=La informació del sistema és informació tècnica accessible només en només lectura als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només és accessible als usuaris de tipus administradors. Cap permís Dolibarr permet estendre el cercle de usuaris autoritzats a aquesta áera.
 CompanyFundationDesc=Edita en aquesta pàgina tota la informació coneguda sobre l'empresa o entitat a administrar (Fes clic al botó "Modificar" o "Desar" a peu de pàgina)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Selecciona els paràmetres relacionats amb l'aparença de Dolibarr
 AvailableModules=Mòduls/complements disponibles
 ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici->Configuració->Mòduls).
@@ -1441,6 +1462,15 @@ SyslogFilename=Nom i ruta de l'arxiu
 YouCanUseDOL_DATA_ROOT=Utilitza DOL_DATA_ROOT/dolibarr.log per un fitxer de registre en la carpeta documents de Dolibarr. Tanmateix, es pot definir una carpeta diferent per guardar aquest fitxer.
 ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda
 OnlyWindowsLOG_USER=Windows només suporta LOG_USER
+<<<<<<< HEAD
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Còpies del log
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+=======
+CompressSyslogs=Compressió i còpia de seguretat d'arxius Syslog
+SyslogFileNumberOfSaves=Còpies del log
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configura la tasca programada de neteja per establir la freqüència de còpia de seguretat del registre
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ##### Donations #####
 DonationsSetup=Configuració del mòdul donacions
 DonationsReceiptModel=Plantilla de rebut de donació
@@ -1537,10 +1567,20 @@ FailedToInitializeMenu=Error al inicialitzar el menú
 ##### Tax #####
 TaxSetup=Configuració del mòdul d'impostos varis i dividends
 OptionVatMode=Opció de càrrega d'IVA
-OptionVATDefault=Efectiu
+<<<<<<< HEAD
+OptionVATDefault=Standard basis
+=======
+OptionVATDefault=Base estàndard
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 OptionVATDebitOption=Dèbit
 OptionVatDefaultDesc=La càrrega de l'IVA és: <br>-en l'enviament dels béns (en la pràctica s'usa la data de la factura)<br>-sobre el pagament pels serveis
 OptionVatDebitOptionDesc=La càrrega de l'IVA és: <br>-en l'enviament dels béns en la pràctica s'usa la data de la factura<br>-sobre la facturació dels serveis
+<<<<<<< HEAD
+OptionPaymentForProductAndServices=Cash basis for products and services
+=======
+OptionPaymentForProductAndServices=Base de caixa de productes i serveis
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilitat per defecte l'IVA per a l'opció escollida:
 OnDelivery=Al lliurament
 OnPayment=Al pagament
@@ -1718,6 +1758,11 @@ MailToSendContract=Per a enviar un contracte
 MailToThirdparty=Per enviar correu electrònic des de la pàgina del tercer
 MailToMember=Enviar correu electrònic des de la pàgina del membre
 MailToUser=Enviar correu electrònic des de la pàgina d'usuari
+<<<<<<< HEAD
+MailToProject= To send email from project page
+=======
+MailToProject= Enviar correu electrònic des de la pàgina de projecte
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
 TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de versió (ets lliure d'utilitzar-ho a les teves webs)
@@ -1764,9 +1809,17 @@ MAIN_PDF_MARGIN_LEFT=Marge esquerre al PDF
 MAIN_PDF_MARGIN_RIGHT=Marge dret al PDF
 MAIN_PDF_MARGIN_TOP=Marge superior al PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Estableixi a SÍ si aquest grup és un càlcul d'altres grups
+EnterCalculationRuleIfPreviousFieldIsYes=Introduïu la regla de càlculs si el camp anterior ha estat posat a SÍ (Per exemple 'CODEGRP1 + CODEGRP2')
+<<<<<<< HEAD
+SeveralLangugeVariatFound=Several language variants found
+=======
+SeveralLangugeVariatFound=S'ha trobat diverses variants d'idiomes
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuració del mòdul Recurs
 UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable)
-DisabledResourceLinkUser=Recurs d'enllaç a usuari deshabilitat
-DisabledResourceLinkContact=Recurs d'enllaç a contacte deshabilitat
+DisabledResourceLinkUser=Desactiva la funció per enllaçar un recurs als usuaris
+DisabledResourceLinkContact=Desactiva la funció per enllaçar un recurs als contactes
 ConfirmUnactivation=Confirma el restabliment del mòdul
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index f5ed7d7f921..c82c124e0f5 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Soci %s validat
 MemberModifiedInDolibarr=Soci %s modificat
 MemberResiliatedInDolibarr=Membre %s acabat
 MemberDeletedInDolibarr=Soci %s eliminat
-MemberSubscriptionAddedInDolibarr=Subscripció del soci %s afegida
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Expedició %s validada
 ShipmentClassifyClosedInDolibarr=Expedició %s classificada com a facturada
 ShipmentUnClassifyCloseddInDolibarr=Expedició %s classificada com a reoberta
@@ -98,6 +100,7 @@ AgendaUrlOptions3=<b>logina=%s</b> ​​per a restringir insercions a les accio
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ​​per a restringir la producció d'accions que no pertanyen a l'usuari <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> per a restringir la producció d'accions assignades a l'usuari <b>%s</b> (propietari i altres).
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> per a restringir la sortida d'accions associades al projecta <b>PROJECT_ID</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> per excloure l'acció automàtica.
 AgendaShowBirthdayEvents=Mostra aniversaris dels contactes
 AgendaHideBirthdayEvents=Oculta aniversaris dels contactes
 Busy=Ocupat
@@ -109,7 +112,7 @@ ExportCal=Exportar calendari
 ExtSites=Calendaris externs
 ExtSitesEnableThisTool=Mostrar calendaris externs (definint a la configuració global) a l'agenda. No afecta als calendaris externs definits per l'usuari
 ExtSitesNbOfAgenda=Nombre de calendaris
-AgendaExtNb=Calendari nº %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical
 ExtSiteNoLabel=Sense descripció
 VisibleTimeRange=Rang de temps visible
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 38ae58f13e5..220d5a62766 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Reemborsat
 DeletePayment=Elimina el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
 ReceivedCustomersPayments=Cobraments rebuts de clients
@@ -91,7 +92,7 @@ PaymentAmount=Import pagament
 ValidatePayment=Validar aquest pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
 HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
-HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és més alt que el que s'ha de pagar <br>Editeu l'entrada, en cas contrari confirmeu.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classificar 'Pagat'
 ClassifyPaidPartially=Classificar 'Pagat parcialment'
 ClassifyCanceled=Classificar 'Abandonat'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convertir en reducció futura
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
 EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Estat de factures generades
 BillStatusDraft=Esborrany (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Reemborsada o convertida en descompte
-BillStatusConverted=Convertida en reducció
+BillStatusConverted=Pagada (llesta per utilitzar-se en factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
 BillStatusStarted=Pagada parcialment
@@ -220,6 +222,7 @@ RemainderToPayBack=Import pendent per reemborsar
 Rest=Pendent
 AmountExpected=Import reclamat
 ExcessReceived=Rebut en excés
+ExcessPaid=Excess paid
 EscompteOffered=Descompte (pagament aviat)
 EscompteOfferedShort=Descompte
 SendBillRef=Enviament de la factura %s
@@ -283,16 +286,20 @@ Deposit=Bestreta
 Deposits=Bestretes
 DiscountFromCreditNote=Descompte resultant del abonament %s
 DiscountFromDeposit=Pagaments de la factura de bestreta %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Aquest tipus de crèdit no es pot utilitzar en una factura abans de la seva validació
 CreditNoteDepositUse=La factura deu estar validada per a utilitzar aquest tipus de crèdits
 NewGlobalDiscount=Nou descompte fixe
 NewRelativeDiscount=Nou descompte
+DiscountType=Tipus de descompte
 NoteReason=Nota/Motiu
 ReasonDiscount=Motiu
 DiscountOfferedBy=Acordat per
 DiscountStillRemaining=Descomptes disponibles
 DiscountAlreadyCounted=Descomptes ja consumits
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Descomptes de proveïdor
 BillAddress=Direcció de facturació
 HelpEscompte=Un <b>descompte</b> és un descompte acordat sobre una factura donada, a un client que va realitzar el seu pagament molt abans del venciment.
 HelpAbandonBadCustomer=Aquest import es va abandonar (client jutjat com morós) i es considera com una pèrdua excepcional.
@@ -341,10 +348,17 @@ NextDateToExecution=Data de la propera generació de factures
 NextDateToExecutionShort=Data següent gen.
 DateLastGeneration=Data de l'última generació
 DateLastGenerationShort=Data última gen.
-MaxPeriodNumber=Nº màxim de generació de factures
-NbOfGenerationDone=Nº de generació de factura ja realitzat
-NbOfGenerationDoneShort=Nb de generació fet
-MaxGenerationReached=Nº màxim de generacions assollit
+<<<<<<< HEAD
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+=======
+MaxPeriodNumber=Número màxim de generació de factures
+NbOfGenerationDone=Número de generació de factura ja realitzat
+NbOfGenerationDoneShort=Número de generació realitzat
+MaxGenerationReached=Número màxim de generacions aconseguides
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 InvoiceAutoValidate=Valida les factures automàticament
 GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s
 DateIsNotEnough=Encara no s'ha arribat a la data
@@ -521,3 +535,7 @@ BillCreated=%s càrrec(s) creats
 StatusOfGeneratedDocuments=Estat de la generació de documents
 DoNotGenerateDoc=No generar cap fitxer de document
 AutogenerateDoc=Genera automàticament el fitxer del document
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 2386918a338..684b87aa3f5 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -43,6 +43,7 @@ Individual=Particular
 ToCreateContactWithSameName=Es crearà un contacte/adreça automàticament amb la mateixa informació que el tercer d'acord amb el propi tercer. En la majoria de casos, fins i tot si el tercer és una persona física, la creació d'un sol tercer ja és suficient.
 ParentCompany=Seu Central
 Subsidiaries=Filials
+ReportByMonth=Informe per mes
 ReportByCustomers=Informe per client
 ReportByQuarter=Informe per taxa
 CivilityCode=Codi cortesia
@@ -75,10 +76,12 @@ Town=Població
 Web=Web
 Poste= Càrrec
 DefaultLang=Idioma per defecte
-VATIsUsed=Subjecte a IVA
-VATIsNotUsed=No subjecte a IVA
+VATIsUsed=IVA està utilitzant-se
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=IVA no està utilitzant-se
 CopyAddressFromSoc=Omple l'adreça amb l'adreça del tercer
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tercer ni client ni proveïdor, no hi ha objectes vinculats disponibles
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Compte bancari de pagament
 OverAllProposals=Pressupostos
 OverAllOrders=Comandes
@@ -239,7 +242,7 @@ ProfId3TN=CNAE
 ProfId4TN=CCC
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN) <i>associat a l'Administració de taxes dels USA</i>
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,51 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=CIF/NIF Intracomunitari
-VATIntraShort=CIF/NIF Intra.
+VATIntra=ID IVA
+VATIntraShort=ID impost
 VATIntraSyntaxIsValid=Sintaxi vàlida
+VATReturn=Devolució de l'IVA
 ProspectCustomer=Client potencial/Client
 Prospect=Client potencial
 CustomerCard=Fitxa client
 Customer=Client
 CustomerRelativeDiscount=Descompte client relatiu
+<<<<<<< HEAD
+SupplierRelativeDiscount=Relative supplier discount
+=======
+SupplierRelativeDiscount=Descompte relatiu de proveïdor
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 CustomerRelativeDiscountShort=Descompte relatiu
 CustomerAbsoluteDiscountShort=Descompte fixe
 CompanyHasRelativeDiscount=Aquest client té un descompte per defecte de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Aquest client no té descomptes relatius per defecte
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+<<<<<<< HEAD
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
+=======
+HasNoRelativeDiscountFromSupplier=No tens descomptes relatius per defecte d'aquest proveïdor
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Aquest client té un descompte disponible (comercial, de pagament) per a <b>%s</b>%s
 CompanyHasCreditNote=Aquest client encara té abonaments per <b>%s</b> %s
+<<<<<<< HEAD
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+=======
+HasNoAbsoluteDiscountFromSupplier=No tens crèdit disponible per descomptar d'aquest proveïdor
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Aquest client no té més descomptes fixos disponibles
-CustomerAbsoluteDiscountAllUsers=Descomptes fixos en curs (acordat per tots els usuaris)
-CustomerAbsoluteDiscountMy=Descomptes fixos en curs (acordats personalment)
+<<<<<<< HEAD
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+=======
+CustomerAbsoluteDiscountAllUsers=Descomptes absoluts dels clients (concedits per tots els usuaris)
+CustomerAbsoluteDiscountMy=Descomptes absoluts dels clients (concedits per tu mateix)
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Cap
 Supplier=Proveïdor
 AddContact=Crear contacte
@@ -377,9 +407,13 @@ NoDolibarrAccess=Sense accés d'usuari
 ExportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
 ExportDataset_company_2=Contactes de tercers i atributs
 ImportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
+<<<<<<< HEAD
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+=======
 ImportDataset_company_2=Contactes/Adreces (de tercers o no) i atributs
-ImportDataset_company_3=Comptes bancaris
-ImportDataset_company_4=Tercers/Agents comercials (afecta als usuaris agents comercials en empreses)
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+ImportDataset_company_3=Comptes bancaris de tercers
+ImportDataset_company_4=Tercers/Comercials (Assigna usuaris comercials a tercers)
 PriceLevel=Nivell de preus
 DeliveryAddress=Adreça d'enviament
 AddAddress=Afegeix adreça
@@ -406,15 +440,16 @@ ProductsIntoElements=Llistat de productes/serveis en %s
 CurrentOutstandingBill=Factura pendent actual
 OutstandingBill=Max. de factures pendents
 OutstandingBillReached=S'ha arribat al màx. de factures pendents
+OrderMinAmount=Import mínim per comanda
 MonkeyNumRefModelDesc=Retorna un número sota el format %syymm-nnnn per als codis de clients  i %syymm-nnnn per als codis dels proveïdors, on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0.
 LeopardNumRefModelDesc=Codi de client/proveïdor lliure sense verificació. Pot ser modificat en qualsevol moment.
 ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
 MergeOriginThirdparty=Duplicar tercer (tercer que vols eliminar)
 MergeThirdparties=Fusionar tercers
 ConfirmMergeThirdparties=Estàs segur que vols fusionar aquest tercer amb l'actual? Tots els objectes relacionats (factures, comandes, ...) seran traslladats al tercer actual, i l'anterior duplicat serà esborrat.
-ThirdpartiesMergeSuccess=Els tercers han sigut fusionats
+ThirdpartiesMergeSuccess=S'han fusionat els tercers
 SaleRepresentativeLogin=Nom d'usuari de l'agent comercial
 SaleRepresentativeFirstname=Nom de l'agent comercial
 SaleRepresentativeLastname=Cognoms de l'agent comercial
-ErrorThirdpartiesMerge=Hi ha un error esborrant els tercers. Revisa el log. Els canvis no s'han desat.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Nou codi de client o proveïdor proposat en cas de codi duplicat
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index bdcf62ac548..c6a94b93fb1 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Financera
 TaxModuleSetupToModifyRules=Ves a la <a href="%s">Configuració mòdul impostos</a> per modificar les regles de càlcul
 TaxModuleSetupToModifyRulesLT=Ves a la <a href="%s">Configuració de l'empresa</a> per modificar les regles de càlcul
 OptionMode=Opció de gestió comptable
@@ -103,6 +103,7 @@ LT2PaymentsES=Pagaments IRPF
 VATPayment=Pagament d'impost de vendes
 VATPayments=Pagaments d'impost de vendes
 VATRefund=Devolució IVA
+NewVATPayment=New sales tax payment
 Refund=Devolució
 SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
@@ -157,30 +158,40 @@ RulesResultDue=- Inclou les factures pendents, despeses, IVA, donacions estiguen
 RulesResultInOut=- Inclou els pagaments reals realitzats en les factures, les despeses, l'IVA i els salaris. <br> - Es basa en les dates de pagament de les factures, les despeses, l'IVA i els salaris. La data de la donació per a la donació.
 RulesCADue=- Inclou les factures degudes del client estiguen pagades o no. <br> - Es basa en la data de la validació d'aquestes factures. <br>
 RulesCAIn=- Inclou els pagaments efectuats de les factures a clients.<br>- Es basa en la data de pagament de les mateixes<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPredefined=Inclou un registre al vostre Llibre amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre amb comptes comptables <b> agrupats per grups personalitzats </b>
 SeePageForSetup=Veure el menú <a href="%s"> %s </a> per configurar-lo
 DepositsAreNotIncluded=- Les factures de bestreta no estan incloses
 DepositsAreIncluded=- Les factures de bestreta estan incloses
-LT2ReportByCustomersInInputOutputModeES=Informe per tercer del IRPF
-LT1ReportByCustomersInInputOutputModeES=Informe de RE per tercers
-VATReport=Informe d'IVA
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Informe de RE per tercers
+LT2ReportByCustomersES=Informe per tercer del IRPF
+<<<<<<< HEAD
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
+=======
+VATReport=Informe d'IVA de vendes
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Informe d'IVA sobre vendes per client
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat
-VATReportByCustomersInDueDebtMode=Informe per clients d'IVA cobrat i pagat
-VATReportByQuartersInInputOutputMode=Informe per tipus d'IVA cobrat i pagat
-LT1ReportByQuartersInInputOutputMode=Informe per taxa de RE
-LT2ReportByQuartersInInputOutputMode=Informe per taxa de IRPF
-VATReportByQuartersInDueDebtMode=Informe per tipus d'IVA cobrat i pagat
-LT1ReportByQuartersInDueDebtMode=Informe per taxa de RE
-LT2ReportByQuartersInDueDebtMode=Informe per taxa de IRPF
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Informe per taxa de RE
+LT2ReportByQuartersES=Informe per taxa de IRPF
 SeeVATReportInInputOutputMode=Veure l'informe <b>%sIVA pagat%s </b> per a un mode de càlcul estàndard
 SeeVATReportInDueDebtMode=Veure l'informe <b>%s IVA degut%s </b> per a un mode de càlcul amb l'opció sobre el degut
 RulesVATInServices=- Per als serveis, l'informe inclou la normativa de l'IVA rebuts o emesos en base a la data de pagament.
-RulesVATInProducts=- Per als béns materials, inclou l'IVA de les factures en base a la data de la factura.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Per als serveis, l'informe inclou l'IVA de les factures degudes, pagades o no basant-se en la data d'aquestes factures.
-RulesVATDueProducts=- Per als béns materials, inclou l'IVA de les factures en base a la data de la factura.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Nota: Per als béns materials, caldria utilitzar la data de lliurament per per ser més just.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/factura
 NotUsedForGoods=No utilitzat per als béns
 ProposalStats=Estadístiques de pressupostos
@@ -213,8 +224,8 @@ CalculationRuleDescSupplier=D'acord amb el proveïdor, tria el mètode apropiat
 TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode <b>comptabilitat de caixa </b> no és rellevant. Aquest informe només està disponible quan s'utilitza el mode <b>compromís comptable</b>(consulteu la configuració del mòdul de comptabilitat).
 CalculationMode=Mode de càlcul
 AccountancyJournal=Diari de codi de comptable
-ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable per defecte per a IVA repercutit - IVA a les vendes (utilitzat si no ha estat definit al diccionari de IVA)
-ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable per defecte per a IVA suportat - IVA a les compres (utilitzat si no ha estat definit al diccionari de IVA)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable per defecte per IVA pagat
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=El compte comptable dedicat definit a la fitxa de tercers només s'utilitzarà per al Llibre Major. Aquest serà utilitzat pel Llibre Major i com a valor predeterminat del subcompte si no es defineix un compte comptable a la fitxa del tercer.
@@ -236,3 +247,4 @@ ErrorBankAccountNotFound=Error: no s'ha trobat el compte bancari
 FiscalPeriod=Període comptable
 ListSocialContributionAssociatedProject=Llista de contribucions socials associades al projecte
 DeleteFromCat=Elimina del grup comptable
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index cc612a96d28..243a8302d80 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -43,7 +43,11 @@ CronNoJobs=Sense treballs actualment
 CronPriority=Prioritat
 CronLabel=Etiqueta
 CronNbRun=Nº execucions
-CronMaxRun=Nº màx. d'exec.
+<<<<<<< HEAD
+CronMaxRun=Max number launch
+=======
+CronMaxRun=Número màxim d'execucions
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 CronEach=Tota (s)
 JobFinished=Tasques llançades i finalitzades
 #Page card
@@ -74,9 +78,10 @@ CronFrom=De
 CronType=Tipus de tasca
 CronType_method=Mètode per cridar una classe PHP
 CronType_command=Comando Shell
-CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s
+CronCannotLoadClass=Impossible carregar el fitxer de la classe %s (per utilitzar la classe %s)
+CronCannotLoadObject=El "class file" %s s'ha carregat, però l'objecte %s no s'ha trobat dins d'ell
 UseMenuModuleToolsToAddCronJobs=Ves a menú "Inici - Utilitats de sistema - Tasques programades" per veure i editar les tasques programades.
 JobDisabled=Tasca desactivada
 MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
-MakeLocalDatabaseDump=Crear un bolcat de la base de dades local. Els paràmetres són: compressió ('gz' o 'bz' o 'none'), tipus de còpia de seguretat ('mysql' o 'pgsql'), 1, 'auto' o nom de fitxer per a compilar, nombre de fitxers de còpia de seguretat per conservar
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index f737a0d9c89..567fbe97d15 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=La configuració Dolibarr-LDAP és incompleta.
 ErrorLDAPMakeManualTest=S'ha creat un arxiu .ldif a la carpeta %s. Intenta carregar-lo manualment des de la línia de comandes per tenir més informació sobre l'error.
 ErrorCantSaveADoneUserWithZeroPercentage=No es pot canviar una acció al estat no començada si teniu un usuari realitzant de l'acció.
 ErrorRefAlreadyExists=La referència utilitzada per a la creació ja existeix
-ErrorPleaseTypeBankTransactionReportName=Si us plau, tecleja el nom del comunicat del banc a on s'informa de l'entrada (format AAAAMM o AAAAMMDD)
+ErrorPleaseTypeBankTransactionReportName=Si us plau, tecleja el nom del extracte bancari on s'informa del registre (format AAAAMM o AAAAMMDD)
 ErrorRecordHasChildren=No s'ha pogut eliminar el registre, ja que té alguns registres fills.
 ErrorRecordHasAtLeastOneChildOfType=L'objecte té almenys un fill de tipus %s
 ErrorRecordIsUsedCantDelete=No es pot eliminar el registre. S'està utilitzant o incloent en un altre objecte.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=S'ha produït un error en intentar afegir un regis
 ErrorFailedToRemoveToMailmanList=Error en l'eliminació de %s de la llista Mailmain %s o base SPIP
 ErrorNewValueCantMatchOldValue=El Nou valor no pot ser igual al antic
 ErrorFailedToValidatePasswordReset=No s'ha pogut restablir la contrasenya. És possible que aquest enllaç ja s'hagi utilitzat (aquest enllaç només es pot utilitzar una vegada). Si no és el cas prova de reiniciar el procés de restabliment de contrasenya des del principi.
-ErrorToConnectToMysqlCheckInstance=Error de connexió amb el servidor de la base de dades. Comprovi que MySQL està funcionant (en la majoria dels casos, pot executar des de la línia d'ordres utilitzant el comandament 'etc sudo /etc/ init.d/mysql start).
+ErrorToConnectToMysqlCheckInstance=Error de connexió amb la base de dades. Comprovi que el servidor de la base de dades està funcionant (per exemple, amb mysql/mariadb, pot iniciar-lo amb el comandament 'sudo service mysql start')
 ErrorFailedToAddContact=Error en l'addició del contacte
 ErrorDateMustBeBeforeToday=La data no pot ser més gran que avui
 ErrorPaymentModeDefinedToWithoutSetup=S'ha establert la forma de pagament al tipus %s però a la configuració del mòdul de factures no s'ha indicat la informació per mostrar aquesta forma de pagament.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=El descompte que intenteu aplica
 ErrorFileNotFoundWithSharedLink=No s'ha trobat el fitxer. Pot ser que la clau compartida s'hagi modificat o el fitxer s'hagi eliminat recentment.
 ErrorProductBarCodeAlreadyExists=El codi de barres de producte %s ja existeix en la referència d'un altre producte.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tingueu en compte també que no és possible tenir un producte virtual amb auto increment/decrement de subproductes quan almenys un subproducte (o subproducte de subproductes) necessita un número de sèrie/lot.
+ErrorDescRequiredForFreeProductLines=La descripció és obligatòria per a línies amb producte de lliure edició
 
 # Warnings
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Algunes vegades es van registrar per alguns u
 WarningYourLoginWasModifiedPleaseLogin=El teu login s'ha modificat. Per seguretat has de fer login amb el nou login abans de la següent acció.
 WarningAnEntryAlreadyExistForTransKey=Ja existeix una entrada per la clau de traducció d'aquest idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Advertència: el nombre de destinataris diferents està limitat a <b>%s</b> quan s'utilitzen les accions massives sobre llistes
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index 01fb41eabea..f24eaf1d822 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -16,7 +16,12 @@ CancelCP=Anul·lada
 RefuseCP=Rebutjada
 ValidatorCP=Validador
 ListeCP=Llista de dies lliures
+LeaveId=Identificador de baixa
 ReviewedByCP=Serà revisada per
+UserForApprovalID=Usuari per al ID d'aprovació
+UserForApprovalFirstname=Nom de l'usuari d'aprovació
+UserForApprovalLastname=Cognom de l'usuari d'aprovació
+UserForApprovalLogin=Login de l'usuari d'aprovació
 DescCP=Descripció
 SendRequestCP=Enviar la petició de dies lliures
 DelayToRequestCP=Les peticions de dies lliures s'han de realitzar al menys <b>%s dies</b> abans.
@@ -30,7 +35,20 @@ ErrorUserViewCP=No esta autoritzat a llegir aquesta petició de dies lliures.
 InfosWorkflowCP=Informació del workflow
 RequestByCP=Comandada per
 TitreRequestCP=Fitxa de dies lliures
+TypeOfLeaveId=Tipus d'identificador de baixa
+TypeOfLeaveCode=Tipus de codi de baixa
+TypeOfLeaveLabel=Tipus d'etiqueta de baixa
 NbUseDaysCP=Nombre de dies lliures consumits
+<<<<<<< HEAD
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+=======
+NbUseDaysCPShort=Dies consumits
+NbUseDaysCPShortInMonth=Dies consumits al mes
+DateStartInMonth=Data d'inici al mes
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+DateEndInMonth=End date in month
 EditCP=Modificar
 DeleteCP=Eliminar
 ActionRefuseCP=Rebutja
@@ -59,6 +77,7 @@ DateRefusCP=Data del rebuig
 DateCancelCP=Data de l'anul·lació
 DefineEventUserCP=Assignar permís excepcional a un usuari
 addEventToUserCP=Assignar aquest permís
+NotTheAssignedApprover=No sou l'aprovador assignat
 MotifCP=Motiu
 UserCP=Usuari
 ErrorAddEventToUserCP=S'ha produït un error en l'assignació del permís excepcional.
@@ -81,7 +100,16 @@ EmployeeFirstname=Nom de l'empleat
 TypeWasDisabledOrRemoved=El tipus de dia lliure (id %s) ha sigut desactivat o eliminat
 LastHolidays=Les darreres %s sol·licituds de permís
 AllHolidays=Totes les sol·licituds de permís
-
+HalfDay=Mig dia
+NotTheAssignedApprover=No sou l'aprovador assignat
+LEAVE_PAID=Vacances pagades
+<<<<<<< HEAD
+LEAVE_SICK=Sick leave
+=======
+LEAVE_SICK=Baixa per enfermetat
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Vacances pagades
 ## Configuration du Module ##
 LastUpdateCP=Última actualització automàtica de reserva de dies lliures
 MonthOfLastMonthlyUpdate=Mes de l'última actualització automàtica de reserva de dies lliures
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
index d5e6aa930d2..a759cfa5cfc 100644
--- a/htdocs/langs/ca_ES/loan.lang
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -50,4 +50,10 @@ ConfigLoan=Configuració del mòdul de préstecs
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable del capital per defecte
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable per al interès per defecte
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable de l'assegurança per defecte
-CreateCalcSchedule=Crear/Modificar venciments de préstecs
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+<<<<<<< HEAD
+InterestAmount=Interest amount
+=======
+InterestAmount=Import d'interès
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 820d17094f1..12f60619fa8 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -78,6 +78,11 @@ ResultOfMailSending=Resultat de l'enviament massiu d'e-mails
 NbSelected=Nº seleccionats
 NbIgnored=Nº ignorats
 NbSent=Nº enviats
+<<<<<<< HEAD
+SentXXXmessages=%s message(s) sent.
+=======
+SentXXXmessages=%s missatge(s) enviat(s).
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contacte amb filtres de client
 MailingModuleDescContactsByCompanyCategory=Contactes per categoria de tercer
@@ -135,7 +140,7 @@ NbOfTargetedContacts=Número actual de contactes destinataris d'e-mails
 UseFormatFileEmailToTarget=El fitxer importat ha de tenir el format <strong>email;nom;cognom;altre</strong>
 UseFormatInputEmailToTarget=Entra una cadena amb el format <strong>email;nom;cognom;altre</strong>
 MailAdvTargetRecipients=Destinataris (selecció avançada)
-AdvTgtTitle=Omple els camps d'entrada per preseleccionar els tercers o contactes a marcar
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Utilitza %% com a caràcter màgic. Per exemple per trobar tots els registres que siguin com <b>josefina, jordina, joana</b> pots posar <b>jo%%</b>. També pots utilitzar el separador ; pels valors, i utilitzar ! per excepcions de valors. Per exemple <b>josefina;jordina;joa%%;!joan;!joaq%</b> mostrarà totes les josefina, jordina, i els noms que comencin per joa excepte els joan i els que comencin per joaq
 AdvTgtSearchIntHelp=Utilitza un interval per seleccionar un valor enter o decimal
 AdvTgtMinVal=Valor mínim
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 0212f228c9c..57aeb431d9a 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -64,12 +64,22 @@ ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al paí
 ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost varis definit per al país '%s'.
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
 ErrorCannotAddThisParentWarehouse=Està intentant afegir un magatzem pare que ja és fill de l'actual
-MaxNbOfRecordPerPage=Nº màxim de registres per pàgina
+<<<<<<< HEAD
+MaxNbOfRecordPerPage=Max number of record per page
+=======
+MaxNbOfRecordPerPage=Número màxim de registres per pàgina
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 NotAuthorized=No està autoritzat per fer-ho.
 SetDate=Indica la data
 SelectDate=Seleccioneu una data
 SeeAlso=Veure també %s
 SeeHere=Mira aquí
+ClickHere=Fes clic aquí
+<<<<<<< HEAD
+Here=Here
+=======
+Here=Aquí
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Apply=Aplicar
 BackgroundColorByDefault=Color de fons
 FileRenamed=L'arxiu s'ha renombrat correctament
@@ -185,6 +195,7 @@ ToLink=Enllaç
 Select=Seleccionar
 Choose=Escollir
 Resize=Redimensionar
+ResizeOrCrop=Resize or Crop
 Recenter=Enquadrar
 Author=Autor
 User=Usuari
@@ -325,8 +336,14 @@ Default=Defecte
 DefaultValue=Valor per defecte
 DefaultValues=Valors per defecte
 Price=Preu
+<<<<<<< HEAD
+PriceCurrency=Price (currency)
+=======
+PriceCurrency=Preu (moneda)
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 UnitPrice=Preu unitari
 UnitPriceHT=Preu base
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Preu unitari total
 PriceU=P.U.
 PriceUHT=P.U.
@@ -334,6 +351,7 @@ PriceUHTCurrency=U.P (moneda)
 PriceUTTC=Preu unitari (IVA inclòs)
 Amount=Import
 AmountInvoice=Import factura
+AmountInvoiced=Import facturat
 AmountPayment=Import pagament
 AmountHTShort=Base imp.
 AmountTTCShort=Import
@@ -353,6 +371,7 @@ AmountLT2ES=Import IRPF
 AmountTotal=Import total
 AmountAverage=Import mitjà
 PriceQtyMinHT=Preu quantitat min total
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentatge
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +408,8 @@ LT2ES=IRPF
 LT1IN=RE
 LT2IN=IRPF
 VATRate=Taxa IVA
+VATCode=Codi de la taxa impositiva
+VATNPR=Taxa impositiva NPR
 DefaultTaxRate=Tipus impositiu per defecte
 Average=Mitja
 Sum=Suma
@@ -420,6 +441,7 @@ ActionDoneShort=Acabat
 ActionUncomplete=Incomplet
 LatestLinkedEvents=Darrers %s esdeveniments vinculats
 CompanyFoundation=Empresa/Organització
+Accountant=Accountant
 ContactsForCompany=Contactes d'aquest tercer
 ContactsAddressesForCompany=Contactes/adreces d'aquest tercer
 AddressesForCompany=Adreces d'aquest tercer
@@ -427,6 +449,13 @@ ActionsOnCompany=Esdeveniments respecte aquest tercer
 ActionsOnMember=Esdeveniments d'aquest soci
 ActionsOnProduct=Esdeveniments sobre aquest producte
 NActionsLate=%s en retard
+ToDo=A realitzar
+<<<<<<< HEAD
+Completed=Completed
+=======
+Completed=Finalitzat
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+Running=En progrés
 RequestAlreadyDone=Sol·licitud ja recollida
 Filter=Filtre
 FilterOnInto=Criteri de cerca '<strong>%s</strong>' en els camps %s
@@ -704,6 +733,8 @@ WarningYouAreInMaintenanceMode=Atenció, està en mode manteniment, així que no
 CoreErrorTitle=Error del sistema
 CoreErrorMessage=Ho sentim, hi ha un error. Contacti amb el seu administrador del sistema per a comprovar els "logs" o des-habilita $dolibarr_main_prod=1 per a obtenir més informació.
 CreditCard=Targeta de crèdit
+ValidatePayment=Validar aquest pagament
+CreditOrDebitCard=Tarja de crèdit o dèbit
 FieldsWithAreMandatory=Els camps marcats per un <b>%s</b> són obligatoris
 FieldsWithIsForPublic=Els camps marcats per <b>%s</b> es mostren en la llista pública de socis. Si no voleu veure'ls, desactiveu la casella "públic".
 AccordingToGeoIPDatabase=(Obtingut per conversió GeoIP)
@@ -808,8 +839,8 @@ ConfirmMassDeletion=Confirmació d'esborrament massiu
 ConfirmMassDeletionQuestion=Esteu segur que voleu suprimir el registre seleccionat %s?
 RelatedObjects=Objectes relacionats
 ClassifyBilled=Classificar facturat
+ClassifyUnbilled=Classificar no facturat
 Progress=Progrés
-ClickHere=Fes clic aquí
 FrontOffice=Front office
 BackOffice=Back office
 View=Veure
@@ -851,6 +882,12 @@ FileNotShared=Fitxer no compartit amb el públic extern
 Project=Projecte
 Projects=Projectes
 Rights=Permisos
+<<<<<<< HEAD
+LineNb=Line no.
+=======
+LineNb=Núm. línia
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+IncotermLabel=Incoterms
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
@@ -916,3 +953,20 @@ CommentDeleted=Comentari suprimit
 Everybody=Projecte compartit
 PayedBy=Pagat per
 PayedTo=Pagat a
+<<<<<<< HEAD
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+=======
+Monthly=Mensual
+Quarterly=Trimestral
+Annual=Anual
+Local=Local
+Remote=Remot
+LocalAndRemote=Local i remota
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assignada a
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index f7e6e5e0771..7a0d17b53a0 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=El marge ha de ser un valor numèric
 markRateShouldBeLesserThan100=El marge té que ser menor que 100
 ShowMarginInfos=Mostrar info de marges
 CheckMargins=Detall de marges
-MarginPerSaleRepresentativeWarning=L'informe de marges per usuari utilitza l'enllaç entre tercers i agents comercials per calcular el marge de cada usuari. Degut a que alguns tercers no es poden enllaçar a cap agent comercial i que alguns tercers poden estar enllaçats amb varis agents comercials, alguns marges poden no aparèixer o aparèixer en vàries línies diferents.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 995e3a060b5..050d74521bd 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Llistat de socis públics validats
 ErrorThisMemberIsNotPublic=Aquest soci no és públic
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altre soci (nom: <b>%s</b>, login: <b>%s</b>) està vinculat al tercer <b>%s</b>. Esborreu l'enllaç existent ja que un tercer només pot estar vinculat a un sol soci (i viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per raons de seguretat, ha de posseir els drets de modificació de tots els usuaris per poder vincular un soci a un usuari que no sigui vostè mateix.
-ThisIsContentOfYourCard=Hola,<br><br> Això es un recordatori de la informació que tenim sobre tu. Contacta obertament amb nosaltres si veus alguna cosa incorrecta.<br><br>
-CardContent=Contingut de la seva fitxa de soci
 SetLinkToUser=Vincular a un usuari Dolibarr
 SetLinkToThirdParty=Vincular a un tercer Dolibarr
 MembersCards=Carnets de socis
@@ -108,17 +106,37 @@ PublicMemberCard=Fitxa pública de soci
 SubscriptionNotRecorded=Subscripció no registrada
 AddSubscription=Crear afiliació
 ShowSubscription=Mostrar afiliació
-SendAnEMailToMember=Envia e-mail d'informació al soci
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+<<<<<<< HEAD
+SubscriptionReminderEmail=Subscription reminder
+=======
+SubscriptionReminderEmail=Recordatori de subscripció
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Contingut de la seva fitxa de soci
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assumpte del e-mail rebut en cas d'auto-inscripció d'un convidat
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail rebut en cas d'auto-inscripció d'un convidat
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Assumpte del e-mail enviat quan un convidat es a autoinscrigui
-DescADHERENT_AUTOREGISTER_MAIL=E-mail enviat quan un convidat es autoinscrigui
-DescADHERENT_MAIL_VALID_SUBJECT=Assumpte del correu electrònic de validació de soci
-DescADHERENT_MAIL_VALID=E-mail de validació de soci
-DescADHERENT_MAIL_COTIS_SUBJECT=Assumpte del correu electrònic de validació de cotització
-DescADHERENT_MAIL_COTIS=E-mail de validació d'una afiliació
-DescADHERENT_MAIL_RESIL_SUBJECT=Assumpte d'e-mail de baixa
-DescADHERENT_MAIL_RESIL=E-mail de baixa
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=E-mail emissor per als e-mails automàtics
 DescADHERENT_ETIQUETTE_TYPE=Format pàgines etiquetes
 DescADHERENT_ETIQUETTE_TEXT=Text a imprimir a la direcció de les etiquetes de soci
@@ -177,3 +195,8 @@ NoVatOnSubscription=Sense IVA per a les afiliacions
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació (Exemple: pagament-fet@exemple.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producte utilitzat per la línia de subscripció a la factura: %s
 NameOrCompany=Nom o empresa
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 7c34b2d05a2..f5de35f93b3 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -94,3 +94,4 @@ YouCanUseTranslationKey=Podeu utilitzar aquí una clau que és la clau de traduc
 DropTableIfEmpty=(Suprimeix la taula si està buida)
 TableDoesNotExists=La taula %s no existeix
 TableDropped=S'ha esborrat la taula %s
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 449ef28e57a..d410724304e 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Desconnectat. Aneu a la pàgina d'inici de sessió ...
 MessageForm=Missatge al formulari de pagament en línia
 MessageOK=Missatge a la pàgina de retorn de pagament confirmat
 MessageKO=Missatge a la pàgina de retorn de pagament cancel·lat
+ContentOfDirectoryIsNotEmpty=El contingut d'aquest directori no és buit.
+DeleteAlsoContentRecursively=Marqueu de manera recursiva per eliminar tot el contingut
 
 YearOfInvoice=Any de la data de factura
 PreviousYearOfInvoice=Any anterior de la data de la factura
@@ -78,8 +80,8 @@ LinkedObject=Objecte adjuntat
 NbOfActiveNotifications=Nombre de notificacions (nº de destinataris)
 PredefinedMailTest=__(Hello)__\nAquest és un correu electrònic de prova enviat a __EMAIL__.\nLes dues línies estan separades per un salt de línia.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nAquest és un correu electrònic de <b>prova</b> (la paraula prova ha d'estar en negreta). <br> Les dues línies es separen amb un salt de línia. <br> <br> __USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí trobareu la factura __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nEns agradaria advertir-vos de que la factura __REF__ sembla que no està pagada. Així que s'ha adjuntat de nou el fitxer de la factura, com a recordatori.\n\n__ONLINE_PAYMENT_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí trobareu la factura __REF__\n\nAquest es l'enllaç per realitzar el pagament en línia en cas de que la factura encara no esitga pagada:\n__ONLINE_PAYMENT_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nEns agradaria advertir-vos que la factura __REF__ sembla que no està pagada. Així que adjuntem de nou la factura en el fitxer adjunt, com a recordatori.\n\n__ONLINE_PAYMENT_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nTrobareu aquí la proposta comercial __PREF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nTrobareu aquí la sol·licitud de cotització __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nTrobareu aquí la comanda __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Transferir
 CancelUpload=Cancel·lar transferència
 FileIsTooBig=L'arxiu és massa gran
 PleaseBePatient=Preguem esperi uns instants...
+NewPassword=Nova contrasenya
 ResetPassword=Restablir la contrasenya
 RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la contrasenya de Dolibarr
 NewKeyIs=Aquesta és la nova contrasenya per iniciar sessió
@@ -243,3 +246,8 @@ WEBSITE_PAGEURL=URL de pàgina
 WEBSITE_TITLE=Títol
 WEBSITE_DESCRIPTION=Descripció
 WEBSITE_KEYWORDS=Paraules clau
+<<<<<<< HEAD
+LinesToImport=Lines to import
+=======
+LinesToImport=Línies per importar
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang
index 591d5da3c25..80fc8f7290c 100644
--- a/htdocs/langs/ca_ES/paypal.lang
+++ b/htdocs/langs/ca_ES/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Només PayPal
 ONLINE_PAYMENT_CSS_URL=URL opcional del full d'estil CSS a la pàgina de pagament en línia
 ThisIsTransactionId=Identificador de la transacció: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Afegir la url del pagament Paypal en enviar un document per e-mail
-PredefinedMailContentLink=Podeu fer clic a l'enllaç assegurança de sota per realitzar el seu pagament a través de PayPal\n\n%s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=Actualment esteu en el mode %s "sandbox"
 NewOnlinePaymentReceived=Nou pagament online rebut
 NewOnlinePaymentFailed=S'ha intentat el nou pagament online però ha fallat
@@ -30,3 +30,6 @@ ErrorCode=Codi d'error
 ErrorSeverityCode=Codi sever d'error
 OnlinePaymentSystem=Sistema de pagament online
 PaypalLiveEnabled=Paypal live actiu (d'una altra forma en mode prova/sandbox)
+PaypalImportPayment=Importar els pagaments Paypal
+PostActionAfterPayment=Accions posteriors desprès dels pagaments
+ARollbackWasPerformedOnPostActions=S'ha produït una tornada endarrere en totes les accions "post". Heu de completar les accions "post" manualment si són necessàries.
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index b31933a41b4..aa1a205b2f3 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Codi comptable (exportació de venda)
 ProductOrService=Producte o servei
 ProductsAndServices=Productes i serveis
 ProductsOrServices=Productes o serveis
+ProductsPipeServices=Productes | Serveis
 ProductsOnSaleOnly=Productes només en venda
 ProductsOnPurchaseOnly=Productes només per compra
 ProductsNotOnSell=Productes no a la venda i no per a la compra
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Esteu segur de voler eliminar aquesta línia de product
 ProductSpecial=Especial
 QtyMin=Quantitat mínima
 PriceQtyMin=Preu per aquesta quantitat mínima (sense descompte)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Taxa IVA (per aquest producte/proveïdor)
 DiscountQtyMin=Descompte per defecte per aquesta quantitat
 NoPriceDefinedForThisSupplier=Cap preu/quant. definit per a aquest proveïdor/producte
@@ -196,7 +198,7 @@ CurrentProductPrice=Preu actual
 AlwaysUseNewPrice=Utilitzar sempre el preu actual
 AlwaysUseFixedPrice=Utilitzar el preu fixat
 PriceByQuantity=Preus diferents per quantitat
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=Desactivar els preus per quantitat
 PriceByQuantityRange=Rang de quantitats
 MultipriceRules=Regles de nivell de preu
 UseMultipriceRules=Utilitza les regles de preu per nivell (definit en la configuració del mòdul de productes) per autocalcular preus dels altres nivells en funció del primer nivell
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 07f9e8c03ab..b97e5315228 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Contactes del projecte
 ProjectsImContactFor=Projectes on sóc explícitament un contacte
 AllAllowedProjects=Tots els projectes que puc llegir (meu + públic)
 AllProjects=Tots els projectes
-MyProjectsDesc=Aquesta vista es limita als projectes dels quals sou un contacte.
+MyProjectsDesc=Aquesta vista mostra aquells projectes dels quals sou un contacte.
 ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat.
 TasksOnProjectsPublicDesc=Aquesta vista mostra totes les tasques en projectes en els que tens permisos de lectura.
 ProjectsPublicTaskDesc=Aquesta vista mostra tots els projectes als que té dret a visualitzar
 ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa).
 TasksOnProjectsDesc=Aquesta vista mostra totes les tasques en tots els projectes (els teus permisos d'usuari et donen dret a visualitzar-ho tot).
-MyTasksDesc=Aquesta vista es limita als projectes o a les tasques pels quals sou un contacte.
+MyTasksDesc=Aquesta vista es limita als projectes o a les tasques als quals sou un contacte.
 OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles)
 ClosedProjectsAreHidden=Els projectes tancats no són visibles.
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasques en projectes oberts
 WorkloadNotDefined=Càrrega de treball no definida
 NewTimeSpent=Temps dedicat
 MyTimeSpent=El meu temps dedicat
+BillTime=Facturar el temps dedicat
 Tasks=Tasques
 Task=Tasca
 TaskDateStart=Data d'inici
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Llistat de donacions associades al projecte
 ListVariousPaymentsAssociatedProject=Llista de pagaments extres associats al projecte
 ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte
 ListTaskTimeUserProject=Llistat del temps consumit en tasques d'aquest projecte
+ListTaskTimeForTask=Llista de temps consumit a la tasca
 ActivityOnProjectToday=Activitat en el projecte avui
 ActivityOnProjectYesterday=Activitat en el projecte ahir
 ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activitat en el projecte aquest mes
 ActivityOnProjectThisYear=Activitat en el projecte aquest any
 ChildOfProjectTask=Fil de la tasca
 ChildOfTask=Dependències de la tasca
+TaskHasChild=La tasca té subtasques
 NotOwnerOfProject=No és responsable d'aquest projecte privat
 AffectedTo=Assignat a
 CantRemoveProject=No es pot eliminar aquest projecte perquè està enllaçat amb altres objectes (factures, comandes o altres). Consulta la pestanya Referències.
@@ -137,6 +140,11 @@ ProjectReportDate=Canvia les dates de les tasques en funció de la nova data d'i
 ErrorShiftTaskDate=S'ha produït un error en el canvi de les dates de les tasques
 ProjectsAndTasksLines=Projectes i tasques
 ProjectCreatedInDolibarr=Projecte %s creat
+<<<<<<< HEAD
+ProjectValidatedInDolibarr=Project %s validated
+=======
+ProjectValidatedInDolibarr=Projecte %s validat
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ProjectModifiedInDolibarr=Projecte %s modificat
 TaskCreatedInDolibarr=La tasca %s a sigut creada
 TaskModifiedInDolibarr=La tasca %s a sigut modificada
@@ -215,8 +223,16 @@ AllowToLinkFromOtherCompany=Permet enllaçar projectes procedents d'altres compa
 LatestProjects=Darrers %s projectes 
 LatestModifiedProjects=Darrers %s projectes modificats
 OtherFilteredTasks=Altres tasques filtrades
-NoAssignedTasks=No hi ha tasques assignades (Assigneu-vos projectes/tasques des del quadre de selecció superior per introduir-hi temps)
+NoAssignedTasks=No hi ha tasques assignades (assigni el projecte / tasques a l'usuari actual des del quadre de selecció superior per introduir-hi temps)
 # Comments trans
 AllowCommentOnTask=Permet comentaris dels usuaris a les tasques
 AllowCommentOnProject=Permetre comentaris dels usuaris als projectes
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+<<<<<<< HEAD
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
+=======
+RecordsClosed=%s projecte(s) tancat(s)
+SendProjectRef=Sobre el projecte %s
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 6d4ad168dd5..ffecef11247 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signat (a facturar)
 PropalStatusNotSigned=No signat (tancat)
 PropalStatusBilled=Facturat
 PropalStatusDraftShort=Esborrany
+PropalStatusValidatedShort=Validat
 PropalStatusClosedShort=Tancat
 PropalStatusSignedShort=Signat
 PropalStatusNotSignedShort=No signat
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index 932490afeeb..fb0315b9f84 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -15,3 +15,8 @@ THMDescription=Aquest valor es pot utilitzar per calcular el cost del temps cons
 TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul
 LastSalaries=Últims %s pagaments de salari
 AllSalaries=Tots els pagaments de salari
+<<<<<<< HEAD
+SalariesStatistics=Statistiques salaires
+=======
+SalariesStatistics=Estadistiques de salaris
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 2d179b390b0..48ca7fd499d 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -8,7 +8,17 @@ WarehouseEdit=Edició magatzem
 MenuNewWarehouse=Nou magatzem
 WarehouseSource=Magatzem origen
 WarehouseSourceNotDefined=Sense magatzems definits,
+<<<<<<< HEAD
+AddWarehouse=Create warehouse
+=======
+AddWarehouse=Crea un magatzem
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 AddOne=Afegir un
+<<<<<<< HEAD
+DefaultWarehouse=Default warehouse
+=======
+DefaultWarehouse=Magatzem predeterminat
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 WarehouseTarget=Magatzem destinació
 ValidateSending=Elimina l'enviament
 CancelSending=Cancel·la l'enviament
@@ -22,6 +32,11 @@ Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
 ListOfWarehouses=Llistat de magatzems
 ListOfStockMovements=Llistat de moviments de estoc
+<<<<<<< HEAD
+ListOfInventories=List of inventories
+=======
+ListOfInventories=Llista d'inventaris
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 MovementId=ID del moviment
 StockMovementForId=ID de moviment %d
 ListMouvementStockProject=Llista de moviments d'estoc associats al projecte
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 8ea2f7fbc39..4fea61fd51a 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -35,6 +35,50 @@ NewStripePaymentReceived=S'ha rebut un nou pagament de Stripe
 NewStripePaymentFailed=S'ha intentat el pagament de Stripe però, ha fallat
 STRIPE_TEST_SECRET_KEY=Clau secreta de test
 STRIPE_TEST_PUBLISHABLE_KEY=Clau de test publicable
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Clau secreta
 STRIPE_LIVE_PUBLISHABLE_KEY=Clau pubiclable
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live activat (del contrari en mode test/sandbox)
+StripeImportPayment=Importar pagaments per Stripe
+ExampleOfTestCreditCard=Exemple de targeta de crèdit per a prova: %s (vàlid), %s (error CVC), %s (vençut), %s (falla de càrrega)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+<<<<<<< HEAD
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+=======
+StripeAccount=Compte de Stripe
+StripeChargeList=Llista de càrregues de Stripe
+StripeTransactionList=Llista de transaccions de Stripe
+StripeCustomerId=ID de client de Stripe
+StripePaymentModes=Formes de pagament de Stripe
+LocalID=ID local
+StripeID=ID de Stripe
+NameOnCard=Nom a la targeta
+CardNumber=Número de targeta
+ExpiryDate=Data de caducitat
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Estàs segur que vols eliminar aquest registre de la targeta?
+CreateCustomerOnStripe=Crea un client a Stripe
+CreateCardOnStripe=Crea una targeta a Stripe
+ShowInStripe=Mostra a Stripe
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 43dabee6f5c..6f90c1b1ebb 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -21,17 +21,17 @@ ListToApprove=Pendent d'aprovació
 ExpensesArea=Àrea d'informes de despeses
 ClassifyRefunded=Classificar 'Retornat'
 ExpenseReportWaitingForApproval=S'ha generat un nou informe de vendes per aprovació
-ExpenseReportWaitingForApprovalMessage=S'ha generat un nou informe de despeses i està esperant l'aprovació.\n- Usuari: %s\n- Període: %s\nClica aquí per validar: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=S'ha generat un informe de despeses per a re-aprovació
-ExpenseReportWaitingForReApprovalMessage=S'ha generat un nou informe de despeses i està esperant la teva re-aprovació.\nEl %s no acceptada per aprovar el informe de despeses per aquesta raó: %s\nS'ha presentat una nova versió i està a l'espera de la teva aprovació.\n- Usuari: %s\n- Període: %s\nClica aquí per validar: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=S'ha aprovat un informe de despeses
-ExpenseReportApprovedMessage=S'ha aprovat el informe de despeses %s.\n- Usuari: %s\n- Aprovat per: %s\nClica aquí per mostrar el informe de despeses: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=S'ha rebutjat un informe de despeses
-ExpenseReportRefusedMessage=S'ha rebutjat el informe de despeses %s.\n- Usuari: %s\n- Rebutjat per: %s\n- Motiu de rebuig: %s\nClica aquí per mostrar el informe de despeses: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=S'ha cancel·lat un informe de despeses
-ExpenseReportCanceledMessage=S'ha cancel·lat el informe de despeses %s.\n- Usuari: %s\n- Cancel·lat per: %s\n- Motiu de la cancel·lació: %s\nClica aquí per mostrar el informe de despeses: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=S'ha pagat un informe de despeses
-ExpenseReportPaidMessage=S'ha pagat el informe de despeses %s.\n- Usuari: %s\n- Pagat per: %s\nClica aquí per mostrar el informe de despeses: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id d'informe de despeses
 AnyOtherInThisListCanValidate=Persona a informar per a validar
 TripSociete=Informació de l'empresa
@@ -74,6 +74,7 @@ EX_CAM_VP=PV de manteniment i reparació
 DefaultCategoryCar=Mode de transport per defecte
 DefaultRangeNumber=Número de rang per defecte
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, la regla per a la numeració d'informes de despeses no es va definir a la configuració del mòdul "Informe de despeses"
 ErrorDoubleDeclaration=Has declarat un altre informe de despeses en un altre rang de dates semblant
 AucuneLigne=Encara no hi ha informe de despeses declarat
 
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 3538f473e88..01ff724fc50 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -69,8 +69,8 @@ InternalUser=Usuari intern
 ExportDataset_user_1=Usuaris Dolibarr i propietats
 DomainUser=Usuari de domini
 Reactivate=Reactivar
-CreateInternalUserDesc=Aquest formulari permet crear un usuari intern a la teva empresa/entitat. Per crear un usuari extern (clients, proveïdors, ...), utilitzeu el botó 'Crea usuari de Dolibarr' a la fitxa de contacte del tercer.
-InternalExternalDesc=Un usuari <b>intern</b> és un usuari que pertany a la teva empresa/entitat. <br>Un usuari<b>extern</b> és un usuari client, proveïdor o un altre.<br><br>En els 2 casos, els permisos defineixen els drets d'accés, però també l'usuari extern pot tenir un gestor de menús diferent a l'usuari intern (veure Inici - Configuració - Entorn)
+CreateInternalUserDesc=Aquest formulari permet crear un usuari intern a la teva empresa/organització. Per crear un usuari extern (clients, proveïdors, ...), utilitzeu el botó 'Crea usuari de Dolibarr' a la fitxa de contacte del tercer.
+InternalExternalDesc=Un usuari <b>intern</b> és un usuari que pertany a la teva empresa/organització. <br>Un usuari<b>extern</b> és un usuari client, proveïdor o un altre.<br><br>En els 2 casos, els permisos d'usuari defineixen els drets d'accés, però també l'usuari extern pot tenir un gestor de menús diferent a l'usuari intern (veure Inici - Configuració - Entorn)
 PermissionInheritedFromAGroup=El permís es concedeix ja que ho hereta d'un grup al qual pertany l'usuari.
 Inherited=Heretat
 UserWillBeInternalUser=L'usuari creat serà un usuari intern (ja que no està lligat a un tercer en particular)
@@ -93,6 +93,7 @@ NameToCreate=Nom del tercer a crear
 YourRole=Els seus rols
 YourQuotaOfUsersIsReached=Ha arribat a la seva quota d'usuaris actius!
 NbOfUsers=Nº d'usuaris
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Només un superadmin pot degradar un superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Vista jeràrquica
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 944b48ee82e..1c18f49dbe7 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Crea tantes entrades com número de pàgines web que necessitis
 DeleteWebsite=Elimina la pàgina web
 ConfirmDeleteWebsite=Estàs segur de voler elimiar aquesta pàgina web? També s'esborraran totes les pàgines i el seu contingut.
 WEBSITE_TYPE_CONTAINER=Tipus de pàgina/contenidor
+WEBSITE_PAGE_EXAMPLE=Pàgina web per utilitzar com a exemple
 WEBSITE_PAGENAME=Nom/alies de pàgina
+WEBSITE_ALIASALT=Noms de pàgina alternatius / àlies
 WEBSITE_CSS_URL=URL del fitxer CSS extern
 WEBSITE_CSS_INLINE=Fitxer de contingut CSS (comú a totes les pàgines)
 WEBSITE_JS_INLINE=Fitxer amb contingut Javascript (comú a totes les pàgines)
@@ -34,14 +36,22 @@ ViewPageInNewTab=Mostra la pàgina en una nova pestanya
 SetAsHomePage=Indica com a Pàgina principal
 RealURL=URL real
 ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici
-SetHereVirtualHost=Si pots crear, al teu servidor web (Apache, Nginx...), un Host Virtual amb PHP habilitat i un directori Root a <strong>%s</strong><br>, llavors introduïu aquí el nom del host virtual que has creat, d'aquesta manera es pot fer una vista prèvia utilitzant aquest accés directe al servidor web, i no només utilitzant el servidor Dolibarr.
-PreviewSiteServedByWebServer=Previsualització de %s en una nova pestanya <br> <br> %s serà servit per un servidor web extern (com ara Apache, Nginx, IIS). Has d'instal·lar i configurar aquest abans d'apuntar al directori: <br> <strong>%s</strong> <br> URL servida pel servidor extern: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Vista prèvia %s en una nova pestanya <br> <br> El %s serà servit pel servidor Dolibarr, per la qual cosa no necessita instal·lar cap servidor web extra (com Apache, Nginx, IIS). <br> L'inconvenient és que l'URL de les pàgines no són amigable i comencen per la ruta del vostre Dolibarr. <br> URL de Dolibarr: <br><strong>%s</strong><br><br> Per utilitzar el teu propi servidor web extern per a servir aquesta web, crea un host virtual al teu servidor web que apunti al directori<br><strong>%s</strong><br>  i a continuació, introduïu el nom d'aquest servidor virtual i feu clic a l'altre botó de vista prèvia.
+SetHereVirtualHost=Si pots crear, al teu servidor web (Apache, Nginx...), un Host Virtual amb PHP habilitat i un directori Root a <strong>%s</strong><br><br>, llavors introduïu aquí el nom del host virtual que has creat, d'aquesta manera es pot fer una vista prèvia utilitzant aquest accés directe al servidor web, i no només utilitzant el servidor Dolibarr.
+YouCanAlsoTestWithPHPS=En l'entorn de desenvolupament, és possible que preferiu provar el lloc amb el servidor web incrustat de PHP (requereix PHP 5.5) executant-se<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Llegit
+<<<<<<< HEAD
+WritePerm=Write
+=======
+WritePerm=Escriu
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+PreviewSiteServedByWebServer=<LI>Vista prèvia %s en una nova pestanya.</LI><br><br>El %s serà servit per un servidor web extern (com ara Apache, Nginx, IIS). Heu d'instal·lar i configurar aquest servidor abans d'apuntar al directori:<br><strong>%s</strong><br> URL servit per un servidor extern:<br><strong>%s</strong><br>
+PreviewSiteServedByDolibarr=<u> Previsualitza  %s en una nova pestanya. </li> <br> <br> El servidor %s serà servit pel servidor Dolibarr d'aquesta manera no es necessita instal·la cap servidor web addicional (com ara Apache, Nginx, IIS).<br>L'inconvenient és que l'URL de les pàgines no son amigables i començen per la ruta del vostre Dolibarr. <br>URL servit per Dolibarr:<br><strong> %s </strong> <br> <br> Per utilitzar el vostre propi servidor web extern per a servir a aquest lloc web, creeu un amfitrió ('host') virtual al vostre servidor web que apunti al directori<br><strong> %s </strong><br>, llavors introduïu el nom d'aquest servidor virtual i feu clic a l'altre botó de vista prèvia (botó de 'preview').
 VirtualHostUrlNotDefined=No s'ha definit la URL de l'amfitrió virtual que serveix el servidor web extern
 NoPageYet=Encara sense pàgines
 SyntaxHelp=Ajuda sobre consells de sintaxi específics
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Pots incloure codi PHP code dintre d'aquesta font utilitzant etiquetes (tags) <strong>&lt;?php ?&gt;</strong>. Les següents variables globals estan disponibles: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> Pots també incloure contingut d'altres pàgines/contenidor (Page/Container) amb la següent sintaxi:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> Per a incloure un <strong>enllaç per a descarregar</strong> un fitxer emmagatzemat dintre del directori de <strong>documents</strong>, usa el <strong>document.php</strong> "wrapper":<br>Exemple, per a un fitxer dintre dels documents/ecm (necessites estar registrat / "logged"), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer dintre dels documents/medias (open directory per a accés públic), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer compartit amb un enllaç compartit (open access using the sharing hash key of file), la sintaxi és:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Per a incloure un <strong>imatge</strong> emmagatzemada dintre d'un directori <strong>documents</strong>, usa la <strong>viewimage.php</strong> "wrapper":<br>Exemple, per a una imatge dintre de documents/medias (open access), la sintaxi és:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Podeu incloure PHP codi a la font usant les etiquetes ('tags') <strong>&lt;?php ?&gt;</strong>. Les següents variables globals estan disponibles: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> Podeu també incloure contingut de un altre Page/Container amb les següents sintaxis:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Podeu fer una redirecció a una altra Page/Container amb la següent sintaxis:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> Per a incloure un <strong>enllaç per a descarregar</strong> un fitxer emmagatzemat dins del <strong>documents</strong> directori, utilitza el <strong>document.php</strong> wrapper:<br>Exemple, per a un fitxer dins del documents/ecm (necessita estar 'logged'), la sintaxis és:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer dintre de documents/medias (open directory for public access), la sintaxis és:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer compartit amb un enllaç compartit (open access using the sharing hash key of file), la sintaxis és:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Per a incloure una <strong>image</strong> emmagatzemat dintre de <strong>documents</strong> directory, utilitza el <strong>viewimage.php</strong> wrapper:<br>Exemple, per a una imatge dintre de documents/medias (open access), la sintaxis és:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
 SiteAdded=Lloc web afegit
@@ -55,7 +65,7 @@ OrEnterPageInfoManually=O creeu una pàgina buida des de zero ...
 FetchAndCreate=Obtenir i crear
 ExportSite=Exportar el lloc web
 IDOfPage=Id de la pàgina
-Banner=Cartell
+Banner=Bàner
 BlogPost=Publicació del bloc
 WebsiteAccount=Compte de lloc web
 WebsiteAccounts=Comptes de lloc web
@@ -64,3 +74,15 @@ BackToListOfThirdParty=Tornar a la llista de Tercers
 DisableSiteFirst=Deshabilita primer el lloc web
 MyContainerTitle=Títol del meu lloc web
 AnotherContainer=Un altre contenidor
+WEBSITE_USE_WEBSITE_ACCOUNTS=Activa la taula del compte del lloc web
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per emmagatzemar comptes del lloc web (login/contrasenya) per a cada lloc web de tercers
+YouMustDefineTheHomePage=Primer heu de definir la pàgina d'inici predeterminada
+OnlyEditionOfSourceForGrabbedContentFuture=Nota: només es pot editar el codi HTML quan el contingut de la pàgina estigui inicialitzada i agafant-lo des d'una pàgina externa (l'editor WYSIWYG no estarà disponible)
+OnlyEditionOfSourceForGrabbedContent=Només l'edició de codi HTML és possible quan el contingut s'ha capturat d'un lloc extern
+GrabImagesInto=Agafa també imatges trobades dins del css i a la pàgina.
+ImagesShouldBeSavedInto=Les imatges s'han de desar al directori
+WebsiteRootOfImages=Directori arrel d'imatges del lloc web
+SubdirOfPage=Subdirectori dedicat a la pàgina
+AliasPageAlreadyExists=Alias de pàgina <strong>%s</strong> ja existeixen
+CorporateHomePage=Pàgina d'inici corporativa
+EmptyPage=Pàgina buida
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index a8f416187cc..37afcba976a 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Àrea de pagament de domiciliacions bancaries
 SuppliersStandingOrdersArea=Àrea de pagament mitjançant domiciliació bancària
-StandingOrders=Ordres de pagament mitjançant domiciliació bancària
-StandingOrder=Ordre de pagament de dèbit directe
+StandingOrdersPayment=Ordres de pagament mitjançant domiciliació bancària
+StandingOrderPayment=Ordre de pagament de domiciliació
 NewStandingOrder=Nova ordre de domiciliació bancària
 StandingOrderToProcess=A processar
 WithdrawalsReceipts=Domiciliacions
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=Això també registrarà els pagaments a les fac
 StatisticsByLineStatus=Estadístiques per estats de línies
 RUM=UMR
 RUMLong=Referència de mandat única (UMR)
-RUMWillBeGenerated=Número UMR serà generat un cop la informació del compte bancària està salvada
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Modo de domiciliació bancària (FRST o RECUR)
 WithdrawRequestAmount=Import de la domiciliació
 WithdrawRequestErrorNilAmount=No és possible crear una domiciliació sense import
@@ -98,6 +98,14 @@ ModeFRST=Pagament únic
 PleaseCheckOne=Si us plau marqui només una
 DirectDebitOrderCreated=S'ha creat l'ordre de domiciliació bancària %s
 AmountRequested=Quantitat sol·licitada
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+<<<<<<< HEAD
+ExecutionDate=Execution date
+=======
+ExecutionDate=Data d'execució
+>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Pagament de rebuts domiciliats %s pel banc
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 4c3459abef4..dab4263959e 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Graf účtů
 CurrentDedicatedAccountingAccount=Aktuální vyhrazený účet
 AssignDedicatedAccountingAccount=Nový účet přiřadit
 InvoiceLabel=faktura štítek
-OverviewOfAmountOfLinesNotBound=Přehled množství linek není vázán na účetnictví účtu
-OverviewOfAmountOfLinesBound=Přehled množství linek již vázán na účetnictví účtu
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Jiná informace
 DeleteCptCategory=Odebrat účtování účet ze skupiny
 ConfirmDeleteCptCategory=Jste si jisti, že chcete odstranit tento účetní účet ze skupiny účetního účtu?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Účetní účet ve výchozím nastavení pro pr
 Doctype=Typ dokumentu
 Docdate=Datum
 Docref=Reference
-Code_tiers=Třetí strana
 LabelAccount=Štítek účtu
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Odstrannění roku
 DelJournal=Journal odstranit
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finanční deník
 ExpenseReportsJournal=Výdajové zprávy journal
 DescFinanceJournal=Finanční deník včetně všech typů plateb prostřednictvím bankovního účtu
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Účet pro DPH není definován
 ThirdpartyAccountNotDefined=Účet pro třetí stranu není definováno
 ProductAccountNotDefined=Účet pro výrobek není definován
 FeeAccountNotDefined=Účet za poplatek není definováno
 BankAccountNotDefined=Účet pro banku není definováno
 CustomerInvoicePayment=Platba zákaznické faktury
-ThirdPartyAccount=Účet třetí strany
+ThirdPartyAccount=Third party account
 NewAccountingMvt=nová transakce
 NumMvts=Číslo transakce
 ListeMvts=Seznam pohybů
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Chyba, nelze odstranit tento účetní účet,
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Ověřovací karta
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=Seznam výrobků, které nejsou vázány na kterémkoli účetním účtu
 ChangeBinding=Změnit vazby
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Aplikovat hmotnostní kategorie
@@ -234,13 +234,15 @@ AccountingJournal=Účetní deník
 NewAccountingJournal=Nový účetní deník
 ShowAccoutingJournal=Zobrazit účetní deník
 Nature=Příroda
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Odbyt
 AccountingJournalType3=Nákupy
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Má-new
 ErrorAccountingJournalIsAlreadyUse=Tento deník se již používá
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Vzorec
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=Účetnictví skupiny účtů není k dispozici pro země %s (viz Home - instalace - slovníky)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Exportní formát setuped není podporován na této stránce
 BookeppingLineAlreayExists=Linky již existující do bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index a244278f37c..08eade87cea 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Chyba, nelze použít volbu @ pro reset čítače
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Chyba, nelze použít volbu @ pokud posloupnost {yy}{mm} or {yyyy}{mm} není uvedena v masce.
 UMask=Umask parametr pro nové soubory na Unix / Linux / BSD / Mac systému souborů.
 UMaskExplanation=Tento parametr umožňuje definovat výchozí oprávnění souborl vytvořených Dolibarr systémem na serveru (např. během nahrávání). <br> Musí se jednat o osmičkovou hodnotu (např. 0666 znamená číst a psát pro všechny). <br> Tento parametr je na serverech Windows k ničemu.
-SeeWikiForAllTeam=Podívejte se na wiki stránku pro kompletní seznam všech účastníků a jejich organizaci
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Zpoždění pro ukládání výsledku exportu do mezipaměti v sekundách (0 nebo prázdné pro neukládání)
 DisableLinkToHelpCenter=Skrýt odkaz <b>&quot;Potřebujete pomoc či podporu&quot;</b> na přihlašovací stránce
 DisableLinkToHelp=Skrýt odkaz na on-line nápovědě "<b> %s </ b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Změnit na cenách s hodnotou základního odkazu uvedené
 MassConvert=Spusťte hmotnost převést
 String=Řetěz
 TextLong=Dlouhý text
+HtmlText=Html text
 Int=Celé číslo
 Float=Vznášet se
 DateAndTime=Datum a hodina
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Odkaz na objekt
 ComputedFormula=Vypočtené pole
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Knihovna používaná pro generování PDF
-WarningUsingFPDF=Upozornění: Váš <b>conf.php</b> obsahuje direktivu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že můžete používat knihovnu FPDF pro generování PDF souborů. Tato knihovna je stará a nepodporuje mnoho funkcí (Unicode, obraz transparentnost, azbuka, arabské a asijské jazyky, ...), takže může dojít k chybám při generování PDF. <br> Chcete-li vyřešit tento a mají plnou podporu generování PDF, stáhněte si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knihovny</a> , pak komentář nebo odebrat řádek <b>$ dolibarr_pdf_force_fpdf = 1,</b> a místo něj doplnit <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
 LocalTaxDesc=Některé země uplatňovat 2 nebo 3 daně na každé faktuře řádek. Pokud se jedná o tento případ, zvolit typ pro druhé a třetí daňové a jeho rychlosti. Možné typ jsou: <br> 1: místní daň vztahovat na výrobky a služby bez DPH (localtax je vypočtena na částku bez daně) <br> 2: místní daň platí o produktech a službách, včetně DPH (localtax je vypočtena na částku + hlavní daně) <br> 3: místní daň vztahovat na výrobky bez DPH (localtax je vypočtena na částku bez daně) <br> 4: místní daň vztahovat na produkty, včetně DPH (DPH se vypočítá na množství + hlavní DPH) <br> 5: místní daň platí o službách bez DPH (localtax je vypočtena na částku bez daně) <br> 6: místní daň platí o službách, včetně DPH (localtax je vypočtena na částku + daň)
 SMS=SMS
 LinkToTestClickToDial=Zadejte telefonní číslo pro volání ukázat odkaz na test ClickToDial URL pro <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=Ve výchozím nastavení musí být nákupní objednávky vytvořeny a schváleny dvěma různými uživateli (jeden krok / uživatel k vytvoření a jeden krok / uživatel ke schválení. Všimněte si, že pokud má uživatel oprávnění k vytvoření a schválení, stačí jeden krok / uživatel) . Touto volbou můžete požádat o zavedení třetího schvalovacího kroku / schválení uživatele, pokud je částka vyšší než určená hodnota (potřebujete tedy 3 kroky: 1 = ověření, 2 = první schválení a 3 = druhé schválení, pokud je dostatečné množství). <br> Pokud je zapotřebí jedno schvalování (2 kroky), nastavte jej na velmi malou hodnotu (0,1), pokud je vždy požadováno druhé schválení (3 kroky).
 UseDoubleApproval=Použijte schválení 3 kroky, kdy částka (bez DPH) je vyšší než ...
-WarningPHPMail=Upozornění: Někteří poskytovatelé e-mailu (například Yahoo) neumožňuje odeslat e-mail z jiného serveru, než server Yahoo v případě, že e-mailová adresa použita jako odesílatel je vaše Yahoo e-mail (jako myemail@yahoo.com, myemail@yahoo.fr, ...). Vaše aktuální nastavení použít server aplikace pro odesílání e-mailů, takže někteří příjemci (jeden kompatibilní s restriktivním DMARC protokolu), požádá Yahoo, pokud mohou přijímat e-maily a Yahoo odpoví „ne“, protože server není server vlastněná společností Yahoo, takže některé z vašich odeslané e-maily nemusí být přijaty. <br> má-li váš poskytovatel e-mail (jako je Yahoo) toto omezení, je nutné změnit nastavení e-mailu zvolit jiný způsob „SMTP serveru“ a zadat server SMTP a pověření poskytované vašeho poskytovatele e-mailu (zeptejte se svého poskytovatele e-mailových získat pověření SMTP pro váš účet).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Kliknutím zobrazíte popis
 DependsOn=Tento modul je třeba modul (y)
 RequiredBy=Tento modul je vyžadováno modulu (modulů)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Uživatelé a skupiny
 Module0Desc=Uživatelé / zaměstnanci a vedení Skupiny
@@ -619,6 +622,8 @@ Module59000Name=Okraje
 Module59000Desc=Modul pro správu marže
 Module60000Name=Provize
 Module60000Desc=Modul pro správu provize
+Module62000Name=Incoterm
+Module62000Desc=Přidat funkce pro správu Incotermu
 Module63000Name=Zdroje
 Module63000Desc=Spravovat zdroje (tiskárny, auta, prostor, ...), pak můžete sdílet na akcích
 Permission11=Přečtěte si zákazníků faktury
@@ -833,11 +838,11 @@ Permission1251=Spustit Hmotné dovozy externích dat do databáze (načítání
 Permission1321=Export zákazníků faktury, atributy a platby
 Permission1322=Znovu otevřít placené účet
 Permission1421=Export objednávek zákazníků a atributy
-Permission20001=Číst opuštěné požadavky (vy a vaši podřízení)
-Permission20002=Vytvořit/upravit vaše požadavky na dovolenou
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Smazat žádosti o dovolenou
-Permission20004=Přečtěte si všechny opuštěné požadavky (i když uživatel není podřízení)
-Permission20005=Vytvořit/upravit žádosti o dovolenou pro každého
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Žádosti admin opuštěné požadavky (setup a aktualizovat bilance)
 Permission23001=Čtení naplánovaných úloh
 Permission23002=Vytvoření/aktualizace naplánované úlohy
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Výše příjmů známek
 DictionaryPaymentConditions=Platební podmínky
 DictionaryPaymentModes=Platební režimy
 DictionaryTypeContact=Typy kontaktů/adres
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formáty papíru
 DictionaryFormatCards=Karty formáty
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=DPH řízení
 VATIsUsedDesc=Ve výchozím nastavení při vytváření vyhlídky, faktury, objednávky atd sazba DPH se řídí pravidlem aktivní standardní:. <br> Je-li prodávající nepodléhá dani z přidané hodnoty, pak výchozí DPH na 0. Konec vlády <br> li (prodejní země = kupovat zemi), pak se DPH standardně rovná DPH výrobku v prodejním zemi. Konec pravidla. <br> Pokud prodávající a kupující jsou oba v Evropském společenství a zboží přepravní zařízení (auto, loď, letadlo), výchozí DPH je 0 (DPH by měla být hradí kupující na customoffice své země, a nikoli na prodávající). Konec pravidla. <br> Pokud prodávající a kupující jsou oba v Evropském společenství a kupující není společnost, pak se DPH prodlením k DPH z prodaného produktu. Konec pravidla. <br> Pokud prodávající a kupující jsou oba v Evropském společenství a kupujícím je společnost, pak je daň 0 ve výchozím nastavení. Konec pravidla. <br> V každém čiš případě navrhované default je DPH = 0. Konec pravidla.
 VATIsNotUsedDesc=Ve výchozím nastavení je navrhovaná DPH 0, který lze použít v případech, jako je sdružení jednotlivců ou malých podniků.
-VATIsUsedExampleFR=Ve Francii, to znamená, že podniky a organizace, které mají skutečnou fiskální systém (zjednodušený reálný nebo normální reálné). Systém, v němž je deklarován DPH.
-VATIsNotUsedExampleFR=Ve Francii, to znamená, asociace, které jsou bez DPH prohlášené nebo společnosti, organizace nebo svobodných povolání, které se rozhodly pro Micro Enterprise daňového systému (s DPH v povolení) a placenými franšízové ​​DPH bez DPH prohlášení. Tato volba se zobrazí odkaz &quot;nepoužitelné DPH - art-293B CGI&quot; na fakturách.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rychlost
 LocalTax1IsNotUsed=Nepoužívejte druhá daň
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Typ ovladače
 SummarySystem=Systém souhrn informací
 SummaryConst=Seznam všech nastavených parametrů Dolibarr
-MenuCompanySetup=Společnost / Organizace
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standardní nabídka manažer
 DefaultMenuSmartphoneManager=Smartphone Nabídka manažer
 Skin=Skin téma
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanentní vyhledávací formulář na levém menu
 DefaultLanguage=Výchozí jazyk používat (kód jazyka)
 EnableMultilangInterface=Povolit vícejazyčné rozhraní
 EnableShowLogo=Zobrazit logo na levém menu
-CompanyInfo=Společnost/organizace informace
-CompanyIds=Firma / organizace identity
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Název
 CompanyAddress=Adresa
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informace je různé technické informace získáte v režimu pouze pro čtení a viditelné pouze pro správce.
 SystemAreaForAdminOnly=Tato oblast je k dispozici pro správce uživatele. Žádný z Dolibarr oprávnění může snížit tento limit.
 CompanyFundationDesc=Úpravy na této stránce všechny známé informace o společnosti nebo nadace, které potřebujete spravovat (K tomu, klikněte na „Upravit“ nebo tlačítko „uložit“ v dolní části stránky)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Můžete si vybrat každý parametr týkající se vzhledu Dolibarr a cítit se zde
 AvailableModules=Available app/modules
 ToActivateModule=Pro aktivaci modulů, přejděte na nastavení prostoru (Domů-&gt; Nastavení-&gt; Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=Název souboru a cesta
 YouCanUseDOL_DATA_ROOT=Můžete použít DOL_DATA_ROOT / dolibarr.log pro soubor protokolu Dolibarr &quot;Dokumenty&quot; adresáře. Můžete nastavit jinou cestu k uložení tohoto souboru.
 ErrorUnknownSyslogConstant=Konstantní %s není známo, Syslog konstantní
 OnlyWindowsLOG_USER=Windows podporuje pouze LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Darování modul nastavení
 DonationsReceiptModel=Vzor darovací přijetí
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Nepodařilo se inicializovat nabídku
 ##### Tax #####
 TaxSetup=Daně, sociální a fiskální daně a dividendy nastavení modulu
 OptionVatMode=DPH z důvodu
-OptionVATDefault=Cash základ
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Akruální báze
 OptionVatDefaultDesc=DPH je splatná: <br> - Na dobírku za zboží (používáme data vystavení faktury) <br> - Plateb za služby
 OptionVatDebitOptionDesc=DPH je splatná: <br> - Na dobírku za zboží (používáme data vystavení faktury) <br> - Na fakturu (debetní) na služby
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Čas DPH exigibility standardně dle zvolené varianty:
 OnDelivery=Na dobírku
 OnPayment=Na zaplacení
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Faktura použita data
 Buy=Koupit
 Sell=Prodávat
 InvoiceDateUsed=Faktura použita data
-YourCompanyDoesNotUseVAT=Vaše společnost byla definována tak, aby nepoužívá DPH (Home - Setup - Firma / organizace), takže neexistují žádné možnosti DPH na nastavení.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Prodej účtu. kód
 AccountancyCodeBuy=Nákup účet. kód
@@ -1718,6 +1730,7 @@ MailToSendContract=Chcete-li poslat smlouvu
 MailToThirdparty=Chcete-li poslat e-mail ze strany subjektů
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Zobrazit výchozí zobrazení seznamu
 YouUseLastStableVersion=Používáte nejnovější stabilní verzi
 TitleExampleForMajorRelease=Příklad zprávy, kterou lze použít k oznámit tuto hlavní verzi (bez obav používat na svých webových stránkách)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Konfigurace modulu Zdroje
 UseSearchToSelectResource=Použijte vyhledávací formulář k výběru zdroje (spíše než rozevírací seznam).
-DisabledResourceLinkUser=Disabled odkaz zdroj, který uživatele
-DisabledResourceLinkContact=Zakázán link zdrojů do kontaktu
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 7d28fd35872..6a91b4a4665 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Uživatel %s ověřen
 MemberModifiedInDolibarr=Uživatel %s upraven
 MemberResiliatedInDolibarr=Členské %s ukončeno
 MemberDeletedInDolibarr=Uživatel %s smazán
-MemberSubscriptionAddedInDolibarr=Předplatné pro člena %s přidáno
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Doprava %s ověřena
 ShipmentClassifyClosedInDolibarr=Zásilka %s klasifikováno účtoval
 ShipmentUnClassifyCloseddInDolibarr=Zásilka %s klasifikováno znovuotevření
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Můžete také přidat následující parametry filtrování v
 AgendaUrlOptions3=<b>logina=%s</b> omezuje výstup na akce vlastněné uživatelem <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>projekt=PROJECT_ID</b> omezit výstup na akce spojené s projektem <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Zobrazit narozeniny kontaktů
 AgendaHideBirthdayEvents=Skrýt narozeniny kontaktů
 Busy=Zaneprázdněný
@@ -109,7 +112,7 @@ ExportCal=Export kalendáře
 ExtSites=Importovat externí kalendáře
 ExtSitesEnableThisTool=Zobrazit externí kalendáře (definováno v globálním nastavení) do agendy. Nemá vliv na externí kalendáře definované uživateli.
 ExtSitesNbOfAgenda=Počet kalendářů
-AgendaExtNb=Kalendář nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL pro přístup *.iCal souboru
 ExtSiteNoLabel=Nepodepsáno
 VisibleTimeRange=Viditelný časový rozsah
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 40570e7a9ad..1e1ac5b2211 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Navrácené
 DeletePayment=Odstranit platby
 ConfirmDeletePayment=Jste si jisti, že chcete smazat tuto platbu?
 ConfirmConvertToReduc=Chcete převést tento %s do absolutního slevou? <br> částka bude tak možné uložit mezi všemi slevy a mohl by být použit jako sleva na současný nebo budoucí faktury pro tohoto zákazníka.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Platby dodavatelům
 ReceivedPayments=Přijaté platby
 ReceivedCustomersPayments=Platby přijaté od zákazníků
@@ -91,7 +92,7 @@ PaymentAmount=Částka platby
 ValidatePayment=Ověření platby
 PaymentHigherThanReminderToPay=Platba vyšší než upomínka k zaplacení
 HelpPaymentHigherThanReminderToPay=Pozor, výše platby z jednoho nebo více účtů je vyšší než v zůstatku. <br> Upravte položky nebo potvrďte a připravte vytvoření dobropisu přeplatku přijatého pro každou fakturu.
-HelpPaymentHigherThanReminderToPaySupplier=Pozor, částka platby z jednoho nebo více účtů je vyšší, než ostatní úhrady. <br> Upravte položku, nebo potvrďte.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Klasifikace 'Zaplaceno'
 ClassifyPaidPartially=Klasifikace 'Částečně uhrazeno'
 ClassifyCanceled=Klasifikace 'Opuštěné'
@@ -110,6 +111,7 @@ DoPayment=zadat platbu
 DoPaymentBack=Vraťte platbu
 ConvertToReduc=Převod do budoucí slevy
 ConvertExcessReceivedToReduc=Převést přebytek dostal do budoucnosti slevou
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Zadejte platbu obdrženoou od zákazníka
 EnterPaymentDueToCustomer=Provést platbu pro zákazníka
 DisabledBecauseRemainderToPayIsZero=Zakázáno, protože zbývající nezaplacená částka je nula
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status vygenerovaných faktur
 BillStatusDraft=Návrh (musí být ověřeno)
 BillStatusPaid=Placeno
 BillStatusPaidBackOrConverted=Náhrada kreditu nebo převod na slevu
-BillStatusConverted=Placeno (připraveno na závěrečné faktuře)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Opuštěno
 BillStatusValidated=Ověřeno (je třeba uhradit)
 BillStatusStarted=Začínáme
@@ -220,6 +222,7 @@ RemainderToPayBack=Zbývající částku vrátit
 Rest=Čeká
 AmountExpected=Nárokovaná částka
 ExcessReceived=Přeplatek obdržel
+ExcessPaid=Excess paid
 EscompteOffered=Nabídnutá  sleva (platba před termínem)
 EscompteOfferedShort=Sleva
 SendBillRef=Předložení faktury %s
@@ -283,16 +286,20 @@ Deposit=Záloha
 Deposits=Zálohy
 DiscountFromCreditNote=Sleva z %s dobropisu
 DiscountFromDeposit=Zálohy plateb od vystavení faktury %s
-DiscountFromExcessReceived=Platby z přebytku přijaté faktury %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Tento druh úvěru je možné použít na faktuře před jeho ověřením
 CreditNoteDepositUse=Faktura musí být ověřena, aby používaly tento druh úvěrů
 NewGlobalDiscount=Nová absolutní sleva
 NewRelativeDiscount=Nová relativní sleva
+DiscountType=Discount type
 NoteReason=Poznámka/důvod
 ReasonDiscount=Důvod
 DiscountOfferedBy=Poskytnuté
 DiscountStillRemaining=slevy
 DiscountAlreadyCounted=Slevy již spotřebována
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Účetní adresa
 HelpEscompte=Tato sleva je sleva poskytnuta zákazníkovi, protože jeho platba byla provedena před termínem splatnosti.
 HelpAbandonBadCustomer=Tato částka byla opuštěna (zákazník řekl, aby byl špatný zákazník) a je považována za výjimečně volnou.
@@ -341,10 +348,10 @@ NextDateToExecution=Datum pro příští generaci faktury
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Datum poslední generace
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb faktury generace
-NbOfGenerationDone=Nb faktury generace už skončil
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximální nb generací dosáhl
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Ověřovat faktury automaticky
 GeneratedFromRecurringInvoice=Generován z šablony opakující faktury %s
 DateIsNotEnough=Datum ještě nebylo dosaženo
@@ -521,3 +528,7 @@ BillCreated=%s bill (y) vytvořený
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 6053fa919c5..707bb004d7b 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -43,7 +43,8 @@ Individual=Soukromá osoba
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Mateřská společnost
 Subsidiaries=Dceřiné společnosti
-ReportByCustomers=Reporty dle zákazníků
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Reporty dle sazby
 CivilityCode=Etický kodex
 RegisteredOffice=Sídlo společnosti
@@ -75,10 +76,12 @@ Town=Město
 Web=Web
 Poste= Pozice
 DefaultLang=Výchozí jazyk
-VATIsUsed=Plátce DPH
-VATIsNotUsed=Neplátce DPH
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Daňové identifikační číslo
-VATIntraShort=Daňové identifikační číslo
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntaxe je správná
+VATReturn=VAT return
 ProspectCustomer=Cíl / Zákazník
 Prospect=Cíl
 CustomerCard=Karta zákazníka
 Customer=Zákazník
 CustomerRelativeDiscount=Relativní zákaznická sleva
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relativní sleva
 CustomerAbsoluteDiscountShort=Absolutní sleva
 CompanyHasRelativeDiscount=Tento zákazník má výchozí slevu <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Tento zákazník nemá výchozí relativní slevu
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=Tento zákazník stále má diskontní úvěry nebo zálohy na <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Tento zákazník stále má dobropisy na <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Tento zákazník nemá diskontní úvěr k dispozici
-CustomerAbsoluteDiscountAllUsers=Absolutní slevy (povoleny od všech uživatelů)
-CustomerAbsoluteDiscountMy=Absolutní slevy (povoleny vámi)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Nikdo
 Supplier=Dodavatel
 AddContact=Vytvořit kontakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Žádný přístup k Dolibarr
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakty a vlastnosti
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontakty/Adresy (třetích stran a dalších) a atributy
-ImportDataset_company_3=Bankovní detaily
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Cenová hladina
 DeliveryAddress=Doručovací adresa
 AddAddress=Přidat adresu
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Momentální nezaplacený účet
 OutstandingBill=Max. za nezaplacený účet
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Vrátí číslo ve formátu %syymm-nnnn pro kód zákazníka a %syymm-nnnn pro kód dodavatele kde yy je rok, mm měsíc a nnnn je číselná řada bez přerušení a bez návratu k 0.
 LeopardNumRefModelDesc=Kód je volný. Tento kód lze kdykoli změnit.
 ManagingDirectors=Jméno vedoucího (CEO, ředitel, předseda ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
-ThirdpartiesMergeSuccess=Třetí strany  byly sloučeny
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=Došlo k chybě při mazání třetích stran. Zkontrolujte log soubor. Změny byly vráceny.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index b98cf04f218..e654aab1c9a 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -31,7 +31,7 @@ Credit=Kredit
 Piece=Účetnictví Doc.
 AmountHTVATRealReceived=Net shromážděné
 AmountHTVATRealPaid=Net placené
-VATToPay=DPH prodejní
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Platby
 VATPayment=Prodejní daň platba
 VATPayments=Daň z prodeje platby
 VATRefund=Vrácení daně z prodeje
+NewVATPayment=New sales tax payment
 Refund=Vrácení
 SocialContributionsPayments=Sociální / platby daně za
 ShowVatPayment=Zobrazit platbu DPH
@@ -157,30 +158,34 @@ RulesResultDue=- To zahrnuje neuhrazené faktury, výdaje a DPH, zda byly zaplac
 RulesResultInOut=- To zahrnuje skutečné platby na fakturách, nákladů, DPH a platů. <br> - Je založen na datech plateb faktur, náklady, DPH a platů. Datum daru pro dárcovství.
 RulesCADue=- To zahrnuje splatné faktury klienta, zda byly zaplaceny či nikoliv. <br> - Je založen na datum ověření těchto faktur <br>.
 RulesCAIn=- Obsahuje všechny účinné platby faktury přijaté od klientů. <br> - Je založen na datu úhrady těchto faktur <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Zálohové faktury nejsou zahrnuty
 DepositsAreIncluded=- Zálohové faktury jsou zahrnuty
-LT2ReportByCustomersInInputOutputModeES=Zpráva o třetí straně IRPF
-LT1ReportByCustomersInInputOutputModeES=Zpráva třetí strany RE
-VATReport=zpráva DPH
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Zpráva třetí strany RE
+LT2ReportByCustomersES=Zpráva o třetí straně IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Zpráva o vybrané a zaplacené DPH zákazníka
-VATReportByCustomersInDueDebtMode=Zpráva o vybrané a zaplacené DPH zákazníka
-VATReportByQuartersInInputOutputMode=Zpráva o sazbách DPH vybrané a odvedené
-LT1ReportByQuartersInInputOutputMode=Zpráva RE hodnocení
-LT2ReportByQuartersInInputOutputMode=Zpráva IRPF hodnocení
-VATReportByQuartersInDueDebtMode=Zpráva o sazbách DPH vybrané a odvedené
-LT1ReportByQuartersInDueDebtMode=Zpráva RE hodnocení
-LT2ReportByQuartersInDueDebtMode=Zpráva IRPF hodnocení
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Zpráva RE hodnocení
+LT2ReportByQuartersES=Zpráva IRPF hodnocení
 SeeVATReportInInputOutputMode=Viz zprávu <b>%s uzavřená DPH %s</b> pro standardní výpočet
 SeeVATReportInDueDebtMode=Viz zpráva <b>%sDPH na průběhu%s</b> pro výpočet s možností průběhu
 RulesVATInServices=- V případě služeb, zpráva obsahuje DPH předpisy skutečně přijaté nebo vydané na základě data splatnosti.
-RulesVATInProducts=- U hmotného majetku zde zahrnuje DPH faktury na základě data vystavení faktury.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- V případě služeb, zpráva obsahuje faktury s DPH se stavem placené či nikoli, na základě data vystavení faktury.
-RulesVATDueProducts=- U hmotného majetku zahrnuje faktury s DPH, na základě data vystavení faktury.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Poznámka: U hmotného majetku, by měl být používat termín dodání pro přesnější zobrazení.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%% /Faktura
 NotUsedForGoods=Nepoužívá se pro zboží
 ProposalStats=Statistiky o nabídkách
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=podle dodavatele zvolte vhodnou metodu použití ste
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obratová zpráva za zboží při použití režimu <b>hotovostního účetnictví</b> není relevantní. Tato zpráva je k dispozici pouze při použití režimu <b>zapojeného účetnictví</b>  (viz nastavení účetního modulu).
 CalculationMode=Výpočetní režim
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Účtování účet ve výchozím nastavení výběru daně - DPH při prodeji (používá pokud není definována v nastavení slovníku DPH)
-ACCOUNTING_VAT_BUY_ACCOUNT=Účtování v úvahu jako výchozí pro obnoveného DPH - DPH při nákupu (používá pokud není definována v nastavení slovníku DPH)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Účtovací účet pro platby DPH
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Chyba: bankovní účet nebyl nalezen
 FiscalPeriod=Účetní období
 ListSocialContributionAssociatedProject=Seznam příspěvků na sociální zabezpečení v souvislosti s projektem
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 4b4ae59ae45..26fe6ba9bd3 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Žádné registrované úkoly
 CronPriority=Priorita
 CronLabel=Štítek
 CronNbRun=Nb. zahájit
-CronMaxRun=Max nb. zahájení
+CronMaxRun=Max number launch
 CronEach=Každý
 JobFinished=Práce zahájena a dokončena
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Z
 CronType=Typ úlohy
 CronType_method=Call method of a PHP Class
 CronType_command=Shell příkaz
-CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home- Moduly nářadí- Seznam úloh" kde vidíte a upravujete naplánované úlohy.
 JobDisabled=Úloha vypnuta
 MakeLocalDatabaseDumpShort=Záloha lokální databáze
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 9f227e58df7..aff47efcaf9 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP shoda není úplná.
 ErrorLDAPMakeManualTest=. LDIF soubor byl vytvořen v adresáři %s. Zkuste načíst ručně z příkazového řádku získat více informací o chybách.
 ErrorCantSaveADoneUserWithZeroPercentage=Nelze uložit akci s &quot;Statut nezačal&quot;, pokud pole &quot;provádí&quot; je také vyplněna.
 ErrorRefAlreadyExists=Ref používá pro tvorbu již existuje.
-ErrorPleaseTypeBankTransactionReportName=Prosím, zadejte název banky prohlášení, kde je hlášeno záznam (ve formátu RRRRMM nebo RRRRMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Nepodařilo se odstranit záznam, protože má nějaké Childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Nelze odstranit záznam. Ten se již používá, nebo je zahrnut do jiných objektů.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Nepodařilo se přidat záznam do %s %s pošťák
 ErrorFailedToRemoveToMailmanList=Nepodařilo se odstranit záznam %s %s na seznam pošťák nebo SPIP základny
 ErrorNewValueCantMatchOldValue=Nová hodnota nemůže být rovno staré
 ErrorFailedToValidatePasswordReset=Nepodařilo se Reinit heslo. Může být reinit již byla provedena (tento odkaz lze použít pouze jednou). Pokud ne, zkuste restartovat reinit procesu.
-ErrorToConnectToMysqlCheckInstance=Připojení k databázi se nezdaří. Zkontrolujte, MySQL server běží (ve většině případů, můžete ji spustit z příkazového řádku: sudo / etc / init.d / mysql start ').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Nepodařilo se přidat kontakt
 ErrorDateMustBeBeforeToday=Datum nemůže být větší než dnešní. Nejsme v SSSR.
 ErrorPaymentModeDefinedToWithoutSetup=Platební režim byl nastaven na typ %s ale nastavení modulu Faktury nebyla dokončena definovat informace, které se pro tento platební režim.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=Heslo bylo nastaveno pro tohoto člena. Nicméně, žádný uživatelský účet byl vytvořen. Takže toto heslo uloženo, ale nemůže být použit pro přihlášení do Dolibarr. Může být použit externí modulu / rozhraní, ale pokud nepotřebujete definovat libovolné přihlašovací jméno ani heslo pro členem, můžete možnost vypnout „Správa přihlášení pro každého člena“ z nastavení člen modulu. Pokud potřebujete ke správě přihlášení, ale nepotřebují žádné heslo, můžete mít toto pole prázdné, aby se zabránilo toto upozornění. Poznámka: E-mail může být také použit jako přihlášení v případě, že člen je připojen k uživateli.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Někdy byly zaznamenány u některých uživa
 WarningYourLoginWasModifiedPleaseLogin=Vaše přihlašovací byla upravena. Z bezpečnostních účel budete muset přihlásit pomocí nových přihlašovacích údajů před další akci.
 WarningAnEntryAlreadyExistForTransKey=Položka již existuje pro překladatelské klíč pro tento jazyk
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/cs_CZ/loan.lang b/htdocs/langs/cs_CZ/loan.lang
index c30a6e8e5b2..6a8ea7ea774 100644
--- a/htdocs/langs/cs_CZ/loan.lang
+++ b/htdocs/langs/cs_CZ/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Konfigurace modulu úvěru
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 806b2ca3f39..40b7115edba 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Aktuální počet cílených kontaktních e-mailů
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 98dbb97994d..d3d91dbab61 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametr %s není definován
 ErrorUnknown=Neznámá chyba
 ErrorSQL=Chyba SQL
 ErrorLogoFileNotFound=Soubor s logem '%s' nebyl nalezen
-ErrorGoToGlobalSetup=Přejděte do nastavení 'Společnosti / Nadace' pro opravu
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Přejděte do Nastavení modulů pro opravu
 ErrorFailedToSendMail=Nepodařilo se odeslat poštu (odesílatel=%s, příjemce=%s)
 ErrorFileNotUploaded=Soubor nebyl nahrán. Zkontrolujte, zda velikost nepřesahuje maximální povolenou, že je volné místo na disku a že se v adresáři nenachází soubor se stejným názvem.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Chyba, pro zemi '%s' nejsou definovány ž
 ErrorNoSocialContributionForSellerCountry=Chyba, žádná společenská / daně typ fiskální definován pro země ‚%s‘.
 ErrorFailedToSaveFile=Chyba, nepodařilo se uložit soubor.
 ErrorCannotAddThisParentWarehouse=Snažíte se přidat nadřazené sklad, který je již dítě aktuálního
-MaxNbOfRecordPerPage=Max nb záznamu na stránku
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Nejste oprávněni k tomu, že.
 SetDate=Nastavení datumu
 SelectDate=Výběr datumu
 SeeAlso=Viz také %s
 SeeHere=Nahlédněte zde
+ClickHere=Klikněte zde
+Here=Here
 Apply=Aplikovat
 BackgroundColorByDefault=Výchozí barva pozadí
 FileRenamed=Soubor byl úspěšně přejmenován
@@ -185,6 +187,7 @@ ToLink=Odkaz
 Select=Vybrat
 Choose=Zvolit
 Resize=Změna velikosti
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Autor
 User=Uživatel
@@ -325,8 +328,10 @@ Default=Standardní
 DefaultValue=Výchozí hodnota
 DefaultValues=výchozí hodnoty
 Price=Cena
+PriceCurrency=Price (currency)
 UnitPrice=Jednotková cena
 UnitPriceHT=Jednotková cena (bez DPH)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (měna)
 PriceUTTC=U.P. (Včetně daně)
 Amount=Množství
 AmountInvoice=Fakturovaná částka
+AmountInvoiced=Amount invoiced
 AmountPayment=Částka platby
 AmountHTShort=Částka (bez DPH)
 AmountTTCShort=Částka (vč. DPH)
@@ -353,6 +359,7 @@ AmountLT2ES=Částka IRPF
 AmountTotal=Celková částka
 AmountAverage=Průměrná částka
 PriceQtyMinHT=Cena množství min. (po zdanění)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Procento
 Total=Celkový
 SubTotal=Mezisoučet
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Daňová sazba
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Průměr
 Sum=Součet
@@ -419,7 +428,8 @@ ActionRunningShort=probíhá
 ActionDoneShort=Ukončený
 ActionUncomplete=Nekompletní
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Společnost / Organizace
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kontakty pro tuto třetí stranu
 ContactsAddressesForCompany=Kontakty/adresy pro tuto třetí stranu
 AddressesForCompany=Adresy pro tuto třetí stranu
@@ -427,6 +437,9 @@ ActionsOnCompany=Akce u této třetí strany
 ActionsOnMember=Akce u tohoto uživatele
 ActionsOnProduct=Events about this product
 NActionsLate=%s pozdě
+ToDo=Dělat
+Completed=Completed
+Running=probíhá
 RequestAlreadyDone=Poptávka je již zaznamenaná
 Filter=Filtr
 FilterOnInto=Kritéria hledání '<strong> %s </ strong>' do polí %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Pozor, jste v režimu údržby, jen pro přihlá
 CoreErrorTitle=Systémová chyba
 CoreErrorMessage=Je nám líto, došlo k chybě. Obraťte se na správce systému a zkontrolujte protokoly nebo zakázat $ dolibarr_main_prod=1 pro získání více informací.
 CreditCard=Kreditní karta
+ValidatePayment=Ověření platby
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Pole označená * jsou povinná <b>%s</b>
 FieldsWithIsForPublic=Pole s <b>%s</b> jsou uvedeny na veřejném seznamu členů. Pokud si to nepřejete, zaškrtněte "veřejný" box.
 AccordingToGeoIPDatabase=(Podle GeoIP konverze)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Související objekty
 ClassifyBilled=Označit jako účtováno
+ClassifyUnbilled=Classify unbilled
 Progress=Pokrok
-ClickHere=Klikněte zde
 FrontOffice=Přední kancelář
 BackOffice=Back office
 View=Pohled
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekt
 Projects=Projekty
 Rights=Oprávnění
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
@@ -890,7 +907,7 @@ Select2MoreCharacters=nebo více znaků
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Načítání dalších výsledků ...
 Select2SearchInProgress=Probíhá vyhledávání ...
-SearchIntoThirdparties=Subjekty
+SearchIntoThirdparties=Třetí strany
 SearchIntoContacts=Kontakty
 SearchIntoMembers=Členové
 SearchIntoUsers=Uživatelé
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Všichni
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Přiřazeno
diff --git a/htdocs/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang
index eb410f737c1..4b1df89dc86 100644
--- a/htdocs/langs/cs_CZ/margins.lang
+++ b/htdocs/langs/cs_CZ/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Hodnocení musí být číselná hodnota
 markRateShouldBeLesserThan100=Označení sazby by měla být nižší než 100
 ShowMarginInfos=Ukázat informace o marži
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index 5ae3d8439c9..a11c48dc9f5 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Seznam potvrzených veřejné členy
 ErrorThisMemberIsNotPublic=Tento člen je neveřejný
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Další člen (jméno: <b>%s,</b> login: <b>%s)</b> je již spojena s třetími stranami <b>%s.</b> Odstraňte tento odkaz jako první, protože třetí strana nemůže být spojována pouze člen (a vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Z bezpečnostních důvodů musí být uděleno oprávnění k úpravám, aby všichni uživatelé mohli spojit člena uživatele, která není vaše.
-ThisIsContentOfYourCard=Dobrý den. <br> <br> Je to připomenutí informace kterou dostaneme o vás. Neváhejte nás kontaktovat, pokud něco vypadá špatně. <br>
-CardContent=Obsah vaší členskou kartu
 SetLinkToUser=Odkaz na uživateli Dolibarr
 SetLinkToThirdParty=Odkaz na Dolibarr třetí osobě
 MembersCards=Členové vizitky
@@ -108,17 +106,33 @@ PublicMemberCard=Členské veřejné karta
 SubscriptionNotRecorded=Předplatné nezaznamenává
 AddSubscription=Vytvořit odběr
 ShowSubscription=Zobrazit předplatné
-SendAnEMailToMember=Poslat e-mail Informace o členovi
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Obsah vaší členskou kartu
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Předmět e-mailu obdržel v případě auto-nápis host
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail přijatý v případě auto-nápis host
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Předmět e-mailu pro členské autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail pro členské autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=Předmět e-mailu pro členské validaci
-DescADHERENT_MAIL_VALID=EMail pro členské validaci
-DescADHERENT_MAIL_COTIS_SUBJECT=Předmět e-mailu k upisování
-DescADHERENT_MAIL_COTIS=E-mail pro odběr
-DescADHERENT_MAIL_RESIL_SUBJECT=Předmět e-mailu pro členské resiliation
-DescADHERENT_MAIL_RESIL=EMail pro členské resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Odesílatele pro automatické e-maily
 DescADHERENT_ETIQUETTE_TYPE=Formát etikety stránku
 DescADHERENT_ETIQUETTE_TEXT=Text tištěný na listech členských adrese
@@ -177,3 +191,8 @@ NoVatOnSubscription=Ne TVA za upsaný vlastní kapitál
 MEMBER_PAYONLINE_SENDEMAIL=Email pouze pro e-mailové upozornění, když Dolibarr obdrží potvrzení o ověřenou platby za úpis (příklad: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt slouží k odběru linku do faktury: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index f71c16ee3f3..11798dbf39b 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Návratová stránka se zprávou o schválení platby
 MessageKO=Návratová stránka se zprávou o zrušení platby
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Propojený objekt
 NbOfActiveNotifications=Počet hlášení (několik z příjemců e-mailů)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start uploadu
 CancelUpload=Zrušení uploadu
 FileIsTooBig=Soubor je příliš velký
 PleaseBePatient=Prosím o chvilku strpení ... dřu jako kůň ....
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Požadavek na změnu vašeho hesla do Dolibarru byl přijat
 NewKeyIs=To je vaše nové heslo k přihlášení
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL stránky
 WEBSITE_TITLE=Titul
 WEBSITE_DESCRIPTION=Popis
 WEBSITE_KEYWORDS=Klíčová slova
+LinesToImport=Lines to import
diff --git a/htdocs/langs/cs_CZ/paypal.lang b/htdocs/langs/cs_CZ/paypal.lang
index 605a7ad49fa..ae8a2652acb 100644
--- a/htdocs/langs/cs_CZ/paypal.lang
+++ b/htdocs/langs/cs_CZ/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Pouze PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Toto je id transakce: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Přidat URL platby PayPal při odeslání dokumentu e-mailem
-PredefinedMailContentLink=Můžete kliknout na níže uvedený odkaz pro bezpečné provedení platby (PayPal), pokud jste tak již neudělal dříve. \n\n %s \n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 8d4497c11d2..94b3fd5c8df 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Produkt nebo služba
 ProductsAndServices=Produkty a služby
 ProductsOrServices=Výrobky nebo služby
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Jste si jisti, že chcete smazat tuto produktovou řadu
 ProductSpecial=Speciální
 QtyMin=Minimální množství
 PriceQtyMin=Cena za toto min. množství (w/o sleva)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Sazba DPH (pro tohoto dodavatele/produkt)
 DiscountQtyMin=Množství pro výchozí slevu
 NoPriceDefinedForThisSupplier=Žádná cena/množství není definována pro tohoto dodavatele/produktu
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index f340ed18915..a59077e5ff2 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Kontakty projektu
 ProjectsImContactFor=Projekty Jsem výslovně kontakt of
 AllAllowedProjects=All projekt mohu číst (důlní + veřejné)
 AllProjects=Všechny projekty
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Tento pohled zobrazuje všechny projekty které máte oprávnění číst.
 TasksOnProjectsPublicDesc=Tento pohled představuje všechny úkoly na projektech jsou povoleny číst.
 ProjectsPublicTaskDesc=Tento pohled představuje všechny projekty a úkoly, které mají povoleno číst.
 ProjectsDesc=Tento pohled zobrazuje všechny projekty (vaše uživatelské oprávnění vám umožňuje vidět vše).
 TasksOnProjectsDesc=Tento pohled představuje všechny úkoly na všech projektech (vaše uživatelská oprávnění udělit oprávnění ke shlédnutí vše).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Pouze otevřené projekty jsou viditelné (projekty v návrhu ani v uzavřeném stavu nejsou viditelné).
 ClosedProjectsAreHidden=Uzavřené projekty nejsou viditelné.
 TasksPublicDesc=Tento pohled zobrazuje všechny projekty a úkoly které máte oprávnění číst.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Úkoly na otevřených projektech
 WorkloadNotDefined=Pracovní zátěž není definována
 NewTimeSpent=Strávený čas
 MyTimeSpent=Můj strávený čas
+BillTime=Bill the time spent
 Tasks=Úkoly
 Task=Úkol
 TaskDateStart=Datum zahájení úkolu
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Seznam darů spojených s projektem
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Seznam událostí spojených s projektem
 ListTaskTimeUserProject=Seznam času spotřebována na úkolech projektu
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Aktivita na projektu dnes
 ActivityOnProjectYesterday=Aktivita na projektu včera
 ActivityOnProjectThisWeek=Týdenní projektová aktivita
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Měsíční projektová aktivita
 ActivityOnProjectThisYear=Roční projektová aktivita
 ChildOfProjectTask=Podpoložka projektu / úkolu
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Není vlastníkem privátního projektu
 AffectedTo=Přiděleno
 CantRemoveProject=Tento projekt nelze odstranit, neboť se na něj odkazují některé jiné objekty (faktury, objednávky či jiné). Viz záložku "Připojené objekty"
@@ -137,6 +140,7 @@ ProjectReportDate=Změnit datum úkolu dle data zahájení projektu
 ErrorShiftTaskDate=Nelze přesunout datum úkolu dle nového data zahájení projektu
 ProjectsAndTasksLines=Projekty a úkoly
 ProjectCreatedInDolibarr=Projekt %s vytvořen
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Projekt %s modifikované
 TaskCreatedInDolibarr=Úkol %s vytvořen
 TaskModifiedInDolibarr=Úkol %s upraven
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/cs_CZ/propal.lang b/htdocs/langs/cs_CZ/propal.lang
index f571e84c8a8..3b71bb95eb1 100644
--- a/htdocs/langs/cs_CZ/propal.lang
+++ b/htdocs/langs/cs_CZ/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Podpis (potřeba fakturace)
 PropalStatusNotSigned=Nejste přihlášen (uzavřený)
 PropalStatusBilled=Účtováno
 PropalStatusDraftShort=Návrh
+PropalStatusValidatedShort=Ověřeno
 PropalStatusClosedShort=Zavřeno
 PropalStatusSignedShort=Podepsaný
 PropalStatusNotSignedShort=Nepodepsaný
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
index 697fdc03f67..ee4ea89b641 100644
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Tato hodnota může být použita pro výpočet nákladů času s
 TJMDescription=Tato hodnota je v současné době pouze jako informace a nebyla využita k výpočtu
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 56fbc66867f..fdc77a4beab 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Upravit skladiště
 MenuNewWarehouse=Nové skladiště
 WarehouseSource=Zdrojový sklad
 WarehouseSourceNotDefined=Není definován žádné skladiště
+AddWarehouse=Create warehouse
 AddOne=Přidat jedno
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Cílový sklad
 ValidateSending=Smazat odeslání
 CancelSending=Zrušit zasílání
@@ -22,6 +24,7 @@ Movements=Pohyby
 ErrorWarehouseRefRequired=Referenční jméno skladiště je povinné
 ListOfWarehouses=Seznam skladišť
 ListOfStockMovements=Seznam skladových pohybů
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Hnutí ID %d
 ListMouvementStockProject=Seznam pohybů zásob spojené s projektem
diff --git a/htdocs/langs/cs_CZ/stripe.lang b/htdocs/langs/cs_CZ/stripe.lang
index e3a9effb40e..b7745aa5ba7 100644
--- a/htdocs/langs/cs_CZ/stripe.lang
+++ b/htdocs/langs/cs_CZ/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang
index 3e65f39c76a..0e2bb142a63 100644
--- a/htdocs/langs/cs_CZ/trips.lang
+++ b/htdocs/langs/cs_CZ/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=Nová zpráva výdaje
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Množství nebo kilometrů
 DeleteTrip=Smazat zprávy o výdajích
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Čekání na schválení
 ExpensesArea=Oblast vyúčtování výdajů
 ClassifyRefunded=Označit jako 'Vráceno'
 ExpenseReportWaitingForApproval=Nová zpráva výdajů byla předložena ke schválení
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=ID zprávy výdajů
 AnyOtherInThisListCanValidate=Informovat osobu o schválení.
 TripSociete=Informace o firmě
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Deklaroval jste další hlášení výdajů do podobného časového období.
 AucuneLigne=Neexistuje žádná zpráva o právě deklarovaném výdaji
 
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index d5f18749532..d8058bf0f55 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -69,8 +69,8 @@ InternalUser=Interní uživatel
 ExportDataset_user_1=Uživatelé Dolibarr a jejich vlastnosti
 DomainUser=Doménový uživatel %s
 Reactivate=Reaktivace
-CreateInternalUserDesc=Tento formulář vám umožní vytvořit interního uživateli Vaší společnosti / nadace. Pro vytvoření externího uživatele (zákazník, dodavatel, ...), použijte tlačítko 'Vytvořit uživatele Dolibarr' z karty kontaktu třetí strany.
-InternalExternalDesc=<b>Interní</b> uživatel je uživatel, který je součástí vaší firmy / nadace. <br> <b>Externí</b> uživatel je zákazník, dodavatel nebo jiný. <br><br> V obou případech se oprávněními definují práva na Dolibarr. Externí uživatel navíc může mít jinou nabídku menu než-li interní (viz Domů - Nastavení - Zobrazení)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Povolení uděleno, neboť je zděděno z některé uživatelské skupiny.
 Inherited=Zděděný
 UserWillBeInternalUser=Vytvořený uživatel bude interní (protože není spojen s žádnou třetí stranou)
@@ -93,6 +93,7 @@ NameToCreate=Název třetí strany k vytvoření
 YourRole=Vaše role
 YourQuotaOfUsersIsReached=Vaše kvóta aktivních uživatelů je dosažena!
 NbOfUsers=Počet uživatelů
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Pouze superadmin může ponížit superadmina
 HierarchicalResponsible=Supervizor
 HierarchicView=Hierarchické zobrazení
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 63300e36e13..91c08b82723 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Vytvořte zde tolik vstupů jako množství různých webových
 DeleteWebsite=Odstranit web
 ConfirmDeleteWebsite=Jste si jisti, že chcete smazat tuto webovou stránku? Všechny stránky a obsah budou odstraněny.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Název stránky / alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL externího souboru CSS
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Zobrazit stránku v nové kartě
 SetAsHomePage=Nastavit jako domovskou stránku
 RealURL=real URL
 ViewWebsiteInProduction=Pohled webové stránky s použitím domácí adresy URL
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Číst
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index b50cfc2cc26..cb0726c00e9 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Plocha trvalých příkazů zákazníků
 SuppliersStandingOrdersArea=Direct kreditní platební příkazy area
-StandingOrders=Inkasní příkazy k úhradě
-StandingOrder=Platba inkasem platební příkaz
+StandingOrdersPayment=Inkasní příkazy k úhradě
+StandingOrderPayment=Platba inkasem platební příkaz
 NewStandingOrder=Nový příkaz k inkasu
 StandingOrderToProcess=Ve zpracování
 WithdrawalsReceipts=příkazy k inkasu
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Poslední %s přímého inkasa debetní
 MakeWithdrawRequest=Vytvořit požadavek výběru
 WithdrawRequestsDone=%s přímé žádosti o debetní platební zaznamenán
 ThirdPartyBankCode=Bankovní kód třetí strany
-NoInvoiceCouldBeWithdrawed=Neúspěšný výběr z faktur. Zkontrolujte, že faktury jsou na firmy s platným BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Označit přidání kreditu
 ClassCreditedConfirm=Jste si jisti, že chcete zařadit tento výběr příjmu jako připsaný na váš bankovní účet?
 TransData=Datum přenosu
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistika podle stavu řádků
 RUM=UMR
 RUMLong=Unikátní Mandát Referenční
-RUMWillBeGenerated=UMR číslo se vygenerují údaje o bankovním účtu jsou uloženy
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Režim přímé inkaso (FRST nebo opakovat)
 WithdrawRequestAmount=Množství přání inkasa
 WithdrawRequestErrorNilAmount=Nelze vytvořit inkasa Žádost o prázdnou hodnotu.
@@ -98,6 +98,10 @@ ModeFRST=Jednorázová platba
 PleaseCheckOne=Zkontrolujte prosím jen jeden
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Placení inkasní příkaz k úhradě %s bankou
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 862faa4eae5..5c180fa544b 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -8,7 +8,7 @@ ACCOUNTING_EXPORT_AMOUNT=Eksporter beløb
 ACCOUNTING_EXPORT_DEVISE=Eksporter valuta
 Selectformat=Vælg formatet for filen
 ACCOUNTING_EXPORT_FORMAT=Vælg formatet for filen
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=Vælg linjeskift type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Angiv præfiks for filnavnet
 ThisService=Denne ydelse
 ThisProduct=Denne vare
@@ -25,8 +25,8 @@ Chartofaccounts=Kontoplan
 CurrentDedicatedAccountingAccount=Aktuel tildelt konto
 AssignDedicatedAccountingAccount=Ny konto, der skal tildeles
 InvoiceLabel=Fakturaetiket
-OverviewOfAmountOfLinesNotBound=Oversigt over antal linjer, der ikke er bundet til en regnskabskonto
-OverviewOfAmountOfLinesBound=Oversigt over antal linjer, der allerede er bundet til en regnskabskonto
+OverviewOfAmountOfLinesNotBound=Oversigt over antallet af linjer, der ikke er bundet til en regnskabsmæssig konto
+OverviewOfAmountOfLinesBound=Oversigt over antallet af linjer, der allerede er bundet til en regnskabsmæssig konto
 OtherInfo=Anden information
 DeleteCptCategory=Fjern regnskabskonto fra gruppe
 ConfirmDeleteCptCategory=Er du sikker på, du vil fjerne denne regnskabskonto fra gruppen?
@@ -35,8 +35,8 @@ AlreadyInGeneralLedger=Allerede bogført
 NotYetInGeneralLedger=Kladder der ikke er bogført endnu
 GroupIsEmptyCheckSetup=Gruppen er tom, kontroller opsætningen af ​​den brugerdefinerede regnskabsgruppe
 DetailByAccount=Vis detaljer efter konto
-AccountWithNonZeroValues=Accounts with non zero values
-ListOfAccounts=List of accounts
+AccountWithNonZeroValues=Konti med ikke-nul-værdier
+ListOfAccounts=Liste over konti
 
 MainAccountForCustomersNotDefined=Standardkonto for kunder, der ikke er defineret i opsætningen
 MainAccountForSuppliersNotDefined=Standardkonto for leverandører, der ikke er defineret i opsætningen
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Regnskabskonto som standard for solgte ydelser (
 Doctype=Dokumenttype
 Docdate=Dato
 Docref=Reference
-Code_tiers=Trediepart
 LabelAccount=Kontonavn
 LabelOperation=Label operation
 Sens=Sens
@@ -158,7 +157,7 @@ NumPiece=Partsnummer
 TransactionNumShort=Transaktionsnr.
 AccountingCategory=Regnskabskontogrupper
 GroupByAccountAccounting=Gruppér efter regnskabskonto
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+AccountingAccountGroupsDesc=Du kan definere her nogle grupper af regnskabskonto. De vil blive brugt til personlige regnskabsrapporter.
 ByAccounts=Konti
 ByPredefinedAccountGroups=Efter foruddefinerede grupper
 ByPersonalizedAccountGroups=Efter brugerdefinerede grupper
@@ -168,19 +167,18 @@ DeleteMvt=Slet posteringer i hovedbogen
 DelYear=År, der skal slettes
 DelJournal=Kladde, der skal slettes
 ConfirmDeleteMvt=Dette vil slette alle bogførte linjer i hovedbogen for år og/eller fra en bestemt journal. Mindst ét ​​kriterium er påkrævet.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Slet indhold i hovedbogen
+ConfirmDeleteMvtPartial=Dette vil slette transaktionen fra Ledger (alle linjer, der er relateret til samme transaktion vil blive slettet)
 FinanceJournal=Finanskladde
 ExpenseReportsJournal=Udgiftskladder
 DescFinanceJournal=Regnskabskladde inkl. alle betalingstyper med bankkonto
-DescJournalOnlyBindedVisible=Det er en oversigt over poster, der er bundet til regnskabskontoen og som kan bogføres
+DescJournalOnlyBindedVisible=Dette er en opfattelse af post, der er bundet til en regnskabsmæssig betragtning og kan være registreret i Regnskabet.
 VATAccountNotDefined=Momskonto ikke defineret
 ThirdpartyAccountNotDefined=Tredjepartskonto ikke defineret
 ProductAccountNotDefined=Varekonto ikke defineret
 FeeAccountNotDefined=Konto for gebyr ikke defineret
 BankAccountNotDefined=Bankkonto ikke defineret
 CustomerInvoicePayment=Betaling af kundefaktura
-ThirdPartyAccount=Tredjepart konto
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Ny transaktion
 NumMvts=Antal transaktioner
 ListeMvts=Liste over bevægelser
@@ -191,11 +189,11 @@ DescThirdPartyReport=Her findes listen over tredjepartskunder, leverandører og
 ListAccounts=Liste over regnskabskonti
 UnknownAccountForThirdparty=Ukendt tredjepartskonto. Vi vil bruge %s
 UnknownAccountForThirdpartyBlocking=Ukendt tredjepartskonto. Blokerende fejl
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ukendt tredjepartskonto og ventekonto ikke defineret. Blokeringsfejl
 
 Pcgtype=Kontoens gruppe
 Pcgsubtype=Kontoens undergruppe
-PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Gruppe og undergruppe af konto bruges som foruddefinerede "filter" og "grupperingskriterier" for nogle regnskabsrapporter. F.eks. Bruges 'INCOME' eller 'EXPENSE' som grupper til regnskabsregnskaber for produkter til opgørelse af udgifts- / indkomstrapporten.
 
 TotalVente=Samlet omsætning ekskl. moms
 TotalMarge=Samlet salgsforskel
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Fejl. Du kan ikke slette denne regnskabskonto,
 MvtNotCorrectlyBalanced=Bevægelsen er ikke korrekt afstemt. Kredit = %s. Debet = %s
 FicheVentilation=Oversigt over bindinger
 GeneralLedgerIsWritten=Transaktionerne er blevet bogført
-GeneralLedgerSomeRecordWasNotRecorded=Nogle af transaktionerne kunne ikke sendes. Hvis der ikke er nogen anden fejlmeddelelse, er det sandsynligvis fordi de allerede var afsendt.
-NoNewRecordSaved=No more record to journalize
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=Ikke flere post til bogføre
 ListOfProductsWithoutAccountingAccount=Liste over varer, der ikke er bundet til nogen regnskabskonto
 ChangeBinding=Ret binding
+Accounted=Regnskab i hovedbog
+NotYetAccounted=Endnu ikke indregnet i hovedbog
 
 ## Admin
 ApplyMassCategories=Anvend massekategorier
@@ -234,13 +234,15 @@ AccountingJournal=Kontokladde
 NewAccountingJournal=Ny kontokladde
 ShowAccoutingJournal=Vis kontokladde
 Nature=Natur
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Salg
 AccountingJournalType3=Køb
 AccountingJournalType4=Bank
 AccountingJournalType5=Udgiftsrapport
+AccountingJournalType8=Beholdning
 AccountingJournalType9=Har-nyt
 ErrorAccountingJournalIsAlreadyUse=Denne kladde er allerede i brug
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Eksporter udkast til kladde
@@ -254,13 +256,13 @@ Modelcsv_ciel=Eksporter til Sage Ciel Compta eller Compta Evolution
 Modelcsv_quadratus=Eksporter til Quadratus QuadraCompta
 Modelcsv_ebp=Eksporter til EBP
 Modelcsv_cogilog=Ekpsporter til Cogilog
-Modelcsv_agiris=Export towards Agiris
-Modelcsv_configurable=Export Configurable
+Modelcsv_agiris=Eksport til Agiris
+Modelcsv_configurable=Eksporter konfigurerbar
 ChartofaccountsId=ID for kontoplan
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Start regnskab
-InitAccountancyDesc=Denne side kan bruges til at initialisere en regnskabskonto for varer og ydelser, der ikke har en regnskabskonto defineret til salg og køb.
+InitAccountancyDesc=Denne side kan bruges til at initialisere en regnskabskonto for varer og ydelser, der ikke har en regnskabskonto defineret til salg og indkøb.
 DefaultBindingDesc=Denne side kan bruges til at angive en standardkonto, der skal bruges til at forbinde transaktionsoversigt over betaling af lønninger, donationer, afgifter og moms, når der ikke allerede er tilknyttet regnskabskonto.
 Options=Indstillinger
 OptionModeProductSell=Salg
@@ -282,11 +284,13 @@ Formula=Formel
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Visse obligatoriske trin i opsætningen blev ikke udført. Gør venligst dette
 ErrorNoAccountingCategoryForThisCountry=Ingen regnskabskontogruppe tilgængelig for land %s (Se Hjem - Opsætning - Ordbøger)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Det valgte eksportformat understøttes ikke på denne side
 BookeppingLineAlreayExists=Linjer findes allerede i bogføringen
 NoJournalDefined=Ingen kladde defineret
 Binded=Bundne linjer
 ToBind=Ubundne linjer
-UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
+UseMenuToSetBindindManualy=Auto detektion ikke muligt, brug menuen <a href="%s"> %s </a> for at gøre bogføringen manuelt
 
 WarningReportNotReliable=Advarsel, denne rapport er ikke baseret på hovedbogen, så den indeholder ikke transaktioner der er ændret manuelt i hovedbogen. Hvis din kladde er opdateret, bliver bogføringsoversigten mere retvisende.
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index ca4a588b88f..baa01b78c96 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -1,35 +1,35 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Grundlag
 Version=Version
-Publisher=Publisher
+Publisher=Forlægger
 VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Første installationsversion
+VersionLastUpgrade=Nyeste version
 VersionExperimental=Eksperimentel
 VersionDevelopment=Udvikling
 VersionUnknown=Ukendt
 VersionRecommanded=Anbefalet
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
+FileCheck=Filer integritet checker
+FileCheckDesc=Dette værktøj giver dig mulighed for at kontrollere filernes integritet og opsætning af din ansøgning, sammenligne hver fil med de officielle. Værdien af ​​nogle opsætningskonstanter kan også kontrolleres. Du kan bruge dette værktøj til at opdage, om nogle filer blev ændret af en hacker for eksempel.
+FileIntegrityIsStrictlyConformedWithReference=Filernes integritet er nøje i overensstemmelse med referencen.
+FileIntegrityIsOkButFilesWereAdded=Filters integritetskontrol er gået, men nogle nye filer blev tilføjet.
+FileIntegritySomeFilesWereRemovedOrModified=Filer integritetskontrol er mislykket. Nogle filer blev ændret, fjernet eller tilføjet.
+GlobalChecksum=Globalt checksum
+MakeIntegrityAnalysisFrom=Gør integritetsanalyse af applikationsfiler fra
+LocalSignature=Indlejret lokal signatur (mindre pålidelig)
+RemoteSignature=Fjern fjern signatur (mere pålidelig)
+FilesMissing=Manglende filer
+FilesUpdated=Opdaterede filer
+FilesModified=Ændrede filer
+FilesAdded=Tilføjede filer
+FileCheckDolibarr=Kontroller integriteten af ​​applikationsfiler
+AvailableOnlyOnPackagedVersions=Den lokale fil for integritetskontrol er kun tilgængelig, når applikationen er installeret fra en officiel pakke
+XmlNotFound=Xml Integrity File af applikation ikke fundet
 SessionId=Session ID
 SessionSaveHandler=Handler for at gemme sessioner
 SessionSavePath=Storage session localization
 PurgeSessions=Purge af sessioner
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Vil du virkelig slette alle sessioner? Dette vil slette alle bruger (bortset fra dig selv)
 NoSessionListWithThisHandler=Gem session handler konfigureret i din PHP tillader ikke at liste alle kørende sessioner.
 LockNewSessions=Lås nye forbindelser
 ConfirmLockNewSessions=Er du sikker på du vil begrænse enhver ny Dolibarr forbindelse til dig selv. Kun brugeren <b>%s</b> vil være i stand til at forbinde efter denne.
@@ -40,8 +40,8 @@ WebUserGroup=Webserver bruger / gruppe
 NoSessionFound=Din PHP synes ikke muligt at liste aktive sessioner. Directory bruges til at gemme sessioner <b>(%s)</b> kan være beskyttet (For eksempel ved at OS tilladelser eller PHP direktiv open_basedir).
 DBStoringCharset=Database charset til at gemme data
 DBSortingCharset=Database charset at sortere data
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
+ClientCharset=Klient karaktersæt
+ClientSortingCharset=Kunden sortering
 WarningModuleNotActive=<b>Modul %s</b> skal være aktiveret
 WarningOnlyPermissionOfActivatedModules=Kun tilladelser i forbindelse med aktiveret moduler er vist her. Du kan aktivere andre moduler i opsætningsskærmens - Modul side.
 DolibarrSetup=Dolibarr setup
@@ -51,28 +51,28 @@ InternalUsers=Interne brugere
 ExternalUsers=Eksterne brugere
 GUISetup=Udseende
 SetupArea=Opsætning
-UploadNewTemplate=Upload new template(s)
+UploadNewTemplate=Upload nye skabeloner
 FormToTestFileUploadForm=Form til test-fil upload (ifølge setup)
 IfModuleEnabled=Note: ja er kun effektivt, hvis <b>modul %s</b> er aktiveret
 RemoveLock=Fjern <b>fil %s,</b> hvis det er oprettet for at tillade opdateringen værktøj.
 RestoreLock=Erstatte en <b>fil %s</b> med læse tilladelse kun på filen for at deaktivere enhver brug af værktøj.
 SecuritySetup=Sikkerhed setup
-SecurityFilesDesc=Define here options related to security about uploading files.
+SecurityFilesDesc=Definer her muligheder relateret til sikkerhed om upload af filer.
 ErrorModuleRequirePHPVersion=Fejl, dette modul kræver PHP version %s eller højere
 ErrorModuleRequireDolibarrVersion=Fejl, dette modul kræver Dolibarr version %s eller højere
 ErrorDecimalLargerThanAreForbidden=Fejl, en præcision højere <b>end %s</b> er ikke understøttet.
 DictionarySetup=Opsætning af ordbog
 Dictionary=Ordbøger
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorReservedTypeSystemSystemAuto=Værdien 'system' og 'systemauto' for denne type er reserveret. Du kan bruge 'bruger' som værdi at tilføje din egen konto
 ErrorCodeCantContainZero=Kode kan ikke indeholde værdien 0
 DisableJavascript=Deaktiver JavaScript og Ajax-funktioner (Anbefales til blinde personer eller tekstbrowsere)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
+UseSearchToSelectCompanyTooltip=Også hvis du har et stort antal tredjeparter (> 100 000), kan du øge hastigheden ved at indstille konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
+UseSearchToSelectContactTooltip=Også hvis du har et stort antal tredjeparter (> 100 000), kan du øge hastigheden ved at indstille konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
+DelaiedFullListToSelectCompany=Vent på, at du trykker på en tast, inden du lægger indholdet af tredjeparts kombinationsliste op (Dette kan øge ydeevnen, hvis du har et stort antal tredjeparter, men det er mindre praktisk)
+DelaiedFullListToSelectContact=Vent, tryk på en tast, inden du lægger indholdet på kontaktkombinationen op (Dette kan øge ydeevnen, hvis du har et stort antal kontakter, men det er mindre praktisk)
 NumberOfKeyToSearch=NBR af tegn til at udløse søgning: %s
 NotAvailableWhenAjaxDisabled=Ikke tilgængelige, når Ajax handicappede
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+AllowToSelectProjectFromOtherCompany=På tredjeparts dokument kan man vælge et projekt knyttet til en anden tredjepart
 JavascriptDisabled=JavaScript slået
 UsePreviewTabs=Brug forhåndsvisning faner
 ShowPreview=Vis forhåndsvisning
@@ -80,7 +80,7 @@ PreviewNotAvailable=Preview ikke tilgængeligt
 ThemeCurrentlyActive=Tema aktuelt aktive
 CurrentTimeZone=Aktuelle tidszone
 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).
+TZHasNoEffect=Datoer gemmes og returneres af databaseserveren som om de blev holdt som sendt streng. Tidszonen har kun virkning, når du bruger UNIX_TIMESTAMP-funktionen (det bør ikke bruges af Dolibarr, så databasen TZ skal ikke have nogen effekt, selvom den er ændret efter indtastning af data).
 Space=Space
 Table=Tabel
 Fields=Områder
@@ -89,8 +89,8 @@ Mask=Maske
 NextValue=Næste værdi
 NextValueForInvoices=Næste værdi (fakturaer)
 NextValueForCreditNotes=Næste værdi (kreditnotaer)
-NextValueForDeposit=Next value (down payment)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=Næste værdi (forskudsbetaling)
+NextValueForReplacements=Næste værdi (udskiftninger)
 MustBeLowerThanPHPLimit=BEMÆRK: Din PHP grænser hver fil upload størrelse <b>til %s %s,</b> uanset denne parameter værdi er
 NoMaxSizeByPHPLimit=Bemærk: Ingen grænse er sat i din PHP-konfiguration
 MaxSizeForUploadedFiles=Maksimale størrelse for uploadede filer (0 til disallow enhver upload)
@@ -101,59 +101,59 @@ AntiVirusParam= Flere parametre på kommandolinjen
 AntiVirusParamExample= Eksempel for ClamWin: - database = "C: \\ Programmer (x86) \\ ClamWin \\ lib"
 ComptaSetup=Opsætning af regnskabsmodul
 UserSetup=Brugernes forvaltning setup
-MultiCurrencySetup=Multi-currency setup
+MultiCurrencySetup=Multi-valuta opsætning
 MenuLimits=Grænseværdier og nøjagtighed
 MenuIdParent=Moderselskab menuen ID
 DetailMenuIdParent=ID for moder menu (0 for en top-menuen)
 DetailPosition=Sorter antallet at definere menuen holdning
 AllMenus=Alle
-NotConfigured=Module/Application not configured
+NotConfigured=Modul/Applikation ikke konfigureret
 Active=Aktiv
 SetupShort=Setup
 OtherOptions=Andre valgmuligheder
 OtherSetup=Andre indstillinger
 CurrentValueSeparatorDecimal=Decimalseparator
 CurrentValueSeparatorThousand=Tusind separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Bestemmelsessted
+IdModule=Modul ID
+IdPermissions=Tilladelses ID
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Lokalisering parametre
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
+ClientTZ=Kunden Tidszone (bruger)
+ClientHour=Kunden Tid (bruger)
+OSTZ=Server OS Tids Zone
 PHPTZ=Tidszone Server PHP
 DaylingSavingTime=Sommertid (bruger)
 CurrentHour=Nuværende time
 CurrentSessionTimeOut=Aktuelle session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-AllWidgetsWereEnabled=All available widgets are enabled
+YouCanEditPHPTZ=For at indstille en anden PHP-tidszone (ikke påkrævet) kan du prøve at tilføje en fil .htaccess med en linje som denne "SetEnv TZ Europe / Paris"
+HoursOnThisPageAreOnServerTZ=Advarsel, i modsætning til andre skærmbilleder, er timer på denne side ikke i din lokale tidszone, men for serverens tidszone.
+Box=Boks
+Boxes=Bokse
+MaxNbOfLinesForBoxes=Max antal linjer til widgets
+AllWidgetsWereEnabled=Alle tilgængelige bokse er aktiveret
 PositionByDefault=Standard for
 Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusDesc=Hovedmenu for angive indholdet af de to menulinjer (vandret og lodret).
+MenusEditorDesc=Menuen editor giver dig mulighed for at definere dine egne menupunkter. Brug den omhyggeligt for at undgå ustabilitet og permanent utilgængelig i menuen poster. <br>Nogle moduler tilføje menupunkter( i en menu <b>Alle</b> for det meste ). Hvis du fjerner nogle af disse poster ved en fejl, kan du gendanne dem til at deaktivere og genaktivere modulet.
 MenuForUsers=Menu for brugere
 LangFile=Fil. Lang
 System=System
 SystemInfo=System information
 SystemToolsArea=Systemværktøjer område
 SystemToolsAreaDesc=Dette område giver administration funktioner. Brug menuen til at vælge den funktion, du leder efter.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+Purge=Ryd
+PurgeAreaDesc=Denne side giver dig mulighed for at slette alle filer oprettet eller gemt af Dolibarr (midlertidige filer eller alle filer i <b>%s</b>bibliotek). Brug ikke denne funktion nødvendigt. Denne løsning for brugere, hvis Dolibarr er installert hos en vært/udbyder, der ikke tilladelse til at slette filer, der genereres af web-serveren.
+PurgeDeleteLogFile=Slet log-filer, herunder <b>%s</b> oprettet til Syslog-modul (ingen risiko for at miste data)
+PurgeDeleteTemporaryFiles=At slette alle midlertidige filer (ingen risiko for at miste data)
+PurgeDeleteTemporaryFilesShort=Slet midlertidige filer
 PurgeDeleteAllFilesInDocumentsDir=Slet alle filer i <b>mappen %s.</b> Midlertidige filer, men også vedhæftede filer elementer (tredjemand, fakturaer, ...) og uploades i ECM-modul vil blive slettet.
 PurgeRunNow=Rensningsanordningen nu
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=Ingen mappe eller filer, der skal slettes.
 PurgeNDirectoriesDeleted=<b> %s</b> eller mapper slettes.
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeNDirectoriesFailed=Kunne ikke slette <b> %s </b> filer eller mapper.
 PurgeAuditEvents=Ryd sikkerhedshændelser
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=Er du sikker på du ønsker at ryde alle sikkerhedshændelser? Alle sikkerheds-logs vil blive slettet, ingen andre data, vil blive fjernet.
 GenerateBackup=Generer backup
 Backup=Backup
 Restore=Gendan
@@ -170,53 +170,53 @@ ImportPostgreSqlDesc=Sådan importerer du en backup-fil, skal du bruge pg_restor
 ImportMySqlCommand=%s %s &lt;mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Filnavn at generere
-Compression=Compression
+Compression=Kompression
 CommandsToDisableForeignKeysForImport=Kommando til at deaktivere udenlandske taster på import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+CommandsToDisableForeignKeysForImportWarning=Obligatorisk, hvis du ønsker at være i stand til at gendanne din sql dump senere
 ExportCompatibility=Kompatibilitet af genereret eksportfil
 MySqlExportParameters=MySQL eksport parametre
-PostgreSqlExportParameters= PostgreSQL export parameters
+PostgreSqlExportParameters= PostgreSQL eksportparametre
 UseTransactionnalMode=Brug transaktionsbeslutning mode
 FullPathToMysqldumpCommand=Fuld sti til mysqldump kommando
 FullPathToPostgreSQLdumpCommand=Fuld sti til pg_dump kommando
 AddDropDatabase=Tilføj DROP DATABASE kommando
 AddDropTable=Tilføj DROP TABLE kommando
-ExportStructure=Structure
+ExportStructure=Struktur
 NameColumn=Navn kolonner
 ExtendedInsert=Udvidede INSERT
 NoLockBeforeInsert=Ingen lås kommandoer omkring INSERT
 DelayedInsert=Forsinket indsætte
 EncodeBinariesInHexa=Encode binære data i hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+IgnoreDuplicateRecords=Ignorer fejl pga. Dubletter  (INSERT IGNORE)
 AutoDetectLang=Autodetect (browsersprog)
 FeatureDisabledInDemo=Funktionen slået fra i demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
+FeatureAvailableOnlyOnStable=Funktionen er kun tilgængelig på officielle stabile versioner
+BoxesDesc="Bokse" er skærm komponenter, der viser et stykke af oplysninger om nogle sider. Du kan vælge mellem at få vist feltet eller ikke ved at vælge aktiv side og klikke på 'Aktiver', eller ved at klikke på skraldespanden for at deaktivere den.
+OnlyActiveElementsAreShown=Kun elementer fra de <a href="%s">aktiverede moduler</a> er vist.
+ModulesDesc=Dolibarr moduler definere, hvilke funktioner er aktiveret i softwaren. Nogle moduler kræver tilladelser skal du give brugere, efter at have aktiveret modul.
+ModulesMarketPlaceDesc=Du kan finde flere moduler som kan downloades på eksterne hjemmesider på internettet ...
+ModulesDeployDesc=Hvis tilladelser på dit filsystem tillader det, kan du bruge dette værktøj til at installere et eksternt modul. Modulet vil så være synligt på fanen <strong> %s </ strong>.
+ModulesMarketPlaces=Finde eksterne app/moduler
+ModulesDevelopYourModule=Udvikle din egen app / moduler
+ModulesDevelopDesc=Du kan udvikle eller finde en partner til at udvikle til dig, dit personlige modul
+DOLISTOREdescriptionLong=I stedet for at aktivere <a href="https://www.dolistore.com"> www.dolistore.com </a> websitet for at finde et eksternt modul, kan du bruge dette indlejrede værktøj, der vil gøre søgningen på eksternt marked for dig (kan være langsom, brug for internetadgang) ...
 NewModule=Ny
-FreeModule=Free
-CompatibleUpTo=Compatible with version %s
-NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
-CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=See in Market place
-Updated=Updated
-Nouveauté=Novelty
-AchatTelechargement=Buy / Download
+FreeModule=Gratis
+CompatibleUpTo=Kompatibel med version %s
+NotCompatible=Dette modul virker ikke kompatibelt med din Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=Dette modul kræver en opdatering til din Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=Se på markedspladsen
+Updated=Opdater
+Nouveauté=Nyhed
+AchatTelechargement=Køb / Download
 GoModuleSetupArea=For at aktivere/installere et nyt modul, skal du gå opsætning af moduler her <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-DevelopYourModuleDesc=Some solutions to develop your own module...
+DoliPartnersDesc=Liste over virksomheder, der leverer specialudviklede moduler eller funktioner (Bemærk: Alle som har erfaring med PHP-programmering kan levere brugerdefineret udvikling til et open source-projekt)
+WebSiteDesc=Reference hjemmesider for at finde flere moduler...
+DevelopYourModuleDesc=Nogle løsninger til at udvikle dit eget modul ...
 URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+BoxesAvailable=Bokse til rådighed
+BoxesActivated=Bokse aktiveret
 ActivateOn=Aktivér om
 ActiveOn=Aktiveret på
 SourceFile=Kildefilen
@@ -227,22 +227,22 @@ Security=Sikkerhed
 Passwords=Passwords
 DoNotStoreClearPassword=Må ikke gemme adgangskoder i klar i databasen
 MainDbPasswordFileConfEncrypted=Database adgangskode krypteres i conf.php
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+InstrucToEncodePass=At have en adgangskode, der er kodet ind <b>conf.php</b> - fil, i stedet for linje <br><b>$dolibarr_main_db_pass="...";</b><br>Med<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=At have password afkodes (clear) i <b>conf.php</b> - fil, i stedet for linje <br><b>$dolibarr_main_db_pass="krypteret:...";</b><br><br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Beskyttelse af genereret pdf-filer (ikke recommandd, pauser masse pdf generation)
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+ProtectAndEncryptPdfFilesDesc=Beskyttelse af et PDF-dokument, holder den til rådighed til at læse og udskrive PDF-browser. Men, redigering og kopiering er ikke længere muligt. Bemærk, at ved hjælp af denne funktion er det ikke muligt at opbygge en/flere globalt flettede Pdf-filer.
 Feature=Funktion
 DolibarrLicense=Licens
 Developpers=Udviklere / bidragydere
 OfficialWebSite=International officielle hjemmeside
-OfficialWebSiteLocal=Local web site (%s)
+OfficialWebSiteLocal=Lokal hjemmeside (%s)
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Officielle markedsplads for eksterne moduler / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
+OfficialWebHostingService=Der refereres til web-hosting-tjenester (Cloud hosting)
+ReferencedPreferredPartners=Foretrukne partnere
 OtherResources=Andre ressourcer
-ExternalResources=External resources
+ExternalResources=Eksterne ressourcer
 SocialNetworks=Sociale netværk
 ForDocumentationSeeWiki=For brugerens eller bygherren dokumentation (doc, FAQs ...), <br> tage et kig på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=For alle andre spørgsmål / hjælpe, kan du bruge Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
@@ -250,48 +250,48 @@ HelpCenterDesc1=Dette område kan hjælpe dig med at få en supportfunktion på
 HelpCenterDesc2=En del af denne tjeneste er tilgængelig <b>på engelsk</b>.
 CurrentMenuHandler=Aktuel menu handleren
 MeasuringUnit=Måleenhed
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
+LeftMargin=Venstre margen
+TopMargin=Topmargen
+PaperSize=Papirtype
+Orientation=Orientering
+SpaceX=Rum X
+SpaceY=Rum Y
+FontSize=Skriftstørrelse
+Content=Indhold
 NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-EmailSenderProfiles=Emails sender profiles
+NewByMonth=Ny efter måned
+Emails=E-Post
+EMailsSetup=E-post sætop
+EMailsDesc=Denne side giver dig mulighed for at overskrive dine PHP parametre for e-mails afsendelse. I de fleste tilfælde på Unix / Linux OS, din PHP opsætning er korrekt, og disse parametre er nytteløs.
+EmailSenderProfiles=E-mails afsender profiler
 MAIN_MAIL_SMTP_PORT=SMTP Port (som standard i <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_SERVER=SMTP Host (Som standard i <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP Port (Ikke defineret i PHP på Unix-lignende systemer)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Host (Ikke defineret i PHP på Unix-lignende systemer)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_EMAIL_FROM=Afsenders e-mail for automatisk e-mails (Som standard i php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=E-mail bruges som "Fejl-Til" - feltet i e-mails sendt
 MAIN_MAIL_AUTOCOPY_TO= Send systematisk en skjult carbon-kopi af alle sendte e-mails til
-MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_DISABLE_ALL_MAILS=Deaktiver alle de e-mails sendings (til testformål eller demoer)
+MAIN_MAIL_FORCE_SENDTO=Sende alle e-mails til (i stedet for rigtige modtagere, til testformål)
 MAIN_MAIL_SENDMODE=Metode til at bruge til at sende e-mails
 MAIN_MAIL_SMTPS_ID=SMTP ID hvis påkrævet
 MAIN_MAIL_SMTPS_PW=SMTP Password hvis påkrævet
 MAIN_MAIL_EMAIL_TLS= Brug TLS (SSL) kryptering
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
+MAIN_MAIL_EMAIL_STARTTLS= Brug TLS (STARTTLS) kryptere
 MAIN_DISABLE_ALL_SMS=Deaktiver alle SMS sendings (til testformål eller demoer)
 MAIN_SMS_SENDMODE=Metode til at bruge til at sende SMS
 MAIN_MAIL_SMS_FROM=Standard afsenderens telefonnummer til afsendelse af SMS'er
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email)
-UserEmail=User email
+MAIN_MAIL_DEFAULT_FROMTYPE=Afsender e-mail som standard til manuelle afsendelser (bruger e-mail eller firma email)
+UserEmail=Bruger e-mail
 CompanyEmail=Firmaets e-mail
 FeatureNotAvailableOnLinux=Funktionen ikke til rådighed på Unix-lignende systemer. Test din sendmail program lokalt.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslation=Hvis oversættelse til dette sprog ikke er fuldstændig, eller finder du fejl, kan du rette dette ved at redigere filer i mappen<b> langs/%s</b>, og send din ændring www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Hvis oversættelsen for dette sprog ikke er færdigt, eller du finder fejl, kan du rette dette ved at redigere filer i mappen <b> langs / %s </b> og indsende ændrede filer på dolibarr.org/forum eller til udviklere på github.com/ Dolibarr / Dolibarr.
 ModuleSetup=Modul setup
-ModulesSetup=Modules/Application setup
+ModulesSetup=Moduler / Applikation sætop
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunderelationsstyring (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Leverandørrelationsstyring (SRM)
 ModuleFamilyProducts=Varestyring (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projekter / samarbejde
@@ -300,61 +300,61 @@ ModuleFamilyTechnic=Multi-moduler værktøjer
 ModuleFamilyExperimental=Eksperimentel moduler
 ModuleFamilyFinancial=Finansielle moduler (regnskab/økonomi)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
+ModuleFamilyPortal=Websteder og anden frontal applikation
+ModuleFamilyInterface=Grænseflader med eksterne systemer
 MenuHandlers=Menu håndterer
 MenuAdmin=Menu editor
 DoNotUseInProduction=Må ikke anvendes i produktion
-ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsProcessToFollow=Dette er trin til at behandle:
+ThisIsAlternativeProcessToFollow=Dette er et alternativt setup til at behandle manuelt:
 StepNb=Trin %s
 FindPackageFromWebSite=Find en pakke, der giver funktion, du ønsker (for eksempel på web site %s).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can submit the .zip file of module package here :
+DownloadPackageFromWebSite=Download-pakke (for eksempel fra officielle hjemmeside %s ).
+UnpackPackageInDolibarrRoot=Udpakning af pakkede filer til directory server, der er dedikeret til Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=For at installere / installere et eksternt modul skal du pakke de pakkede filer ud i serverkataloget dedikeret til moduler: <b> %s </ b>
+SetupIsReadyForUse=Modul-implementering er færdig. Du skal dog aktivere og opsætning af modulet i din ansøgning ved at gå på den side, til opsætning af moduler: <a href="%s">%s</a>.
+NotExistsDirect=Den alternative rodmappen er ikke defineret til en eksisterende mappe.<br>
+InfDirAlt=Siden version 3, er det muligt at definere en alternativ root directory. Dette giver dig mulighed for at gemme, til en dedikeret mappe, plugins og tilpassede skabeloner.<br / >du skal Bare oprette en mappe i roden af Dolibarr (f.eks: brugerdefineret).<br>
+InfDirExample=<br / >Derefter erklære, at det i filen <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br> Hvis disse linier er kommenteret med "#", for at aktivere dem, skal du udkommentere blot ved at fjerne " # " - tegnet.
+YouCanSubmitFile=Til dette trin, kan du indsende den .zip-fil af modul-pakke her :
 CurrentVersion=Dolibarr aktuelle version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
-UpdateServerOffline=Update server offline
-WithCounter=Manage a counter
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+CallUpdatePage=Gå til den side, der opdaterer databasen struktur og data: %s
+LastStableVersion=Seneste stabile version
+LastActivationDate=Seneste aktiveringsdato
+LastActivationAuthor=Seneste aktiveringsforfatter
+LastActivationIP=Seneste aktivering IP
+UpdateServerOffline=Opdater server offline
+WithCounter=Administrer en tæller
+GenericMaskCodes=Du kan indtaste enhver nummerering maske. I denne maske, følgende koder kan benyttes:<br><b>{000000}</b> svarer til et antal, som vil blive forøget på hver %s. Indtast så mange nuller, som den ønskede længde af tælleren. Tælleren vil være udfyldt med nuller fra venstre for at have så mange nuller, som maske. <br><b>{000000+000}</b> samme som tidligere, men en forskydning, der svarer til de tal til højre for tegnet + er anvendt, starter den første %s. <br><b>{000000@x}</b> samme som tidligere, men tælleren er blevet nulstillet til nul, når måned x er nået (x mellem 1 og 12, eller 0 for at bruge de første måneder af regnskabsåret, der er defineret i din konfiguration, eller 99 nulstiller man til nul hver måned). Hvis denne indstilling anvendes, og x er 2 eller højere, så er talfølgen {åå}{mm} eller {åååå}{mm} er også påkrævet. <br><b>{dd}</b> i dag (01 til 31).<br><b>{mm}</b> måned (01 til 12).<br><b>{åå}</b> er <b>{åååå}</b> eller <b>{y}</b> år over 2, 4 eller 1 tal. <br>
+GenericMaskCodes2=<b>{cccc}</b> den klient-kode på n tegn<br><b>{cccc000}</b> den klient-kode på n tegn, efterfulgt af en tæller, som er dedikeret til kunden. Denne tæller dedikeret til kunden er nulstillet på samme tid, end global counter.<br><b>{tttt}</b> koden af tredje part, type n tegn (se menu Home - Setup - Ordbog - Typer af tredjeparter). Hvis du tilføjer dette tag, tælleren vil være forskellige for hver type af tredje part.<br>
 GenericMaskCodes3=Alle andre tegn i maske vil forblive intakt. <br> Mellemrum er ikke tilladt. <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Eksempel på 99 %s af tredje part TheCompany, med dato 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Eksempel på tredjemand oprettet den 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Eksempel på vare oprettet 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes5=<b>ABC{åå}{mm}-{000000}</b> vil give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> vil give <b>0199-ZZZ/31/XXX</b><br><b>{åå}{mm}-{0000}-{t}</b> vil give <b>IN0701-0099-A</b>, hvis den type af virksomhed, er "Responsable Inscripto' med kode for type, der er 'A_RI'
 GenericNumRefModelDesc=Retur en tilpasselig antal henhold til en bestemt maske.
 ServerAvailableOnIPOrPort=Server findes på <b>adressen %s port %s</b>
 ServerNotAvailableOnIPOrPort=Serveren er ikke tilgængelig på <b>adressen %s port %s</b>
 DoTestServerAvailability=Test server-forbindelse
 DoTestSend=Test afsendelse
 DoTestSendHTML=Test sende HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=Fejl, kan ikke bruge option @ til at nulstille tælleren hvert år, hvis sekvens {yy} eller {yyyy} ikke er i masken.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fejl, kan ikke brugeren mulighed @ hvis SEQUENCE (yy) (mm) eller (ÅÅÅÅ) (mm) ikke er i masken.
 UMask=UMask parameter for nye filer på Unix / Linux / BSD-filsystemet.
 UMaskExplanation=Denne parameter giver dig mulighed for at definere tilladelser indstillet som standard på filer, der er oprettet ved Dolibarr på serveren (under upload for eksempel). <br> Det må være oktal værdi (for eksempel 0666 betyder, læse og skrive for alle). <br> Ce paramtre ne Sert Pas sous un serveur Windows.
-SeeWikiForAllTeam=Tag et kig på wiki side for fuld liste over alle aktører og deres organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Forsinkelse for caching eksport svar i sekunder (0 eller tomme for ikke cache)
 DisableLinkToHelpCenter=Skjul linket <b>"Har du brug for hjælp eller støtte"</b> på loginsiden
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelp=Skjul link til online hjælp "<b>%s</b>\\
 AddCRIfTooLong=Der er ingen automatisk indpakning, så hvis linje er ude af side om dokumenter, fordi alt for længe, skal du tilføje dig transport afkast i textarea.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
+ConfirmPurge=Er du sikker på du ønsker at udføre denne udrensning?<br>Dette vil slette absolut alle dine data, filer, med ingen måde til at genoprette dem (ECM-filer, vedhæftede filer...).
 MinLength=Mindste længde
 LanguageFilesCachedIntoShmopSharedMemory=Filer. Lang lastet i delt hukommelse
-LanguageFile=Language file
+LanguageFile=Sprogfil
 ExamplesWithCurrentSetup=Eksempler med den nuværende kører setup
 ListOfDirectories=Liste over OpenDocument-skabeloner mapper
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+ListOfDirectoriesForModelGenODT=Liste over mapper, som indeholder skabeloner filer med OpenDocument format.<br><br>her fulde sti til mapper.<br>Føjer vognretur mellem eah mappe.<br / >for At tilføje en mappe af GED modul, tilføje her <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Filer i disse mapper skal ende med <b>.odt</b> eller <b>.ods</b>.
+NumberOfModelFilesFound=Antallet af ODT/ODS skabeloner findes filer i disse mapper
 ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> At vide hvordan du opretter dine odt dokumentskabeloner, før gemme dem i disse mapper, skal du læse wiki dokumentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -367,110 +367,113 @@ ThemeDir=Skins mappe
 ConnectionTimeout=Connexion timeout
 ResponseTimeout=Svar timeout
 SmsTestMessage=Test besked fra __ PHONEFROM__ til __ PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ModuleMustBeEnabledFirst=Modul <b>%s</b> skal være aktiveret, hvis du har brug for denne funktion.
 SecurityToken=Nøglen til sikker URL'er
 NoSmsEngine=Ingen SMS-afsender leder til rådighed. SMS-afsender leder ikke er installeret med standard fordeling (fordi de er afhængig af en ekstern leverandør), men du kan finde nogle på http://www.dolistore.com
 PDF=PDF
 PDFDesc=Du kan indstille hvert globale muligheder i forbindelse med PDF-generation
 PDFAddressForging=Regler, Forge Adresse kasser
 HideAnyVATInformationOnPDF=Skjul alle oplysninger vedrørende moms på genererede PDF
-PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
+PDFLocaltax=Regler for %s
+HideLocalTaxOnPDF=Skjul %s sats i pdf kolonne skat salg
 HideDescOnPDF=Skjul varebeskrivelse på genereret PDF
 HideRefOnPDF=Skjul varereference på genereret PDF
 HideDetailsOnPDF=Skjul varelinjer på genereret PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=Brug fransk standardposition (La Poste) til kundeadresseposition
 Library=Bibliotek
 UrlGenerationParameters=Parametre for at sikre URL'er
 SecurityTokenIsUnique=Brug en unik securekey parameter for hver enkelt webadresse
 EnterRefToBuildUrl=Indtast reference for objekter %s
 GetSecuredUrl=Få beregnet URL
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Skjule knapperne til ikke-admin-brugere for uautoriserede handlinger i stedet for at vise nedtonet handicappede knapper
 OldVATRates=Gammel momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Rediger priser med basisreferenceværdi defineret på
-MassConvert=Launch mass convert
+MassConvert=Lanceringen masse konvertere
 String=String
 TextLong=Lang tekst
-Int=Integer
+HtmlText=Html text
+Int=Heltal
 Float=Float
 DateAndTime=Dato og tid
 Unique=Unik
-Boolean=Boolean (one checkbox)
+Boolean=Boolean (et afkrydsningsfelt)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Pris
 ExtrafieldMail = EMail
-ExtrafieldUrl = Url
+ExtrafieldUrl = url
 ExtrafieldSelect = Vælg liste
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator (not a field)
+ExtrafieldSelectList = Vælg fra tabellen
+ExtrafieldSeparator=Separator (ikke et felt)
 ExtrafieldPassword=Password
-ExtrafieldRadio=Radio buttons (on choice only)
-ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList=Checkboxes from table
-ExtrafieldLink=Link to an object
-ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+ExtrafieldRadio=Radio-knapper (på valg)
+ExtrafieldCheckBox=Afkrydsningsfelterne
+ExtrafieldCheckBoxFromList=Afkrydsningsfelter fra bordet
+ExtrafieldLink=Link til et objekt
+ComputedFormula=Beregnet felt
+ComputedFormulaDesc=Du kan indtaste her en formel ved hjælp af andre egenskaber af objekt eller en hvilken som helst PHP-kodning for at få en dynamisk beregningsværdi. Du kan bruge alle PHP-kompatible formler, herunder "?" betingelsesoperatør og følgende globale objekt: <br><strong> $ db, $ conf, $ langs, $ mysoc, $ bruger, $ objekt </strong>. <strong> ADVARSEL </strong>: Kun nogle egenskaber på $ objekt kan være tilgængeligt. Hvis du har brug for egenskaber, der ikke er indlæst, skal du bare hente objektet i din formel som i andet eksempel. <br> Ved at bruge et beregnet felt betyder det, at du ikke kan indtaste dig selv nogen værdi fra interface. Hvis der også er en syntaksfejl, kan formlen ikke returnere noget. <br> <br> Eksempel på formel: <br> $ objekt-> id <10? runde ($ objekt-> id / 2, 2): ($ objekt-> id + 2 * $ bruger-> id) * (int) substr ($ mysoc-> zip, 1, 2) <br> <br> Eksempel på genindlæsning af objekt <br> (($ reloadedobj = ny Societe ($ db)) && ($ reloadedobj-> hent ($ obj-> id? $ Obj-> id: ($ obj-> rowid? $ Obj-> rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> kapital / 5: '-1' <br> <br> Andet eksempel på formel for at tvinge belastning af objekt og dets overordnede objekt: <br> (($ reloadedobj = ny opgave ($ db)) && ($ reloadedobj-> hent ($ objekt-> id)> 0) && ($ secondloadedobj = nyt projekt ($ db)) && ($ secondloadedobj-> hente ($ reloadedobj-> fk_project )> 0))? $ secondloadedobj-> ref: 'Forældreprojekt ikke fundet'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
+ExtrafieldParamHelpselect=Liste over værdier, der skal være linjer med format nøgle,værdi (hvor nøglen ikke kan være '0')<br / ><br / > for eksempel : <br>1,værdi1<br>2,værdi2<br>code3,værdi3<br>...<br><br>for at få listen, afhængigt af anden supplerende attributliste :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>for at få listen afhængig af en anden liste :<br>1,værdi1|<i>parent_list_code</i>:parent_key<br>2,værdi2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=Liste over værdier, der skal være linjer med format nøgle,værdi (hvor nøglen ikke kan være '0')<br / ><br / > for eksempel : <br>1,værdi1<br>2,værdi2<br>3,værdi3<br>...
+ExtrafieldParamHelpradio=Liste over værdier, der skal være linjer med format nøgle,værdi (hvor nøglen ikke kan være '0')<br / ><br / > for eksempel : <br>1,værdi1<br>2,værdi2<br>3,værdi3<br>...
+ExtrafieldParamHelpsellist=Liste af værdier, der kommer fra en tabel<br>Syntaks : table_name:label_field:id_field::filter<br / >Eksempel : c_typent:libelle:id::filter<br / ><br / > - idfilter er necessarly en primær int-tasten<br / > - filter kan være en simpel test (f.eks aktiv=1) for kun at vise aktiv værdi<br>Du kan også bruge $ID,$ i filter heksen er den aktuelle id af aktuelle objekt<br>At gøre en VÆLGE filter bruge $SEL$<br / >hvis du ønsker at filtrere på extrafields bruge syntaks ekstra.fieldcode=... (hvor felt-koden er den kode extrafield)<br><br>for at få listen, afhængigt af anden supplerende attributliste:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>for at få listen afhængig af en anden liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Liste over værdier kommer fra en tabel <br> Syntax: table_name: label_field: id_field :: filter <br> Eksempel: c_typent: libelle: id :: filter <br> <br> filter kan være en simpel test (f.eks. Aktiv = 1 ) for at vise kun aktiv værdi <br> Du kan også bruge $ ID $ i filter heks er det nuværende id for nuværende objekt <br> For at gøre et SELECT i filter skal du bruge $ SEL $ <br> hvis du vil filtrere på ekstrafelter brug syntax extra.fieldcode = ... (hvor feltkode er koden for ekstrafelt) <br> <br> For at få listen afhængig af en anden komplementær attributliste: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> For at få listen afhængig af en anden liste: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelplink=Parametre skal være ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Eksempler: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
+LibraryToBuildPDF=Bibliotek, der bruges for PDF generation
+LocalTaxDesc=Nogle lande anvender 2 eller 3 skat på hver enkelt fakturalinje. Hvis dette er tilfældet, skal du vælge type for anden og tredje skat og sats. Det er muligt type er:<br>1 : lokal skat finder anvendelse på produkter og tjenesteydelser uden moms (localtax er beregnet på beløb uden moms)<br>2 : lokal skat gælder om produkter og tjenester er inklusive moms (localtax beregnes på beløbet + main skat)<br>3 : lokal skat finder anvendelse på produkter uden moms (localtax er beregnet på beløb uden moms)<br>4 : lokal skat finder anvendelse på produkter, inklusive moms (localtax beregnes på beløbet + main moms)<br>5 : lokal skat gælder om tjenesteydelser uden moms (localtax er beregnet på beløb uden moms)<br>6 : den lokale skat finder anvendelse på tjenester er inklusive moms (localtax er beregnet på beløb + moms)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
+LinkToTestClickToDial=Indtast et telefonnummer for at ringe op til at vise et link til at teste ClickToDial url-adresse for bruger <strong>%s</strong>
+RefreshPhoneLink=Opdater link
+LinkToTest=Klikbart link, der er genereret for bruger <strong>%s</strong> (klik på telefon-nummer for at teste)
+KeepEmptyToUseDefault=Holde tomt for at bruge standard værdi
 DefaultLink=Standard link
-SetAsDefault=Set as default
-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 <strong>%s</strong> record on <strong>%s</strong> %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.
-EnableFileCache=Enable file cache
-ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
-NoDetails=No more details in footer
+SetAsDefault=Indstillet som standard
+ValueOverwrittenByUserSetup=Advarsel, denne værdi kan blive overskrevet af bruger-specifik opsætning (hver bruger kan indstille sin egen clicktodial url)
+ExternalModule=Eksternt modul - Installeret i mappe %s
+BarcodeInitForThirdparties=Mass barcode init for tredjeparter
+BarcodeInitForProductsOrServices=Mass barcode init eller nulstil for produkter eller tjenester
+CurrentlyNWithoutBarCode=I øjeblikket har du <strong> %s </strong> post på <strong> %s </strong> %s uden stregkode defineret.
+InitEmptyBarCode=Initværdi for næste %s tomme poster
+EraseAllCurrentBarCode=Slet alle aktuelle stregkodeværdier
+ConfirmEraseAllCurrentBarCode=Er du sikker på, at du vil slette alle nuværende stregkodeværdier?
+AllBarcodeReset=Alle stregkodsværdier er blevet fjernet
+NoBarcodeNumberingTemplateDefined=Ingen nummerering stregkode skabelon aktiveret til stregkode modul opsætning.
+EnableFileCache=Aktivér filcache
+ShowDetailsInPDFPageFoot=Tilføj flere detaljer i footer af PDF-filer, som din virksomhedsadresse eller administrationsnavne (for at udfylde professionelle ids, firmakapital og momsnummer).
+NoDetails=Ikke flere detaljer i footer
 DisplayCompanyInfo=Vis firmaadresse
-DisplayCompanyManagers=Display manager names
+DisplayCompanyManagers=Vis administrationsnavne
 DisplayCompanyInfoAndManagers=Vis firmaadresse og ledelsens navne
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
+EnableAndSetupModuleCron=Hvis du vil have denne tilbagevendende faktura, der genereres automatisk, skal modul * %s * være aktiveret og korrekt opsat. Ellers skal generering af fakturaer udføres manuelt fra denne skabelon med knappen * Opret *. Bemærk, at selvom du aktiverede automatisk generation, kan du stadig sikkert starte den manuelle generation. Duplikater generation i samme periode er ikke mulig.
 ModuleCompanyCodeAquarium=Returner en regnskabskode sammensat af: <br> %s efterfulgt af tredjepartskoden for en leverandør, <br> %s efterfulgt af en tredjepartskode for en kunde.
 ModuleCompanyCodePanicum=Returner en tom regnskabskode.
 ModuleCompanyCodeDigitaria=Regnskabskode afhænger tredjepartskode. Koden er sammensat af tegnet "C" som første tegn efterfulgt af de første 5 bogstaver af tredjepartskoden.
-Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
-UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
-ClickToShowDescription=Click to show description
-DependsOn=This module need the module(s)
-RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-EnableDefaultValues=Enable usage of personalized default values
-EnableOverwriteTranslation=Enable usage of overwrote translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Use3StepsApproval=Som standard skal indkøbsordrer oprettes og godkendes af 2 forskellige brugere (et trin / bruger til oprettelse og et trin / bruger at godkende. Bemærk at hvis brugeren har begge tilladelser til at oprette og godkende, er et trin / bruger tilstrækkeligt) . Du kan spørge med denne mulighed for at indføre et tredje trin / brugergodkendelse, hvis mængden er højere end en dedikeret værdi (så 3 trin vil være nødvendige: 1 = validering, 2 = første godkendelse og 3 = anden godkendelse, hvis mængden er tilstrækkelig). <br> Indstil dette til tomt, hvis en godkendelse (2 trin) er tilstrækkelig, angiv den til en meget lav værdi (0,1), hvis der kræves en anden godkendelse (3 trin).
+UseDoubleApproval=Brug en 3-trins godkendelse, når beløbet (uden skat) er højere end ...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
+ClickToShowDescription=Klik for at vise beskrivelse
+DependsOn=Dette modul har brug for modulet / modulerne
+RequiredBy=Dette modul er påkrævet efter modul (er)
+TheKeyIsTheNameOfHtmlField=Dette er navnet på HTML-feltet. Dette skal have tekniske knowledges til at læse indholdet af HTML-siden for at få nøglenavnet på et felt.
+PageUrlForDefaultValues=Du skal indtaste her den relative url på siden. Hvis du indbefatter parametre i URL, vil standardværdierne være effektive, hvis alle parametre er indstillet til samme værdi. Eksempler:
+PageUrlForDefaultValuesCreate=<br> For formular til oprettelse af en ny tredjepart er det <strong> %s </strong>, <br> Hvis du kun vil have standardværdi, hvis url har nogle parametre, kan du bruge <strong> %s </strong>
+PageUrlForDefaultValuesList=<br> For en side, der viser tredjeparter, er det <strong> %s </strong>, <br> Hvis du kun vil have standardværdi, hvis url har nogle parametre, kan du bruge <strong> %s </strong>
+EnableDefaultValues=Aktivér brug af personlige standardværdier
+EnableOverwriteTranslation=Aktivér brug af overskrivet oversættelse
+GoIntoTranslationMenuToChangeThis=Der er fundet en oversættelse for nøglen med denne kode, så for at ændre denne værdi skal du redigere den fra Home-Setup-translation.
+WarningSettingSortOrder=Advarsel, indstilling af en standard sorteringsrækkefølge kan medføre en teknisk fejl, når du går på listesiden, hvis feltet er et ukendt felt. Hvis du oplever en sådan fejl, skal du komme tilbage til denne side for at fjerne standard sorteringsrækkefølgen og gendanne standardadfærd.
 Field=Field
-ProductDocumentTemplates=Document templates to generate product document
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
-WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
-SendEmailsReminders=Send agenda reminders by emails
+ProductDocumentTemplates=Dokumentskabeloner til generering af produktdokument
+FreeLegalTextOnExpenseReports=Gratis juridisk tekst om udgiftsrapporter
+WatermarkOnDraftExpenseReports=Vandmærke på udkast til udgiftsrapporter
+AttachMainDocByDefault=Sæt den til 1 hvis du ønsker at vedhæfte hoveddokumentet til e-mail som standard (hvis relevant)
+FilesAttachedToEmail=Vedhængt fil
+SendEmailsReminders=Send dagsorden påmindelser via e-mails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Brugere og grupper
-Module0Desc=Users / Employees and Groups management
+Module0Desc=Brugere / Medarbejdere og Grupper management
 Module1Name=Tredjemand
 Module1Desc=Virksomheder og kontakter "forvaltning
 Module2Name=Tilbud
@@ -490,7 +493,7 @@ Module30Desc=Fakturaer og kreditnotaer 'forvaltning for kunderne. Faktura 'forva
 Module40Name=Leverandører
 Module40Desc=Suppliers' ledelse og opkøb (ordrer og fakturaer)
 Module42Name=Debug Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module42Desc=Logning faciliteter (fil, syslog, ...). Disse logs er for teknisk/debug formål.
 Module49Name=Redaktion
 Module49Desc=Editors' ledelse
 Module50Name=Varer
@@ -502,13 +505,13 @@ Module52Desc=Lagerstyring (varer)
 Module53Name=Ydelser
 Module53Desc=Styring af ydelser
 Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Desc=Styring af kontrakter (tjenester eller reccuring abonnementer)
 Module55Name=Stregkoder
 Module55Desc=Stregkoder 'ledelse
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
+Module57Name="Direkte bank" betaling ordrer
+Module57Desc=Håndtering af betaling via "Direkte Debitering" ordrer. Det omfatter generation af SEPA-fil for de europæiske lande.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integration
 Module59Name=Bookmark4u
@@ -530,97 +533,99 @@ Module200Desc=LDAP directory synkronisering
 Module210Name=PostNuke
 Module210Desc=PostNuke integration
 Module240Name=Data eksport
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Værktøj til at eksportere Dolibarr data (med assistenter)
 Module250Name=Data import
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
+Module250Desc=Værktøj til at importere data ind i Dolibarr (med assistenter)
 Module310Name=Medlemmer
 Module310Desc=Instituttets medlemmer forvaltning
 Module320Name=RSS Feed
 Module320Desc=Tilføj RSS feed inde Dolibarr skærmen sider
 Module330Name=Bogmærker
 Module330Desc=Bogmærker forvaltning
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Projekter/Muligheder/Kundeemner
+Module400Desc=Ledelse af projekter, muligheder/kundeemner og/eller opgaver. Du kan også tildele et element (faktura, ordre, forslag, intervention, ...) til et projekt og få et tværgående udsigt fra projektet udsigt.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Særlige udgifter
 Module500Desc=Håndtering af særlige udgifter (skatter/afgifter, dividender)
-Module510Name=Payment of employee wages
-Module510Desc=Record and follow payment of your employee wages
+Module510Name=Betaling af medarbejderløn
+Module510Desc=Optag og følg betalingen af ​​dine medarbejderlønninger
 Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications on business events
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
-Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
-Module610Name=Product Variants
-Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
+Module520Desc=Forvaltning af lån
+Module600Name=Notifikationer om forretningshændelser
+Module600Desc=Send e-Mail meddelelser (udløst af nogle forretningsmæssige begivenheder) til brugere (setup, der er defineret på hver enkelt bruger), til tredjepart kontakter (setup, der er defineret på hver tredje part) eller til en standart e-mails
+Module600Long=Bemærk, at dette modul er dedikeret til at sende real-time e-mails, når der sker en dedikeret forretningshændelse. Hvis du leder efter en funktion til at sende påmindelser via e-mail til dine agendahændelser, skal du gå ind i opsætningen af ​​modulets dagsorden.
+Module610Name=Produkt Varianter
+Module610Desc=Giver mulighed for oprettelse af produkter-variant baseret på egenskaber (farve, størrelse, ...)
 Module700Name=Donationer
 Module700Desc=Gaver 'ledelse
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Udgiftsrapporter
+Module770Desc=Forvaltning og krav om udgiftsrapporter (transport, måltid, ...)
+Module1120Name=Leverandørens kommercielle forslag
+Module1120Desc=Anmod om leverandørens kommercielle forslag og priser
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
+Module1520Name=Dokumentgenerering
+Module1520Desc=Massemail dokumentgenerering
 Module1780Name=Tags/Categories
 Module1780Desc=Opret tags/kategori (varer, kunder, leverandører, kontakter eller medlemmer)
 Module2000Name=FCKeditor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2000Desc=Giver mulighed for at redigere nogle tekst-området ved hjælp af en avanceret editor (Baseret på CKEditor)
+Module2200Name=Dynamiske Priser
+Module2200Desc=Aktivér brugen af ​​matematiske udtryk til priser
 Module2300Name=Scheduled jobs
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2300Desc=Planlagte job management (alias cron eller chrono tabel)
 Module2400Name=Begivenheder/tidsplan
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Følg, afsluttet og kommende arrangementer. Lad program logger automatisk arrangementer for sporing eller optage manuel begivenheder eller mødesteder.
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2500Desc=Dokument Management System / Esdh. Automatisk organisering af dit genereret eller lagrede dokumenter. Dele dem, når du har brug for.
+Module2600Name=API/webservices (SOAP-server)
+Module2600Desc=Aktivere Dolibarr SOAP-server, der leverer API service
+Module2610Name=API / Web-tjenester (REST-server)
+Module2610Desc=Aktivér Dolibarr REST-serveren, der leverer API-tjenester
+Module2660Name=Ring til webservices (SOAP-klient)
+Module2660Desc=Aktivér Dolibarr web services klienten (Kan bruges til at skubbe data / forespørgsler til eksterne servere. Leverandør ordrer understøttes kun for øjeblikket)
 Module2700Name=Gravatar
 Module2700Desc=Brug online Gravatar service (www.gravatar.com) for at vise foto af brugere / medlemmer (fundet med deres e-mails). Har brug for en internetadgang
-Module2800Desc=FTP Client
+Module2800Desc=FTP Klient
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringer kapaciteter
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module3200Name=Unalterable Archives
-Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
+Module3100Desc=Tilføj en Skype-knap til brugere / tredjeparter / kontakter / medlemskort
+Module3200Name=Uændrede arkiver
+Module3200Desc=Aktiver log af nogle forretningsbegivenheder i en uforanderlig logfil. Begivenheder arkiveres i realtid. Loggen er en tabel med sammenkædede begivenheder, som kun kan læses og eksporteres. Dette modul kan være obligatorisk for nogle lande.
 Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=Human resources management (forvaltningen af ​​afdelingen, medarbejderkontrakter og følelser)
 Module5000Name=Multi-selskab
 Module5000Desc=Giver dig mulighed for at administrere flere selskaber
 Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Products lots
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
+Module6000Desc=Arbejdsstyring
+Module10000Name=websteder
+Module10000Desc=Opret offentlige websteder med en WYSIWG editor. Du skal bare konfigurere din webserver (Apache, Nginx, ...) for at pege på den dedikerede Dolibarr-mappe for at få den online på internettet med dit eget domænenavn.
+Module20000Name=Forespørgselsstyring
+Module20000Desc=Erklære og følge medarbejdere forespørgelse
+Module39000Name=Produkter masser
+Module39000Desc=Parti- eller serienummer, spisesteder og salgsdato-ledelse på produkter
 Module50000Name=PAYBOX
-Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
-Module50100Name=Cash desk
-Module50100Desc=Point of sales module (POS).
+Module50000Desc=Modul til at tilbyde en online-betalings side til at acceptere betalinger via PayPal (kreditkort-eller PayPal-kredit). Dette kan bruges til at give dine kunder en mulighed for at foretage betalinger eller til betaling på en særlig Dolibarr objekt (faktura, ordre, ...)
+Module50100Name=Kasseapparat
+Module50100Desc=Kasseapparats modul (POS)
 Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50200Desc=Modul til at tilbyde en online-betalings side til at acceptere betalinger via PayPal (kreditkort-eller PayPal-kredit). Dette kan bruges til at give dine kunder en mulighed for at foretage betalinger eller til betaling på en særlig Dolibarr objekt (faktura, ordre, ...)
 Module50400Name=Regnskab (avanceret)
 Module50400Desc=Regnskabssystem (bogholderi, understøtter kladder og bogføring)
 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=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
+Module54000Desc=Direkte udskrivning (uden at åbne dokumenterne) ved hjælp af IPP-konnektorens kopper (Printeren skal være synlig fra serveren, og CUPS skal installeres på serveren).
+Module55000Name=Afstemning, Undersøgelse eller Afstemning
+Module55000Desc=Modul til online undersøgelser, undersøgelser eller stemmer (som Doodle, Studs, Rdvz, ...)
 Module59000Name=Margin
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
+Module59000Desc=Modul til at styre avancer
+Module60000Name=Kommissioner
+Module60000Desc=Modul til at håndtere Kommissioner
+Module62000Name=Incoterm
+Module62000Desc=Tilføj funktioner til at administrere Incoterm
 Module63000Name=Ressourcer
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
+Module63000Desc=Administrer ressourcer (printere, biler, rum, ...), så kan du dele i begivenheder
 Permission11=Læs fakturaer
 Permission12=Opret/rediger kundefakturaer
 Permission13=Unvalidate fakturaer
@@ -640,10 +645,10 @@ Permission32=Opret/rediger varer/ydelser
 Permission34=Slet varer/ydelser
 Permission36=Se/administrer skjulte varer
 Permission38=Eksportere produkter
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission41=Opret/rediger projekter (delte projekter og projekter jeg er kontaktperson for). Kan også oprette opgaver og tildele brugere projekter og opgaver
 Permission42=Opret/rediger projekter (delte projekter og projekter jeg er kontaktperson for). Kan også oprette opgaver og tildele brugere projekter og opgaver
 Permission44=Slet projekter
-Permission45=Export projects
+Permission45=Eksport projekter
 Permission61=Læs interventioner
 Permission62=Opret/rediger indgreb
 Permission64=Slet interventioner
@@ -651,8 +656,8 @@ Permission67=Eksporter interventioner
 Permission71=Læs medlemmer
 Permission72=Opret/rediger medlemmer
 Permission74=Slet medlemmer
-Permission75=Setup types of membership
-Permission76=Export data
+Permission75=Hvilken type af medlemmerskab
+Permission76=Eksporter data
 Permission78=Læs abonnementer
 Permission79=Opret/rediger abonnementer
 Permission81=Læs kundernes ordrer
@@ -669,13 +674,13 @@ Permission94=Eksporter skatter/afgifter
 Permission95=Læs rapporter
 Permission101=Læs sendings
 Permission102=Opret/rediger forsendelser
-Permission104=Valider sendings
-Permission106=Export sendings
-Permission109=Slet sendings
+Permission104=Valider forsendelser
+Permission106=Eksporter forsendelser
+Permission109=Slet forsendelser
 Permission111=Læs finanskonti
 Permission112=Opret/rediger/slet og sammenlign transaktioner
 Permission113=Opsæt finanskonti (opret, håndter kategorier)
-Permission114=Reconciliate transactions
+Permission114=Afstemme transaktioner
 Permission115=Eksporttransaktioner og kontoudtog
 Permission116=Overførsler mellem konti
 Permission117=Administrer checks lastfordelingen
@@ -683,32 +688,32 @@ Permission121=Læs tredjemand knyttet til brugerens
 Permission122=Opret/rediger tredjeparter knyttet til brugeren
 Permission125=Slet tredjemand knyttet til brugerens
 Permission126=Eksporter tredjemand
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission141=Læs alle projekter og opgaver (også private projekter, jeg ikke har kontakt til)
+Permission142=Opret/rediger alle projekter og opgaver (også private projekter, jeg ikke har kontakt til)
+Permission144=Slet alle projekter og opgaver (også private projekter, jeg ikke har kontakt til)
 Permission146=Læs udbydere
 Permission147=Læs statistikinterval
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejects of direct debit payment orders
-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
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission151=Læs "direkte debitering" ordrer
+Permission152=Oprette/ændre en betaling med "direkte debitering" ordrer
+Permission153=Sende/Overføre betaling via "direkte debitering" ordrer
+Permission154=Registere Kreditter/Afvisninger af en betaling med "direkte debitering" ordrer
+Permission161=Læs kontrakter/abonnement
+Permission162=Opret / ændre kontrakter/abonnement
+Permission163=Aktivering af en tjeneste/abonnement af en kontrakt,
+Permission164=Deaktivere en service/abonnement af en kontrakt,
+Permission165=Slette aftaler/abonnementer
+Permission167=Eksportkontrakter
+Permission171=Læs rejser og udgifter (din og dine underordnede)
+Permission172=Opret/rediger ture og udgifter
+Permission173=Slette ture og udgifter
+Permission174=Læs alle rejser og udgifter
+Permission178=Eksport rejser og udgifter
 Permission180=Læs leverandører
 Permission181=Læs leverandør ordrer
 Permission182=Opret/rediger leverandørordrer
 Permission183=Valider leverandør ordrer
 Permission184=Godkend leverandør ordrer
-Permission185=Order or cancel supplier orders
+Permission185=Bestille eller afbestille leverandør ordrer
 Permission186=Modtag leverandør ordrer
 Permission187=Luk leverandør ordrer
 Permission188=Annuller leverandør ordrer
@@ -729,9 +734,9 @@ Permission221=Læs emailings
 Permission222=Opret/rediger e-mails (emne, modtagere ...)
 Permission223=Valider emailings (tillader afsendelse)
 Permission229=Slet emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission237=Se modtagere og info
+Permission238=Send e-mails manuelt
+Permission239=Slet e-mails efter godkendelse eller sendes
 Permission241=Læs kategorier
 Permission242=Opret/rediger kategorier
 Permission243=Slet kategorier
@@ -744,7 +749,7 @@ PermissionAdvanced253=Opret/rediger interne/eksterne brugere og tilladelser
 Permission254=Opret/rediger kun eksterne brugere
 Permission255=Opret/rediger anden brugers adgangskode
 Permission256=Ændre sin egen adgangskode
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc).<br>Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Udvide adgang til alle tredjeparter (ikke kun tredjeparter, der bruger et salg, repræsentant).<br / >Ikke er effektiv til eksterne brugere (altid begrænset til sig selv til forslag, ordrer, fakturaer, kontrakter, osv.).<br / >Ikke er effektiv til projekter (kun regler om projektet tilladelser, synlighed og assignement spørgsmål).
 Permission271=Læs CA
 Permission272=Læs fakturaer
 Permission273=Udsteder fakturaer
@@ -759,7 +764,7 @@ Permission300=Læs stregkoder
 Permission301=Opret/rediger stregkoder
 Permission302=Slet stregkoder
 Permission311=Læs ydelser
-Permission312=Assign service/subscription to contract
+Permission312=Tildel service/abonnement til kontrakt
 Permission331=Læs bogmærker
 Permission332=Opret/rediger bogmærker
 Permission333=Slet bogmærker
@@ -776,17 +781,17 @@ Permission401=Læs rabatter
 Permission402=Opret/rediger rabatter
 Permission403=Valider rabatter
 Permission404=Slet rabatter
-Permission501=Read employee contracts/salaries
-Permission502=Create/modify employee contracts/salaries
-Permission511=Read payment of salaries
-Permission512=Create/modify payment of salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission501=Læs medarbejderkontrakter / lønninger
+Permission502=Opret / modificere medarbejderkontrakter / lønninger
+Permission511=Læs betaling af lønninger
+Permission512=Opret / modificer betaling af løn
+Permission514=Slet lønninger
+Permission517=Eksport lønninger
+Permission520=Læs lån
+Permission522=Opret / modificer lån
+Permission524=Slet lån
+Permission525=Adgang låne regnemaskine
+Permission527=Eksport lån
 Permission531=Læs ydelser
 Permission532=Opret/rediger ydelser
 Permission534=Slet ydelser
@@ -795,16 +800,16 @@ Permission538=Eksport af tjenesteydelser
 Permission701=Læs donationer
 Permission702=Opret/rediger donationer
 Permission703=Slet donationer
-Permission771=Read expense reports (yours and your 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=Læs omkostningsrapporter (din og dine underordnede)
+Permission772=Opret / modificer omkostningsrapporter
+Permission773=Slet udgiftsrapporter
+Permission774=Læs alle udgiftsrapporter (selv for brugere, der ikke er underordnede)
+Permission775=Godkendelse af udgiftsrapporter
+Permission776=Betalingsomkostningsrapporter
+Permission779=Eksportudgiftsrapporter
 Permission1001=Læs bestande
 Permission1002=Opret/rediger varehuse
-Permission1003=Delete warehouses
+Permission1003=Slet varehuse
 Permission1004=Læs bestand bevægelser
 Permission1005=Opret/rediger lagerændringer
 Permission1101=Læs levering ordrer
@@ -819,7 +824,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
+Permission1190=Godkend (anden godkendelse) leverandør ordrer
 Permission1201=Få resultatet af en eksport
 Permission1202=Opret/rediger en eksport
 Permission1231=Læs leverandør fakturaer
@@ -828,17 +833,17 @@ Permission1233=Valider leverandør fakturaer
 Permission1234=Slet leverandør fakturaer
 Permission1235=Send leverandørfakturaer via e-mail
 Permission1236=Eksporter leverandør fakturaer, attributter og betalinger
-Permission1237=Export supplier orders and their details
+Permission1237=Eksporter leverandør ordrer og deres detaljer
 Permission1251=Kør massen import af eksterne data i databasen (data belastning)
 Permission1321=Eksporter kunde fakturaer, attributter og betalinger
-Permission1322=Reopen a paid bill
+Permission1322=Genåb en betalt regning
 Permission1421=Eksporter kundens ordrer og attributter
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
+Permission20003=Slet permitteringsforespørgsler
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Forladelsesforespørgsler (opsætning og opdateringsbalance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
@@ -849,82 +854,83 @@ Permission2403=Læs aktioner (begivenheder eller opgaver) af andre
 Permission2411=Læs aktioner (begivenheder eller opgaver) andres
 Permission2412=Opret/rediger handlinger (begivenheder eller opgaver) for andre
 Permission2413=Slet handlinger (events eller opgaver) andres
-Permission2414=Export actions/tasks of others
+Permission2414=Eksporter handlinger / opgaver af andre
 Permission2501=Læse dokumenter
 Permission2502=Indsend eller slette dokumenter
 Permission2503=Indsend eller slette dokumenter
 Permission2515=Setup dokumenter abonnentfortegnelser
-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=Brug FTP-klient i læsemodus (kun gennemse og download)
+Permission2802=Brug FTP-klient i skrivefunktion (slet eller upload filer)
+Permission50101=Brug salgssted
 Permission50201=Læs transaktioner
 Permission50202=Import transaktioner
 Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
+Permission55001=Læs afstemninger
+Permission55002=Opret / rediger afstemninger
+Permission59001=Læs kommercielle margener
+Permission59002=Definer kommercielle margener
+Permission59003=Læs hver brugermargen
+Permission63001=Læs ressourcer
+Permission63002=Opret / modificer ressourcer
+Permission63003=Slet ressourcer
 Permission63004=Link ressourcer til begivenheder i tidsplan
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
+DictionaryCompanyType=Typer af tredjeparter
+DictionaryCompanyJuridicalType=Juridiske former for tredjeparter
 DictionaryProspectLevel=Prospect potentielle niveau
 DictionaryCanton=Stat/provins
 DictionaryRegion=Regioner
 DictionaryCountry=Lande
 DictionaryCurrency=Valuta
-DictionaryCivility=Personal and professional titles
+DictionaryCivility=Personlige og faglige titler
 DictionaryActions=Begivenhedstyper
 DictionarySocialContributions=Typer af skatter/afgifter
 DictionaryVAT=Momssatser
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryRevenueStamp=Mængden af ​​omsætningsstempler
 DictionaryPaymentConditions=Betalingsbetingelser
 DictionaryPaymentModes=Betalingsformer
 DictionaryTypeContact=Kontakt/adresse-typer
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Miljøafgift (WEEE)
 DictionaryPaperFormat=Papir formater
-DictionaryFormatCards=Cards formats
-DictionaryFees=Expense report - Types of expense report lines
+DictionaryFormatCards=Kortformater
+DictionaryFees=Udgiftsrapport - Typer af udgiftsrapporter
 DictionarySendingMethods=Sendings metoder
 DictionaryStaff=Personale
 DictionaryAvailability=Levering forsinkelse
 DictionaryOrderMethods=Bestilling af metoder
 DictionarySource=Oprindelse af tilbud/ordrer
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyCategory=Personlige grupper til rapporter
+DictionaryAccountancysystem=Modeller til kontoplan
 DictionaryAccountancyJournal=Kontokladder
 DictionaryEMailTemplates=E-mail skabeloner
 DictionaryUnits=Enheder
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryProspectStatus=Prospektionsstatus
+DictionaryHolidayTypes=Typer af blade
+DictionaryOpportunityStatus=Opportunity status for projekt / bly
+DictionaryExpenseTaxCat=Udgiftsrapport - Transportkategorier
+DictionaryExpenseTaxRange=Omkostningsrapport - Område efter transportkategori
 SetupSaved=Setup gemt
-SetupNotSaved=Setup not saved
+SetupNotSaved=Opsætning er ikke gemt
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Tilbage til liste over ordbøger
-TypeOfRevenueStamp=Type of revenue stamp
+TypeOfRevenueStamp=Type afsætningsstempel
 VATManagement=Momshåndtering
 VATIsUsedDesc=Når der oprettes tilbud, fakturaer, ordrer osv., bruges som standard følgende regler for moms:<br>• Hvis sælger ikke er momspligtig, benyttes momssatsen 0.<br>• Hvis afsenderlandet er det samme som modtagerlandet, benyttes momssatsen for varen i afsenderlandet.<br>• Hvis både sælger og køber befinder sig i EU, og det drejer sig om fysiske varer, benyttes momssatsen 0. (Det forventes at køber betaler momsen i det modtagende land).<br>• Hvis både sælger og køber befinder sig i EU, og køber er en privatperson, benyttes momssatsen for varen i afsenderlandet.<br>• Hvis både sælger og køber befinder sig i EU, og køber er et firma, benyttes momssatsen 0.<br>• I alle andre tilfælde benyttes momssatsen 0.
 VATIsNotUsedDesc=Som standard benyttes momssatsen 0. Dette anvendes til regnskab for foreninger, enkeltpersoner eller virksomheder med lav omsætning (under 50.000 kr).
-VATIsUsedExampleFR=Virksomheder eller organisationer, der har reel skattepligt og er momsregistreret.
-VATIsNotUsedExampleFR=Godgørende organisationer, godkendte religiøse samfund og hobbyvirksomheder.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Hyppighed
-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
+LocalTax1IsNotUsed=Brug ikke anden skat
+LocalTax1IsUsedDesc=Brug en anden type skat (bortset fra moms)
+LocalTax1IsNotUsedDesc=Brug ikke anden form for skat (bortset fra moms)
+LocalTax1Management=Anden type skat
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-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
+LocalTax2IsNotUsed=Brug ikke tredje skat
+LocalTax2IsUsedDesc=Brug en tredje type skat (bortset fra moms)
+LocalTax2IsNotUsedDesc=Brug ikke anden form for skat (bortset fra moms)
+LocalTax2Management=Tredje type skat
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE Management
@@ -937,23 +943,23 @@ LocalTax2IsUsedDescES= RE sats som standard, når du opretter udsigter, fakturae
 LocalTax2IsNotUsedDescES= Som standard den foreslåede IRPF er 0. Slut på reglen.
 LocalTax2IsUsedExampleES= I Spanien, freelancere og selvstændige, der leverer tjenesteydelser og virksomheder, der har valgt at skattesystemet i de moduler.
 LocalTax2IsNotUsedExampleES= I Spanien er bussines ikke underlagt skattesystemet i moduler.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax=Rapporter om lokale skatter
+CalcLocaltax1=Salg - Køb
+CalcLocaltax1Desc=Lokale skatter rapporter beregnes med forskellen mellem localtaxes salg og localtaxes køb
 CalcLocaltax2=Køb
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax2Desc=Lokale skatter rapporter er de samlede køb af lokale afgifter
 CalcLocaltax3=Salg
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax3Desc=Lokale skatter rapporter er det samlede salg af localtaxes
 LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan findes for kode
 LabelOnDocuments=Etiketten på dokumenter
 NbOfDays=Nb dage
 AtEndOfMonth=Ved udgangen af måneden
-CurrentNext=Current/Next
+CurrentNext=Aktuel / Næste
 Offset=Offset
 AlwaysActive=Altid aktiv
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Forlæng
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+AddExtensionThemeModuleOrOther=Implementér / installer ekstern app / modul
 WebServer=Web server
 DocumentRootServer=Webserverens rodmappe
 DataRootServer=Datafiler bibliotek
@@ -977,24 +983,24 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System oplysninger resumé
 SummaryConst=Liste over alle Dolibarr setup parametre
-MenuCompanySetup=Firma/organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menuhåndtering
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Hud tema
 DefaultSkin=Default skin tema
 MaxSizeList=Maks. længde for liste
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
+DefaultMaxSizeList=Standard maks længde for lister
+DefaultMaxSizeShortList=Standard maks længde for korte lister (dvs. i kundekort)
 MessageOfDay=Budskab om dagen
 MessageLogin=Loginsiden besked
-LoginPage=Login page
-BackgroundImageLogin=Background image
+LoginPage=Login side
+BackgroundImageLogin=Baggrundsbillede
 PermanentLeftSearchForm=Faste search form på venstre menu
 DefaultLanguage=Standard sprog til brug (sprog code)
 EnableMultilangInterface=Aktiver flersproget grænseflade
 EnableShowLogo=Vis logo på venstre menu
-CompanyInfo=Information om firma/organisation
-CompanyIds=Ledelse
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Navn
 CompanyAddress=Adresse
 CompanyZip=Postnummer
@@ -1007,15 +1013,15 @@ DoNotSuggestPaymentMode=Ikke tyder
 NoActiveBankAccountDefined=Ingen aktiv bankkonto defineret
 OwnerOfBankAccount=Ejer af bankkonto %s
 BankModuleNotActive=Bankkonti modul er ikke aktiveret
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Vis link "<strong> %s </ strong>"
 Alerts=Indberetninger
 DelaysOfToleranceBeforeWarning=Tolerance forsinkelser før advarsel
 DelaysOfToleranceDesc=Dette skærmbillede giver dig mulighed for at definere tolereres forsinkelser før en indberetning er rapporteret på skærmen med picto %s for hver sent element.
 Delays_MAIN_DELAY_ACTIONS_TODO=Tolerance for forsinkelse (i dage) før alarm for ikke-gennemførte planlagte begivenheder (i tidsplanen)
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Forsinkelsestolerance (i dage) før advarsel om projekt ikke lukket i tide
+Delays_MAIN_DELAY_TASKS_TODO=Forsinkelsestolerance (i dage) før advarsel om planlagte opgaver (projektopgaver) er endnu ikke gennemført
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Forsinkelsestolerance (i dage) før varsel om ordrer, der ikke er behandlet endnu
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Forsinkelsestolerance (i dage) før varsel på leverandører, der ikke er behandlet endnu
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (i dage) inden indberetning om forslag til at lukke
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (i dage) inden indberetning om forslag ikke faktureret
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance forsinkelse (i dage) før alarm om tjenesteydelser for at aktivere
@@ -1025,7 +1031,7 @@ Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerance forsinkelse (i dage) inden in
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance forsinkelse (i dage) inden indberetning om verserende bank forsoning
 Delays_MAIN_DELAY_MEMBERS=Tolerance forsinkelse (i dag), inden indberetning om forsinket medlemskab gebyr
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance forsinkelse (i dage) før alarm for checks depositum til at gøre
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
+Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance forsinkelse (i dage) før advarsel for udgiftsrapporter at godkende
 SetupDescription1=Opsætningsmenuen bruges, før du går i gang med Dolibarr.
 SetupDescription2=De to obligatoriske opsætningsstrin er de første to i opsætningsmenuen til venstre: %s opsætningsside og %s installationsside:
 SetupDescription3=Parametre i menuen <a href="%s"> %s -> %s </a> er påkrævet, fordi de definerede data bruges generelt af Dolibarr og til at tilpasse standardopførslen af softwaren (f.eks. landerelaterede funktioner).
@@ -1033,24 +1039,25 @@ SetupDescription4=Parametre i menuen <a href="%s"> %s -> %s </a> er påkrævet,
 SetupDescription5=Andre menupunkter styrer valgfrie parametre.
 LogEvents=Sikkerhed revision arrangementer
 Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
+InfoDolibarr=Om Dolibarr
+InfoBrowser=Om Browser
+InfoOS=Om OS
+InfoWebServer=Om webserver
+InfoDatabase=Om Database
+InfoPHP=Om PHP
+InfoPerf=Om forestillinger
+BrowserName=Browser navn
 BrowserOS=Browser OS
 ListOfSecurityEvents=Liste over Dolibarr sikkerhed begivenheder
 SecurityEventsPurged=Sikkerhed begivenheder renset
 LogEventDesc=Du kan gøre det muligt at logge for Dolibarr sikkerhed begivenheder her. Administratorer kan derefter se dens indhold via menuen <b>Systemværktøjer - Revision.</b> Advarsel, denne funktion kan forbruge en stor mængde data i databasen.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+AreaForAdminOnly=Opsætningsparametre kan kun indstilles af <b> administratorbrugere </ b>.
 SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read only mode og synlig kun for administratorer.
 SystemAreaForAdminOnly=Dette område er til rådighed for administratoren brugere. Ingen af de Dolibarr permissions kan reducere denne grænse.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Rediger på denne side alle kendte oplysninger om det firma eller fundament, du skal administrere (For dette klikker du på "Rediger" eller "Gem" knappen nederst på siden)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Du kan vælge hver parameter i forbindelse med Dolibarr udseende og stemning her
-AvailableModules=Available app/modules
+AvailableModules=Tilgængelige app / moduler
 ToActivateModule=For at  aktivere moduler, skal du gå til Opsætning (Hjem->Opsætning->Moduler).
 SessionTimeOut=Time out for session
 SessionExplanation=Dette nummer garanti for, at samlingen vil aldrig udløber før denne forsinkelse. Men PHP sessoin forvaltning ikke garanterer, at sessionen altid udløber efter denne forsinkelse: Dette sker, hvis et system til at rengøre cache session kører. <br> Bemærk: uden nogen særlig ordning, intern PHP proces vil rengøre møde hvert <b>ca %s / %s</b> adgang, men kun under adgangen foretaget af andre sessioner.
@@ -1061,9 +1068,9 @@ TriggerDisabledAsModuleDisabled=Udløser i denne fil er slået fra som <b>modul
 TriggerAlwaysActive=Udløser i denne fil er altid aktive, uanset hvad er det aktiverede Dolibarr moduler.
 TriggerActiveAsModuleActive=Udløser i denne fil er aktive som <b>modul %s</b> er aktiveret.
 GeneratedPasswordDesc=Definer her som regel, du vil bruge til at generere nye adgangskode, hvis du beder om at få automatisk genereret adgangskode
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
+DictionaryDesc=Indsæt alle referencedata. Du kan tilføje dine værdier til standardværdien.
+ConstDesc=På denne side kan du redigere alle andre parametre, der ikke er tilgængelige på tidligere sider. Disse er for det meste forbeholdt parametre til udviklere eller avanceret fejlfinding. For en liste over muligheder <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site-åbner i et nyt vindue" target="_blank"> check her </ a>.
+MiscellaneousDesc=Alle andre sikkerhedsrelaterede parametre er defineret her.
 LimitsSetup=Grænseværdier / Precision setup
 LimitsDesc=Du kan definere grænser, præciseringer og optimeringer bruges af Dolibarr her
 MAIN_MAX_DECIMALS_UNIT=Maks. decimaler for enhedspriser
@@ -1077,17 +1084,17 @@ NoEventOrNoAuditSetup=Ingen sikkerhed tilfælde er blevet registreret endnu. Det
 NoEventFoundWithCriteria=Ingen sikkerhed tilfælde er fundet for sådanne søgefelter.
 SeeLocalSendMailSetup=Se din lokale sendmail setup
 BackupDesc=Hvis du vil foretage en komplet sikkerhedskopi af Dolibarr, skal du:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
+BackupDesc2=Gem indholdet af dokumentmappe (<b> %s </ b>), der indeholder alle uploadede og genererede filer (Så det indeholder alle dump filer genereret i trin 1).
+BackupDesc3=Gem indholdet af din database (<b> %s </ b>) i en dumpfil. Til dette kan du bruge følgende assistent.
 BackupDescX=Arkiveret mappe skal opbevares på et sikkert sted.
 BackupDescY=De genererede dump fil bør opbevares på et sikkert sted.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
+BackupPHPWarning=Sikkerhedskopiering kan ikke garanteres med denne metode. Foretrækker den forrige
 RestoreDesc=At genskabe en Dolibarr sikkerhedskopi, skal du:
-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 (<b>%s</b>).
-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 (<b>%s</b>). 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=Gendan arkivfil (f.eks. Zip-fil) i dokumentmappen for at udtrække træet i filer i dokumentmappen af ​​en ny Dolibarr-installation eller i dette nuværende dokument directoy (<b> %s </ b>).
+RestoreDesc3=Gendan data, fra en sikkerhedskopieringsfil, til databasen for den nye Dolibarr-installation eller i databasen for denne nuværende installation (<b> %s </ b>). Advarsel, når genoprettelsen er færdig, skal du bruge et login / password, der eksisterede, da sikkerhedskopiering blev foretaget for at oprette forbindelse igen. For at gendanne en backup database til denne nuværende installation, kan du følge denne assistent.
 RestoreMySQL=MySQL import
 ForcedToByAModule= Denne regel er tvunget til <b>at %s</b> ved en aktiveret modul
-PreviousDumpFiles=Generated database backup files
+PreviousDumpFiles=Genererede database backup filer
 WeekStartOnDay=Første dag i ugen
 RunningUpdateProcessMayBeRequired=Kørsel opgraderingen processen synes at være nødvendig (Programmer version %s adskiller sig fra database version %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Du skal køre denne kommando fra kommandolinjen efter login til en shell med brugerens <b>%s.</b>
@@ -1095,14 +1102,14 @@ YourPHPDoesNotHaveSSLSupport=SSL-funktioner ikke er tilgængelige i dit PHP
 DownloadMoreSkins=Mere skind til download
 SimpleNumRefModelDesc=Retur referencenummer med format %syymm-nnnn hvor yy er året, mm er måned og nnnn er en sekvens uden hul og uden reset
 ShowProfIdInAddress=Vis Professionel id med adresser på dokumenter
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
+ShowVATIntaInAddress=Skjul moms Intra num med adresser på dokumenter
 TranslationUncomplete=Delvis oversættelse
 MAIN_DISABLE_METEO=Deaktiver Meteo udsigt
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
+MeteoStdMod=Standard-tilstand aktiveret
+MeteoStdModEnabled=Standard-tilstand aktiveret
+MeteoPercentageMod=Procentdel tilstand
+MeteoPercentageModEnabled=Procentdel tilstand aktiveret
+MeteoUseMod=Klik for at redigere %s
 TestLoginToAPI=Test logge på API
 ProxyDesc=Nogle funktioner i Dolibarr nødt til at have en Internet adgang til arbejde. Definer her parametre for denne. Hvis Dolibarr serveren er bag en proxy server, disse parametre fortæller Dolibarr hvordan man adgang til internettet via den.
 ExternalAccess=Ekstern adgang
@@ -1113,96 +1120,96 @@ MAIN_PROXY_USER=Log ind for at bruge proxyserveren
 MAIN_PROXY_PASS=Adgangskode for at bruge proxyserveren
 DefineHereComplementaryAttributes=Definer her alle atributes, der ikke allerede findes som standard, og at du ønsker at blive understøttet for %s.
 ExtraFields=Supplerende egenskaber
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices 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)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+ExtraFieldsLines=Supplerende attributter (linjer)
+ExtraFieldsLinesRec=Supplerende attributter (skabeloner faktura linjer)
+ExtraFieldsSupplierOrdersLines=Supplerende attributter (ordrelinjer)
+ExtraFieldsSupplierInvoicesLines=Supplerende attributter (faktura linjer)
+ExtraFieldsThirdParties=Supplerende attributter (tredjepart)
+ExtraFieldsContacts=Supplerende attributter (kontakt / adresse)
+ExtraFieldsMember=Supplerende attributter (medlem)
+ExtraFieldsMemberType=Supplerende attributter (medlemstype)
+ExtraFieldsCustomerInvoices=Supplerende attributter (fakturaer)
+ExtraFieldsCustomerInvoicesRec=Supplerende attributter (skabeloner fakturaer)
+ExtraFieldsSupplierOrders=Supplerende attributter (ordrer)
+ExtraFieldsSupplierInvoices=Supplerende attributter (fakturaer)
+ExtraFieldsProject=Supplerende attributter (projekter)
+ExtraFieldsProjectTask=Supplerende attributter (opgaver)
+ExtraFieldHasWrongValue=Attribut %s har en forkert værdi.
+AlphaNumOnlyLowerCharsAndNoSpace=kun alfanumeriske og små bogstaver uden plads
 SendmailOptionNotComplete=Advarsel, på nogle Linux-systemer, for at sende e-mails fra din e-mail, sendmail udførelse opsætning skal conatins option-ba (parameter mail.force_extra_parameters i din php.ini fil). Hvis nogle modtagere aldrig modtage e-mails, så prøv at redigere denne PHP parameter med mail.force_extra_parameters =-ba).
 PathToDocuments=Sti til dokumenter
 PathDirectory=Directory
-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=Setup of translation
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-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".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
+SendmailOptionMayHurtBuggedMTA=Funktion til at sende mails ved hjælp af metoden "PHP mail direct" genererer en mailbesked, der muligvis ikke analyseres korrekt af nogle modtagende mail-servere. Resultatet er, at nogle mails ikke kan læses af folk, der er vært for disse "bug'ed" platforme. Det er tilfældet for nogle internetudbydere (Ex: Orange i Frankrig). Dette er ikke et problem i Dolibarr eller i PHP, men på modtagende mail server. Du kan dog tilføje option MAIN_FIX_FOR_BUGGED_MTA til 1 i setup - andet for at ændre Dolibarr for at undgå dette. Du kan dog opleve problemer med andre servere, der overholder strengt SMTP-standarden. Den anden løsning (anbefales) er at bruge metoden "SMTP socket library", der ikke har nogen ulemper.
+TranslationSetup=Opsætning af oversættelse
+TranslationKeySearch=Søg en oversættelsestast eller streng
+TranslationOverwriteKey=Overskriv en oversættelsestreng
+TranslationDesc=Sådan indstilles det viste applikationssprog: <br> * Systemwide: menu <strong> Hjem - Opsætning - Visning </strong> <br> * Per bruger: Brug fanen <strong> Brugerdisplay opsætning </strong> klik på brugernavn (øverst på skærmen).
+TranslationOverwriteDesc=Du kan også tilsidesætte strenge, der fylder nedenstående tabel. Vælg dit sprog fra "%s" dropdown, indsæt oversættelsestastens streng i "%s" og din nye oversættelse til "%s"
+TranslationOverwriteDesc2=Du kan bruge den anden fane til at hjælpe dig med at kende oversættelsessnøglen til brug
+TranslationString=Oversættelsestreng
+CurrentTranslationString=Nuværende oversættelsestreng
+WarningAtLeastKeyOrTranslationRequired=Et søgekriterium kræves i det mindste for nøgle- eller oversættelsestreng
+NewTranslationStringToShow=Ny oversættelsestreng, der skal vises
+OriginalValueWas=Den oprindelige oversættelse overskrives. Oprindelig værdi var: <br> <br> %s
+TransKeyWithoutOriginalValue=Du har tvunget en ny oversættelse til oversættelsessnøglen '<strong> %s </strong>', der ikke findes i nogen sprogfiler
+TotalNumberOfActivatedModules=Aktiveret applikation / moduler: <b> %s </b> / <b> %s </b>
+YouMustEnableOneModule=Du skal i det mindste aktivere 1 modul
+ClassNotFoundIntoPathWarning=Klasse %s ikke fundet i PHP-sti
+YesInSummer=Ja om sommeren
+OnlyFollowingModulesAreOpenedToExternalUsers=Bemærk, at kun følgende moduler åbnes for eksterne brugere (uanset tilladelse fra sådanne brugere) og kun hvis tilladelser blev givet:
+SuhosinSessionEncrypt=Sessionsopbevaring krypteret af Suhosin
+ConditionIsCurrently=Tilstanden er i øjeblikket %s
+YouUseBestDriver=Du bruger driveren %s, der er den bedste driver til rådighed i øjeblikket.
+YouDoNotUseBestDriver=Du bruger drev %s men driver %s anbefales.
+NbOfProductIsLowerThanNoPb=Du har kun %s produkter / tjenester i databasen. Dette kræver ikke nogen særlig optimering.
+SearchOptim=Søg optimering
+YouHaveXProductUseSearchOptim=Du har %s produkt i database. Du skal tilføje den konstante PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Home-Setup-Other, du begrænser søgningen til begyndelsen af ​​strenge, der gør det muligt for databasen at bruge indeks, og du skal få et øjeblikkeligt svar.
+BrowserIsOK=Du bruger browseren %s. Denne browser er ok for sikkerhed og ydeevne.
+BrowserIsKO=Du bruger browseren %s. Denne browser er kendt for at være et dårligt valg for sikkerhed, ydeevne og pålidelighed. Vi anbefaler dig at bruge Firefox, Chrome, Opera eller Safari.
+XDebugInstalled=XDebug er indlæst.
+XCacheInstalled=XCache er indlæst.
+AddRefInList=Vis kunde / leverandør ref til liste (vælg liste eller combobox) og det meste af hyperlink. Tredjeparter vil fremkomme med navnet "CC12345 - SC45678 - Det store selskab coorp", i stedet for "The big company coorp".
+AskForPreferredShippingMethod=Anmod om foretrukket afsendelsesmetode for tredjeparter.
 FieldEdition=Område udgave %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
+FillThisOnlyIfRequired=Eksempel: +2 (kun udfyld hvis problemer med tidszoneforskydning opstår)
+GetBarCode=Få stregkode
 ##### Module password generation
 PasswordGenerationStandard=Returnere en adgangskode, der genereres i henhold til interne Dolibarr algoritme: 8 tegn indeholder delt tal og tegn med små bogstaver.
-PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
+PasswordGenerationNone=Foreslå ikke nogen genereret adgangskode. Adgangskoden skal indtastes manuelt.
+PasswordGenerationPerso=Ret en adgangskode i overensstemmelse med din personligt definerede konfiguration.
+SetupPerso=Ifølge din konfiguration
+PasswordPatternDesc=Beskrivelse af adgangskodemønster
 ##### Users setup #####
 RuleForGeneratedPasswords=Regel at generere foreslået passwords
 DisableForgetPasswordLinkOnLogonPage=Ikke viser linket "Glem adgangskode" på loginsiden
 UsersSetup=Brugere modul opsætning
 UserMailRequired=EMail forpligtet til at oprette en ny bruger
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=HRM modul opsætning
 ##### Company setup #####
 CompanySetup=Selskaber modul opsætning
 CompanyCodeChecker=Modul for tredjemand code generation og kontrol (kunde eller leverandør)
 AccountCodeManager=Modul til kodegenerering for regnskab (kunde eller leverandør)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
+NotificationsDesc=E-mail-meddelelsesfunktionen giver dig mulighed for lydløst at sende automatisk mail til nogle Dolibarr-arrangementer. Mål for meddelelser kan defineres:
+NotificationsDescUser=* pr. bruger, en bruger til tiden.
+NotificationsDescContact=* pr. tredjeparts kontakter (kunder eller leverandører), en kontakt til tiden.
+NotificationsDescGlobal=* eller ved at indstille globale målemails i modulopsætningssiden.
 ModelModules=Dokumenter skabeloner
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Generer dokumenter fra OpenDocuments skabeloner (.ODT eller .ODS filer til OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vandmærke på udkast til et dokument
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Aktivér funktion for at autofyldte betalingslinjer på betalingsformular
 CompanyIdProfChecker=Professionel Id unikke
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-TechnicalServicesProvided=Technical services provided
+MustBeUnique=Skal være unikt?
+MustBeMandatory=Obligatorisk at oprette tredjeparter?
+MustBeInvoiceMandatory=Obligatorisk at validere fakturaer?
+TechnicalServicesProvided=Tekniske ydelser
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En eksportgaranti link <b>til %s</b> format er tilgængelig på følgende link: %s
 ##### Invoices #####
 BillsSetup=Fakturaer modul opsætning
 BillsNumberingModule=Fakturaer og kreditnotaer nummerressourcer modul
 BillsPDFModules=Faktura dokumenter modeller
-PaymentsPDFModules=Payment documents models
+PaymentsPDFModules=Betalingsdokumenter modeller
 CreditNote=Credit note
 CreditNotes=Credit noter
 ForceInvoiceDate=Force fakturadatoen til validering dato
@@ -1210,54 +1217,54 @@ SuggestedPaymentModesIfNotDefinedInInvoice=Foreslåede betalinger tilstand på f
 SuggestPaymentByRIBOnAccount=Foreslå betaling af trække på grund
 SuggestPaymentByChequeToAddress=Foreslå checkudbetaling til
 FreeLegalTextOnInvoices=Fri tekst på fakturaer
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
+WatermarkOnDraftInvoices=Vandmærke på udkast fakturaer (ingen hvis tom)
+PaymentsNumberingModule=Betalingsnummereringsmodel
 SuppliersPayment=Leverandører betalinger
-SupplierPaymentSetup=Suppliers payments setup
+SupplierPaymentSetup=Leverandørernes betalingsopsætning
 ##### Proposals #####
 PropalSetup=Modulopsætning for tilbud
 ProposalsNumberingModules=Nummerering af tilbud
 ProposalsPDFModules=Skabelon for tilbud
 FreeLegalTextOnProposal=Fri tekst på tilbud
 WatermarkOnDraftProposal=Vandmærke på udkast til tilbud (intet, hvis tom)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Anmode om en bankkonto destination for forslag
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=Prisanmodninger leverandørmodul opsætning
+SupplierProposalNumberingModules=Prisanmodninger leverandører nummerering modeller
+SupplierProposalPDFModules=Prisanmodninger leverandører dokumenter modeller
+FreeLegalTextOnSupplierProposal=Fri tekst på forespørgsler om prisforespørgsler
+WatermarkOnDraftSupplierProposal=Vandmærke på udkast pris anmodninger leverandører (ingen hvis tom)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Anmod om anmodning om bankkonto for prisanmodning
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Anmode om lagerkilde for ordre
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Anmod om en bankkonto destination for leverandør ordre
 ##### Orders #####
 OrdersSetup=Ordrer «forvaltning setup
 OrdersNumberingModules=Ordrer nummerressourcer moduler
 OrdersModelModule=Bestil dokumenter modeller
 FreeLegalTextOnOrders=Fri tekst om ordrer
-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=Vandmærke på udkast til ordrer (ingen hvis tom)
+ShippableOrderIconInList=Tilføj et ikon i ordrer liste, der angiver, om ordren kan overføres
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Anmode om bestilling af bankkonto
 ##### Interventions #####
 InterventionsSetup=Interventioner modul opsætning
 FreeLegalTextOnInterventions=Fri tekst om intervention dokumenter
 FicheinterNumberingModules=Intervention nummerressourcer moduler
 TemplatePDFInterventions=Intervention kortet dokumenter modeller
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+WatermarkOnDraftInterventionCards=Vandmærke på handlingskortdokumenter (ingen hvis tom)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Kontrakter / abonnementer modul opsætning
 ContractsNumberingModules=Kontrakter nummerering moduler
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Kontrakter dokumenterer modeller
+FreeLegalTextOnContracts=Fri tekst på kontrakter
+WatermarkOnDraftContractCards=Vandmærke på udkast til kontrakter (ingen hvis tom)
 ##### Members #####
 MembersSetup=Medlemmer modul opsætning
 MemberMainOptions=Standardmuligheder
 AdherentLoginRequired= Administrere et login for hvert medlem
 AdherentMailRequired=E-Mail kræves til at oprette et nyt medlem
 MemberSendInformationByMailByDefault=Checkbox til at sende mail bekræftelse til medlemmerne er slået til som standard
-VisitorCanChooseItsPaymentMode=Visitor can choose among available payment modes
+VisitorCanChooseItsPaymentMode=Besøgende kan vælge mellem tilgængelige betalingsformer
 ##### LDAP setup #####
 LDAPSetup=LDAP-opsætning
 LDAPGlobalParameters=Globale parametre
@@ -1275,7 +1282,7 @@ LDAPSynchronizeUsers=Synkronisere Dolibarr brugere med LDAP
 LDAPSynchronizeGroups=Synkronisere Dolibarr grupper med LDAP
 LDAPSynchronizeContacts=Synkronisere Dolibarr kontakter med LDAP
 LDAPSynchronizeMembers=Synkronisere medlemmer af Dolibarr fundation modul med LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=Organisering af instituttets medlemmer typer i LDAP
 LDAPPrimaryServer=Primære server
 LDAPSecondaryServer=Sekundære server
 LDAPServerPort=Serverport
@@ -1285,7 +1292,7 @@ LDAPServerUseTLS=Brug TLS
 LDAPServerUseTLSExample=Din LDAP server brug TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPAdminDnExample=Komplet DN (ex: cn = admin, dc = eksempel, dc = com eller cn = Administrator, cn = Brugere, dc = eksempel, dc = com for aktiv mappe)
 LDAPPassword=Administrator adgangskode
 LDAPUserDn=Brugernes DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Komplet DN (ex: ou= brugere, DC= samfund, dc= dk)
@@ -1299,7 +1306,7 @@ LDAPDnContactActive=Kontaktpersoner 'synkronisering
 LDAPDnContactActiveExample=Aktiveret / Unactivated synkronisering
 LDAPDnMemberActive=Medlemmernes synkronisering
 LDAPDnMemberActiveExample=Aktiveret / Unactivated synkronisering
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=Medlemmer typer 'synkronisering
 LDAPDnMemberTypeActiveExample=Aktiveret / Unactivated synkronisering
 LDAPContactDn=Dolibarr kontakter "DN
 LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=Komplet DN (ex: ou= kontakter, dc= samfundet, dc= dk)
@@ -1307,8 +1314,8 @@ LDAPMemberDn=Dolibarr medlemmernes DN
 LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=Komplet DN (ex: ou= medlemmer, dc= samfundet, dc= dk)
 LDAPMemberObjectClassList=Liste over objectClass
 LDAPMemberObjectClassListExample=Liste over objectClass definere record attributter (ex: top, inetOrgPerson eller toppen, bruger Active Directory)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeDn=Dolibarr medlemmer typer DN
+LDAPMemberTypepDnExample=Komplet DN (ex: ou=medlemstype,dc=eksempel,dc=com)
 LDAPMemberTypeObjectClassList=Liste over objectClass
 LDAPMemberTypeObjectClassListExample=Liste over objectClass definere record attributter (ex: top, groupOfUniqueNames)
 LDAPUserObjectClassList=Liste over objectClass
@@ -1322,14 +1329,14 @@ LDAPTestSynchroContact=Test kontaktens synkronisering
 LDAPTestSynchroUser=Test brugerens synkronisering
 LDAPTestSynchroGroup=Test koncernens synkronisering
 LDAPTestSynchroMember=Test medlem synkronisering
-LDAPTestSynchroMemberType=Test member type synchronization
-LDAPTestSearch= Test a LDAP search
+LDAPTestSynchroMemberType=Test medlem type synkronisering
+LDAPTestSearch= Test en LDAP-søgning
 LDAPSynchroOK=Synkronisering test vellykket
 LDAPSynchroKO=Mislykket synkronisering test
 LDAPSynchroKOMayBePermissions=Mislykket synkronisering test. Kontroller, at forbindelse til serveren er konfigureret korrekt og tillader LDAP udpates
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP forbindelse til LDAP-serveren vellykket (Server= %s, Port= %s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP forbindelse til LDAP-serveren mislykkedes (Server= %s, Port= %s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Forbind / Autentificer til LDAP-server succesfuld (Server = %s, Port = %s, Admin = %s, Password = %s)
 LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=Slut / Authentificate til LDAP-serveren mislykkedes (Server= %s, Port= %s, Admin= %s, Password= %s)
 LDAPSetupForVersion3=LDAP-server er konfigureret til version 3
 LDAPSetupForVersion2=LDAP-server er konfigureret til version 2
@@ -1370,8 +1377,8 @@ LDAPFieldTownExample=Eksempel: l
 LDAPFieldCountry=Land
 LDAPFieldDescription=Beskrivelse
 LDAPFieldDescriptionExample=Eksempel: beskrivelse
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
+LDAPFieldNotePublic=Offentlig note
+LDAPFieldNotePublicExample=Eksempel: publicnote
 LDAPFieldGroupMembers= Gruppens medlemmer
 LDAPFieldGroupMembersExample= Eksempel: uniqueMember
 LDAPFieldBirthdate=Fødselsdato
@@ -1381,57 +1388,57 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Eksempel: objectsid
 LDAPFieldEndLastSubscription=Dato for tilmelding udgangen
 LDAPFieldTitle=Stilling
-LDAPFieldTitleExample=Example: title
+LDAPFieldTitleExample=Eksempel: titel
 LDAPSetupNotComplete=LDAP-opsætning ikke komplet (gå på andre faner)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Ingen administrator eller adgangskode angivet. LDAP-adgang vil være anonym og kun med læsning.
 LDAPDescContact=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP træ for hver data findes på Dolibarr kontakter.
 LDAPDescUsers=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP træ for hver data findes på Dolibarr brugere.
 LDAPDescGroups=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP træ for hver data findes på Dolibarr grupper.
 LDAPDescMembers=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP træ for hver data findes på Dolibarr medlemmer modul.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescMembersTypes=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP-træet for hver data, der findes på Dolibarr medlemmer typer.
 LDAPDescValues=Eksempel værdier er konstrueret til <b>OpenLDAP</b> med følgende lastes skemaer: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Hvis du bruger thoose værdier og OpenLDAP, ændre din LDAP konfigurationsfil <b>slapd.conf</b> at få alle thoose skemaer indlæses.
 ForANonAnonymousAccess=For en autentificeret adgang (for en skriveadgangen for eksempel)
-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.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>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.
+PerfDolibarr=Prestationsopsætning / optimeringsrapport
+YouMayFindPerfAdviceHere=På denne side finder du nogle checks eller råd vedrørende performance.
+NotInstalled=Ikke installeret, så din server er ikke bremset af dette.
+ApplicativeCache=Applikationsbuffer
+MemcachedNotAvailable=Ingen applikationsbuffer fundet. Du kan forbedre ydeevnen ved at installere en cache-server Memcached og et modul, der kan bruge denne cache-server. <br> Mere information her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http: //wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Bemærk, at en masse web hosting udbyder ikke giver sådan cache server.
+MemcachedModuleAvailableButNotSetup=Modul memcached for applikationscache fundet, men opsætning af modul er ikke komplet.
+MemcachedAvailableAndSetup=Modul memcached dedikeret til brug memcached server er aktiveret.
 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
-CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
-DefaultCreateForm=Default values (on forms to create)
-DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
+NoOPCodeCacheFound=Ingen OPCode cache fundet. Måtte du bruge en anden OPCode cache end XCache eller eAccelerator (god), du har muligvis ikke OPCode cache (meget dårlig).
+HTTPCacheStaticResources=HTTP-cache for statiske ressourcer (css, img, javascript)
+FilesOfTypeCached=Filer af typen %s caches af HTTP-serveren
+FilesOfTypeNotCached=Filer af typen %s caches ikke af HTTP-serveren
+FilesOfTypeCompressed=Filer af typen %s komprimeres af HTTP-serveren
+FilesOfTypeNotCompressed=Filer af typen %s komprimeres ikke af HTTP-serveren
+CacheByServer=Cache af server
+CacheByServerDesc=For eksempel med Apache-direktivet "ExpiresByType image / gif A2592000"
+CacheByClient=Cache via browser
+CompressionOfResources=Kompression af HTTP-reaktioner
+CompressionOfResourcesDesc=For eksempel ved brug af Apache-direktivet "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=En sådan automatisk detektering er ikke mulig med de aktuelle browsere
+DefaultValuesDesc=Du kan definere / tvinge her standardværdien, du vil have, når du opretter en ny post, og / eller defaut filtre eller sorteringsrækkefølge, når din listeoptagelse.
+DefaultCreateForm=Standardværdier (på formularer, der skal oprettes)
+DefaultSearchFilters=Standard søgefiltre
+DefaultSortOrder=Standard sorteringsordrer
+DefaultFocus=Standardfokusfelter
 ##### Products #####
 ProductSetup=Opsætning af varemodul
 ServiceSetup=Services modul opsætning
 ProductServiceSetup=Opsætning af Varer/ydelser-modul
 NumberOfProductShowInSelect=Maks. antal varer i listen med muligheder til varekombinationer (0 = ingen grænse)
 ViewProductDescInFormAbility=Visualisering af varebeskrivelser i formularerne (ellers som popup-værktøjstip)
-MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+MergePropalProductCard=Aktivér i produkt / tjeneste Vedhæftede filer fanen en mulighed for at fusionere produkt PDF-dokument til forslag PDF azur hvis produkt / tjeneste er i forslaget
 ViewProductDescInThirdpartyLanguageAbility=Visualisering af varebeskrivelser på tredjeparts sprog
-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=Wait you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+UseSearchToSelectProductTooltip=Også hvis du har et stort antal produkter (> 100 000), kan du øge hastigheden ved at indstille konstant PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
+UseSearchToSelectProduct=Vent, tryk på en tast, inden du lægger indholdet på produkt kombinationslisten op (Dette kan øge ydeevnen, hvis du har et stort antal produkter, men det er mindre praktisk)
 SetDefaultBarcodeTypeProducts=Standard stregkodetype, der skal bruges til varer
 SetDefaultBarcodeTypeThirdParties=Default stregkode type bruge til tredjemand
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+UseUnits=Definer en måleenhed for mængde under bestilling, forslag eller faktura linjer udgave
 ProductCodeChecker= Modul til generering af varekode og kontrol (vare eller ydelse)
 ProductOtherConf= Vare/ydelse-konfiguration
-IsNotADir=is not a directory!
+IsNotADir=er ikke en mappe!
 ##### Syslog #####
 SyslogSetup=Syslog modul opsætning
 SyslogOutput=Log output
@@ -1440,7 +1447,10 @@ SyslogLevel=Niveau
 SyslogFilename=Filnavn og sti
 YouCanUseDOL_DATA_ROOT=Du kan bruge DOL_DATA_ROOT / dolibarr.log for en logfil i Dolibarr "dokumenter" mappen. Du kan indstille en anden vej til at gemme denne fil.
 ErrorUnknownSyslogConstant=Konstant %s er ikke en kendt syslog konstant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=Windows understøtter kun LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation modul opsætning
 DonationsReceiptModel=Skabelon for donationen modtagelse
@@ -1457,34 +1467,34 @@ BarcodeDescUPC=Barcode typeidentifikationsmærker UPC
 BarcodeDescISBN=Barcode typeidentifikationsmærker ISBN
 BarcodeDescC39=Barcode af type C39
 BarcodeDescC128=Barcode af type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeDescDATAMATRIX=Stregkode af typen Datamatrix
+BarcodeDescQRCODE=Stregkode af typen QR-kode
+GenbarcodeLocation=Barcode generation kommandolinje værktøj (bruges af intern motor til nogle stregkode typer). Skal være kompatibel med "genbarcode". <br> For eksempel: / usr / local / bin / genbarcode
+BarcodeInternalEngine=Intern motor
+BarCodeNumberManager=Manager til automatisk definere stregkode numre
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
+WithdrawalsSetup=Opsætning af modul Betalingsordrer til "direkte debitering"
 ##### ExternalRSS #####
 ExternalRSSSetup=Eksterne RSS import setup
 NewRSS=Ny RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrl=RSS-URL
+RSSUrlExample=Et interessant RSS-feed
 ##### Mailing #####
 MailingSetup=Emailing modul opsætning
 MailingEMailFrom=Afsender E-mail (Fra) for e-mails sendt med e-mail-modulet
 MailingEMailError=Retur EMail (Fejl-til) for e-mails med fejl
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Sekunder for at vente efter at sende næste besked
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Opsætning af e-mail-meddelelsesmodul
 NotificationEMailFrom=Afsender E-mail (Fra) for e-mails sendt til anmeldelser
-FixedEmailTarget=Fixed email target
+FixedEmailTarget=Fast email mål
 ##### Sendings #####
 SendingsSetup=Sender modul opsætning
 SendingsReceiptModel=Afsendelse modtagelsen model
 SendingsNumberingModules=Sendings nummerering moduler
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsAbility=Support forsendelsesark til kundeleverancer
+NoNeedForDeliveryReceipts=I de fleste tilfælde anvendes skibsark både som ark til kundeleverancer (liste over produkter, der skal sendes) og ark, der er modtaget og underskrevet af kunden. Så produktleverancer kvitteringer er en duplikeret funktion og er sjældent aktiveret.
+FreeLegalTextOnShippings=Fri tekst på forsendelser
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modul til kvitteringsnumre for varelevering
 DeliveryOrderModel=Model for kvitteringsnumre for varelevering
@@ -1495,23 +1505,23 @@ AdvancedEditor=Avanceret editor
 ActivateFCKeditor=Aktivér FCKeditor for:
 FCKeditorForCompany=WYSIWIG oprettelse/redigering af beskrivelseselementer og noter (undtagen varer/ydelser)
 FCKeditorForProduct=WYSIWIG oprettelse/redigering af beskrivelse/noter for varer/ydelser
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">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.</font>
+FCKeditorForProductDetails=WYSIWIG oprettelse / udgave af produkter detaljer linjer for alle enheder (forslag, ordrer, fakturaer osv. ..). <font class = "warning"> Advarsel: Brug af denne indstilling til denne sag anbefales ikke alvorligt, da det kan skabe problemer med specialtegn og sideformatering, når du bygger PDF-filer. </font>
 FCKeditorForMailing= WYSIWIG oprettelsen / udgave af postforsendelser
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG oprettelse / udgave af bruger signatur
+FCKeditorForMail=WYSIWIG oprettelse / udgave for al mail (undtagen Værktøjer-> eMailing)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Forbindelsesstyring lykkedes, men databasen ikke ser sig at være et osCommerce database (Key %s blev ikke fundet i tabel %s).
 OSCommerceTestOk=Forbindelse til server ' %s' på database' %s' med brugeren ' %s' succes.
 OSCommerceTestKo1=Forbindelse til server ' %s' lykkes men database' %s' kunne ikke være nået.
 OSCommerceTestKo2=Forbindelse til server ' %s' med brugeren' %s' mislykkedes.
 ##### Stock #####
-StockSetup=Warehouse module setup
-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=Opsætning af lagermodul
+IfYouUsePointOfSaleCheckModule=Hvis du bruger et Point of Sale-modul (POS-modul, der leveres som standard eller et andet eksternt modul), kan denne opsætning ignoreres af dit Point of Sale-modul. Det meste af salgsmodulerne er designet til at skabe øjeblikkelig en faktura og reducere lager som standard, hvad der er muligheder her. Så hvis du har brug for eller ikke har et lagerfald, når du registrerer et salg fra dit Point of Sale, skal du også kontrollere dit POS-modul oprettet.
 ##### Menu #####
 MenuDeleted=Menu slettet
 Menus=Menuer
 TreeMenuPersonalized=Tilpassede menuer
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NotTopTreeMenuPersonalized=Personlige menuer, der ikke er knyttet til en topmenuindgang
 NewMenu=Ny menu
 Menu=Udvælgelse af menuen
 MenuHandler=Menu handling
@@ -1532,16 +1542,18 @@ DetailTarget=Mål for links (_blank toppen åbne et nyt vindue)
 DetailLevel=Niveau (-1: top menu, 0: header menuen&gt; 0 menu og sub-menuen)
 ModifMenu=Menu ændre
 DeleteMenu=Slet menuen indrejse
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+ConfirmDeleteMenu=Er du sikker på, at du vil slette menuindgangen <b> %s </b>?
+FailedToInitializeMenu=Kunne ikke initialisere menuen
 ##### Tax #####
 TaxSetup=Opsætning af modul til skatter/afgifter.
 OptionVatMode=Mulighed d'exigibilit de TVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Periodiseringsgrundlag
 OptionVatDefaultDesc=Moms skyldes: <br> - Om levering / betaling for varer <br> - Bestemmelser om betalinger for tjenester
 OptionVatDebitOptionDesc=Moms skyldes: <br> - Om levering / betaling for varer <br> - På fakturaen (debet) for tjenesteydelser
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Tid for moms eksigibilitet som standard i henhold til den valgte mulighed:
 OnDelivery=Om levering
 OnPayment=Om betaling
 OnInvoice=På fakturaen
@@ -1550,41 +1562,41 @@ SupposedToBeInvoiceDate=Faktura, som anvendes dato
 Buy=Købe
 Sell=Sælge
 InvoiceDateUsed=Faktura, som anvendes dato
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Regnskabskode
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Salgskonto. kode
+AccountancyCodeBuy=Indkøbskonto. kode
 ##### Agenda #####
 AgendaSetup=Opsætning af modul for begivenheder og tidsplan
 PasswordTogetVCalExport=Nøglen til at tillade eksport link
 PastDelayVCalExport=Må ikke eksportere begivenhed ældre end
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE=Brug begivenhedstyper (styret til menuopsætning -> Ordbøger -> Type agendahændelser)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Brug automatisk denne type begivenhed ved oprettelse af en begivenhed
 AGENDA_DEFAULT_FILTER_TYPE=Brug automatisk denne type begivenhed i søgefilteret for tidsplansvisning
 AGENDA_DEFAULT_FILTER_STATUS=Brug automatisk denne type status i søgefilteret for tidsplansvisning
 AGENDA_DEFAULT_VIEW=Hvilket faneblad, der skal åbnes som standard, når menuen Tidsplan vælges
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on users browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Aktivér hændelsespåmindelse <b> via e-mails </b> (påmindelsesindstilling / forsinkelse kan defineres på hver hændelse). Bemærk: Modul <strong> %s </strong> skal være aktiveret og korrekt konfigureret for at få påmindelse sendt med den korrekte frekvens.
+AGENDA_REMINDER_BROWSER=Aktivér hændelsespåmindelse <b> på brugerens browser </b> (når hændelsesdatoen er nået, kan hver bruger nægte dette fra browserbekræftelsesspørgsmålet)
+AGENDA_REMINDER_BROWSER_SOUND=Aktivér lydmeddelelse
 AGENDA_SHOW_LINKED_OBJECT=Vis linkede objekter i tidsplanvisning
 ##### Clicktodial #####
 ClickToDialSetup=Klik for at ringe modul opsætning
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUrlDesc=Url kaldes, når man klikke på telefon billed. I URL kan du bruge tags <br> <b> __ PHONETO __ </b>, der vil blive erstattet med telefonnummeret til den person, der skal ringe <br> <b> __ PHONEFROM __ </b>, der vil blive erstattet med telefonnummeret til opkaldet person (din) <br> <b> __ LOGIN __ </b>, der vil blive erstattet med clicktodial login (defineret på brugerkort) <br> <b> __ PASS __ </b>, der vil blive erstattet med clicktodial adgangskode (defineret på bruger kort).
+ClickToDialDesc=Dette modul gør det muligt at få telefonnumre klikbare. Et klik på dette ikon vil ringe, gør din telefon til at ringe til telefonnummeret. Dette kan bruges til at ringe til et callcenter-system fra Dolibarr, som f.eks. Kan ringe til telefonnummeret på et SIP-system.
+ClickToDialUseTelLink=Brug kun et link "tel:" på telefonnumre
+ClickToDialUseTelLinkDesc=Brug denne metode, hvis dine brugere har en softphone eller en software-grænseflade installeret på samme computer end browseren, og kaldes, når du klikker på et link i din browser, der starter med "tel:". Hvis du har brug for en fuld serverløsning (uden brug af lokal softwareinstallation), skal du indstille dette til "Nej" og udfylde næste felt.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of salg
 CashDeskSetup=Cash desk modul opsætning
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Standard generisk tredjepart til brug for salg
 CashDeskBankAccountForSell=Cash konto til brug for sælger
 CashDeskBankAccountForCheque= Konto til at bruge til at modtage betalinger med check
 CashDeskBankAccountForCB= Konto til at bruge til at modtage kontant betaling ved kreditkort
-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 lot management
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Deaktiver lagerbeholdningen, når et salg er lavet fra Point of Sale (hvis "nej", lagernedgang er udført for hvert salg lavet fra POS, uanset hvad der er indstillet i modul lager).
+CashDeskIdWareHouse=Force og begrænse lageret til brug for lagernedgang
+StockDecreaseForPointOfSaleDisabled=Lagernedgang fra Point of Sale deaktiveret
+StockDecreaseForPointOfSaleDisabledbyBatch=Lagernedgang i POS er ikke kompatibel med massehåndtering
+CashDeskYouDidNotDisableStockDecease=Du har ikke deaktiveret lagernedgang, når du sælger fra Point of Sale. Så et lager er påkrævet.
 ##### Bookmark #####
 BookmarkSetup=Bogmærkemodulet setup
 BookmarkDesc=Dette modul giver dig mulighed for at håndtere bogmærker. Du kan også tilføje genveje til enhver Dolibarr sider eller externale websteder på din venstre menu.
@@ -1593,15 +1605,15 @@ NbOfBoomarkToShow=Maksimalt antal bogmærker til at vise i venstre menu
 WebServicesSetup=Webservices modul opsætning
 WebServicesDesc=Ved at aktivere dette modul Dolibarr blive en web service-server til at give diverse web-tjenester.
 WSDLCanBeDownloadedHere=WSDL deskriptor sagsakter forudsat serviceses kan downloade det her
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+EndPointIs=SOAP-klienter skal sende deres anmodninger til Dolibarr-slutpunktet tilgængeligt på URL
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=Indstilling af API-modul
+ApiDesc=Ved at aktivere dette modul bliver Dolibarr en REST-server til at levere diverse webtjenester.
+ApiProductionMode=Aktivér produktionsfunktion (dette aktiverer brug af en cache for servicehåndtering)
+ApiExporerIs=Du kan udforske og teste API'erne på URL
+OnlyActiveElementsAreExposed=Kun elementer fra aktiverede moduler er udsat
+ApiKey=Nøgle til API
+WarningAPIExplorerDisabled=API-udforskeren er blevet deaktiveret. API-explorer er ikke forpligtet til at levere API-tjenester. Det er et værktøj for udvikleren at finde / test REST API'er. Hvis du har brug for dette værktøj, skal du gå i setup af modul API REST for at aktivere det.
 ##### Bank #####
 BankSetupModule=Bank modul opsætning
 FreeLegalTextOnChequeReceipts=Fri tekst på check kvitteringer
@@ -1610,18 +1622,18 @@ BankOrderGlobal=General
 BankOrderGlobalDesc=General display for
 BankOrderES=Spansk
 BankOrderESDesc=Spansk display for
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
+ChequeReceiptsNumberingModule=Kontroller kvitterings nummereringsmodul
 ##### Multicompany #####
 MultiCompanySetup=Multi-selskab modul opsætning
 ##### Suppliers #####
 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
+SuppliersInvoiceNumberingModel=Leverandør faktura nummerering modeller
+IfSetToYesDontForgetPermission=Hvis du er indstillet til ja, glem ikke at give tilladelser til grupper eller brugere tilladt til anden godkendelse
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul opsætning
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Sti til fil indeholdende Maxmind ip til oversættelse af land. <br> Eksempler: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Bemærk, at din ip til land datafil skal være inde en mappe din PHP kan læse (Check din PHP open_basedir setup og filsystem tilladelser).
 YouCanDownloadFreeDatFileTo=Du kan downloade en <b>gratis demo version</b> af Maxmind GeoIP land fil på %s.
 YouCanDownloadAdvancedDatFileTo=Du kan også downloade en mere <b>komplet version, med opdateringer på</b> den Maxmind GeoIP land fil på %s.
@@ -1630,143 +1642,148 @@ TestGeoIPResult=Test af en konvertering IP -> land
 ProjectsNumberingModules=Projekter nummerering modul
 ProjectsSetup=Project modul opsætning
 ProjectsModelModule=Projekt rapport dokument model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient)
+TasksNumberingModules=Opgaver nummereringsmodul
+TaskModelModule=Opgaver rapporterer dokumentmodel
+UseSearchToSelectProject=Vent på at trykke på en tast, inden du lægger indholdet på projektkombinationslisten (Dette kan øge ydeevnen, hvis du har et stort antal projekter, men det er mindre praktisk)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
+AccountingPeriods=Regnskabsperioder
 AccountingPeriodCard=Regnskabsperiode
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-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
+NewFiscalYear=Ny regnskabsperiode
+OpenFiscalYear=Åbent regnskabsperiode
+CloseFiscalYear=Luk regnskabsperiode
+DeleteFiscalYear=Slet regnskabsperiode
+ConfirmDeleteFiscalYear=Er du sikker på at slette denne regnskabsperiode?
+ShowFiscalYear=Vis regnskabsperiode
+AlwaysEditable=Kan altid redigeres
+MAIN_APPLICATION_TITLE=Force synligt navn på ansøgning (advarsel: Indstilling af dit eget navn her kan bryde autofil login-funktionen, når du bruger DoliDroid mobilapplikation)
+NbMajMin=Mindste antal store bogstaver
+NbNumMin=Mindste antal numeriske tegn
+NbSpeMin=Mindste antal specialtegn
+NbIteConsecutive=Maksimum antal gentagne samme tegn
+NoAmbiCaracAutoGeneration=Brug ikke tvetydige tegn ("1", "l", "i", "|", "0", "O") til automatisk generering
+SalariesSetup=Opsætning af lønnings modul
+SortOrder=Sorteringsrækkefølge
 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
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
-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".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=List of fixed notifications
-GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party 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 <strong>%s</strong> to allow this feature.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-ColorFormat=The RGB color is in HEX format, eg: FF0000
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
-TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible by owner only
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
+TypePaymentDesc=0: Kundebetalingstype, 1: Leverandørbetalingstype, 2: Både kunder og leverandører betalingstype
+IncludePath=Inkluder sti (defineret i variabel %s)
+ExpenseReportsSetup=Opsætning af modul Expense Reports
+TemplatePDFExpenseReports=Dokumentskabeloner til at generere regningsrapportdokument
+ExpenseReportsIkSetup=Opsætning af modul Expense Reports - Milles indeks
+ExpenseReportsRulesSetup=Opsætning af modul Expense Reports - Regler
+ExpenseReportNumberingModules=Udgiftsrapporter nummereringsmodul
+NoModueToManageStockIncrease=Intet modul, der er i stand til at styre automatisk lagerforhøjelse, er blevet aktiveret. Lagerforøgelse vil kun ske ved manuel indlæsning.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finde muligheder for EMail-meddelelser ved at aktivere og konfigurere modulet "Notifikation".
+ListOfNotificationsPerUser=Liste over meddelelser pr. Bruger *
+ListOfNotificationsPerUserOrContact=Liste over meddelelser pr. Bruger * eller pr. Kontakt **
+ListOfFixedNotifications=Liste over faste meddelelser
+GoOntoUserCardToAddMore=Gå på fanen "Notifikationer" for en bruger for at tilføje eller fjerne underretninger for brugere
+GoOntoContactCardToAddMore=Gå på fanen "Notifikationer" fra en tredjepart for at tilføje eller fjerne meddelelser for kontakter / adresser
+Threshold=Grænseværdi
+BackupDumpWizard=Guiden til at opbygge database backup dump fil
+SomethingMakeInstallFromWebNotPossible=Installation af eksternt modul er ikke muligt fra webgrænsefladen af ​​følgende årsag:
+SomethingMakeInstallFromWebNotPossible2=Af denne grund er proces til opgradering beskrevet her kun manuelle trin, som en privilegeret bruger kan gøre.
+InstallModuleFromWebHasBeenDisabledByFile=Installation af eksternt modul fra applikation er blevet deaktiveret af din administrator. Du skal bede ham om at fjerne filen <strong> %s </strong> for at tillade denne funktion.
+ConfFileMustContainCustom=Installation eller opbygning af et eksternt modul fra applikationen skal gemme modulfilerne i mappen <strong> %s </strong>. Hvis du vil have denne mappe behandlet af Dolibarr, skal du konfigurere din <strong> conf / conf.php </strong> for at tilføje de to direktelinjer: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s /custom'; </strong>
+HighlightLinesOnMouseHover=Fremhæv tabel linjer, når musen flytter passerer over
+HighlightLinesColor=Fremhæv farve på linjen, når musen passerer over (hold tom for ingen fremhævning)
+TextTitleColor=Sideoverskriftets farve
+LinkColor=Farve af links
+PressF5AfterChangingThis=Tryk på CTRL + F5 på tastaturet eller ryd din browserens cache efter at have ændret denne værdi for at få den effektiv
+NotSupportedByAllThemes=Vil arbejde med kerne temaer, kan ikke understøttes af eksterne temaer
+BackgroundColor=Baggrundsfarve
+TopMenuBackgroundColor=Baggrundsfarve til topmenuen
+TopMenuDisableImages=Skjul billeder i topmenuen
+LeftMenuBackgroundColor=Baggrundsfarve til venstre menu
+BackgroundTableTitleColor=Baggrundsfarve til tabel titel linje
+BackgroundTableLineOddColor=Baggrundsfarve til ulige bord linjer
+BackgroundTableLineEvenColor=Baggrundsfarve til lige bordlinier
+MinimumNoticePeriod=Mindste opsigelsesperiode (din anmodning om orlov skal ske inden denne forsinkelse)
+NbAddedAutomatically=Antal dage, der tilføjes til tællere af brugere (automatisk) hver måned
+EnterAnyCode=Dette felt indeholder en reference til at identificere linje. Indtast enhver værdi efter eget valg, men uden specialtegn.
+UnicodeCurrency=Indtast her mellem seler, liste over byte nummer, der repræsenterer valutasymbolet. For eksempel: for $, indtast [36] - for Brasilien real R $ [82,36] - for €, indtast [8364]
+ColorFormat=RGB-farven er i HEX-format, fx: FF0000
+PositionIntoComboList=Linjens placering i kombinationslister
+SellTaxRate=Salgsskattesats
+RecuperableOnly=Ja for moms "Ikke opfattet, men genoprettelig" dedikeret til nogle stater i Frankrig. Hold værdi til "Nej" i alle andre tilfælde.
+UrlTrackingDesc=Hvis leverandøren eller transporttjenesten tilbyder en side eller et websted for at kontrollere status for din forsendelse, kan du indtaste det her. Du kan bruge nøglen {TRACKID} til URL-parametre, så systemet vil erstatte det med værdien af ​​sporingsnummerbrugeren, der er indtastet på forsendelseskort.
+OpportunityPercent=Når du opretter en mulighed, definerer du en anslået mængde projekt / bly. Ifølge muligheden for muligheden kan dette beløb multipliceres med denne sats for at vurdere det globale beløb, som alle dine muligheder kan generere. Værdien er procent (mellem 0 og 100).
+TemplateForElement=Denne skabelon rekord er dedikeret til hvilket element
+TypeOfTemplate=Type skabelon
+TemplateIsVisibleByOwnerOnly=Skabelon er kun synlig for ejeren
+VisibleEverywhere=Synlig overalt
+VisibleNowhere=Synlig ingen steder
 FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-SeeChangeLog=See ChangeLog file (english only)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permission defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+FillFixTZOnlyIfRequired=Eksempel: +2 (kun udfyld hvis der opstår problem)
+ExpectedChecksum=Forventet checksum
+CurrentChecksum=Nuværende checksum
+ForcedConstants=Påkrævede konstante værdier
+MailToSendProposal=At sende kundeforslag
+MailToSendOrder=For at sende kundeordre
+MailToSendInvoice=At sende kundefaktura
+MailToSendShipment=For at sende forsendelse
+MailToSendIntervention=At sende indgreb
+MailToSendSupplierRequestForQuotation=At sende tilbudsanmodning til leverandør
+MailToSendSupplierOrder=For at sende leverandørordre
+MailToSendSupplierInvoice=At sende leverandørfaktura
+MailToSendContract=At sende en kontrakt
+MailToThirdparty=At sende e-mail fra tredjepartsside
+MailToMember=For at sende e-mail fra medlemsstaternes side
+MailToUser=For at sende e-mail fra brugerens side
+MailToProject= To send email from project page
+ByDefaultInList=Vis som standard i listevisning
+YouUseLastStableVersion=Du bruger den seneste stabile version
+TitleExampleForMajorRelease=Eksempel på besked, du kan bruge til at annoncere denne store udgivelse (brug det gratis at bruge det på dine websteder)
+TitleExampleForMaintenanceRelease=Eksempel på besked, du kan bruge til at annoncere denne vedligeholdelsesudgivelse (lad det være gratis at bruge det på dine websteder)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en stor udgivelse med mange nye funktioner til både brugere og udviklere. Du kan downloade det fra downloadområdet på https://www.dolibarr.org portal (underkatalog Stable versioner). Du kan læse <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for en komplet liste over ændringer.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en vedligeholdelsesversion, så den indeholder kun fejlrettelser af fejl. Vi anbefaler, at alle bruger en ældre version for at opgradere til denne. Som enhver vedligeholdelsesfrigivelse findes ingen nye funktioner eller ændringer i datastruktur til denne version. Du kan downloade det fra downloadområdet på https://www.dolibarr.org portal (underkatalog Stable versioner). Du kan læse <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for en komplet liste over ændringer.
+MultiPriceRuleDesc=Når valgmuligheden "Flere prisniveauer pr. Produkt / service" er tændt, kan du definere forskellige priser (et pr. Prisniveau) for hvert produkt. For at spare tid, kan du indtaste her regel for at få prisen for hvert niveau autokalculeret i henhold til prisen på første niveau, så du skal kun indtaste prisen for første niveau på hvert produkt. Denne side er her for at spare dig tid og kan kun være nyttig, hvis dine priser for hver leve er i forhold til første niveau. Du kan ignorere denne side i de fleste tilfælde.
+ModelModulesProduct=Skabeloner til produktdokumenter
+ToGenerateCodeDefineAutomaticRuleFirst=For at kunne generere automatisk koder skal du først definere en manager til automatisk definere stregkode nummer.
+SeeSubstitutionVars=Se * note for liste over mulige substitutionsvariabler
+SeeChangeLog=Se ChangeLog-fil (kun engelsk)
+AllPublishers=Alle udgivere
+UnknownPublishers=Ukendte forlag
+AddRemoveTabs=Tilføj eller fjern faner
+AddDataTables=Tilføj objekttabeller
+AddDictionaries=Tilføj ordbøger
+AddData=Tilføj objekter eller ordbøger data
+AddBoxes=Tilføj widgets
+AddSheduledJobs=Tilføj planlagte job
+AddHooks=Tilføj kroge
+AddTriggers=Tilføj udløsere
+AddMenus=Tilføj menuer
+AddPermissions=Tilføj tilladelser
+AddExportProfiles=Tilføj eksportprofiler
+AddImportProfiles=Tilføj importprofiler
+AddOtherPagesOrServices=Tilføj andre sider eller tjenester
+AddModels=Tilføj dokument eller nummereringsskabeloner
+AddSubstitutions=Tilføj nøglesubstitutioner
+DetectionNotPossible=Detektion er ikke muligt
+UrlToGetKeyToUseAPIs=Url for at få token til at bruge API (en gang token er blevet modtaget, gemmes den på databasebrugertabellen og skal angives på hvert API-opkald)
+ListOfAvailableAPIs=Liste over tilgængelige API'er
+activateModuleDependNotSatisfied=Modul "%s" afhænger af modulet "%s", der mangler, så modulet "%1$s" fungerer muligvis ikke korrekt. Venligst installer modul "%2$s" eller deaktiver modul "%1$s" hvis du vil være sikker fra enhver overraskelse
+CommandIsNotInsideAllowedCommands=Kommandoen du forsøger at køre er ikke inde i listen over tilladte kommandoer defineret i parameter <strong> $ dolibarr_main_restrict_os_commands </strong> til <strong> conf.php </strong> -filen.
+LandingPage=Destinationsside
+SamePriceAlsoForSharedCompanies=Hvis du bruger et multimediemodul med valget "Single price", vil prisen også være den samme for alle virksomheder, hvis produkterne deles mellem miljøer
+ModuleEnabledAdminMustCheckRights=Modulet er blevet aktiveret. Tilladelser til aktiverede moduler blev kun givet til admin-brugere. Du kan muligvis give tilladelse til andre brugere eller grupper manuelt, hvis det er nødvendigt.
+UserHasNoPermissions=Denne bruger har ingen tilladelse defineret
+TypeCdr=Brug "Ingen", hvis betalingsdatoen er fakturadato plus et delta i dage (delta er feltet "Nb dage") <br> Brug "Ved slutningen af ​​måneden", hvis datoen efter deltaet skal hæves for at nå udgangen af ​​måneden (+ et valgfrit "Offset" i dage) <br> Brug "Nuværende / Næste" for at have betalingsfristen den første Nth af måneden (N er gemt i feltet "Nb dage")
+BaseCurrency=Referencens valuta af virksomheden (gå i setup af firma for at ændre dette)
+WarningNoteModuleInvoiceForFrenchLaw=Dette modul %s er i overensstemmelse med franske love (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Dette modul %s er i overensstemmelse med franske love (Loi Finance 2016), fordi modul Non Reversible Logs automatisk aktiveres.
+WarningInstallationMayBecomeNotCompliantWithLaw=Du forsøger at installere modulet %s, der er et eksternt modul. Aktivering af et eksternt modul betyder, at du har tillid til udgiveren af ​​modulet, og du er sikker på at dette modul ikke ændrer din ansøgning adfærd negativt og er i overensstemmelse med lovene i dit land (%s). Hvis modulet medfører en ikke-juridisk funktion, bliver du ansvarlig for brugen af ​​en ikke-lovlig software.
+MAIN_PDF_MARGIN_LEFT=Venstre margin på PDF
+MAIN_PDF_MARGIN_RIGHT=Højre margin på PDF
+MAIN_PDF_MARGIN_TOP=Top margin på PDF
+MAIN_PDF_MARGIN_BOTTOM=Bundmargen på PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
-ConfirmUnactivation=Confirm module reset
+ResourceSetup=Konfiguration du modul Ressource
+UseSearchToSelectResource=Brug en søgeformular til at vælge en ressource (i stedet for en rullemenu).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+ConfirmUnactivation=Bekræft modul reset
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index 6e1e79c52a4..fafc963d402 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -12,9 +12,9 @@ Event=Begivenhed
 Events=Begivenheder
 EventsNb=Antal begivenheder
 ListOfActions=Liste over begivenheder
-EventReports=Event reports
+EventReports=Hændelsesrapporter
 Location=Placering
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Til enhver bruger i gruppe
 EventOnFullDay=Begivenhed varer hele dagen
 MenuToDoActions=Alle udestående
 MenuDoneActions=Alle gennemførte
@@ -28,101 +28,104 @@ ActionAssignedTo=Begivenhed tildelt til
 ViewCal=Månedsvisning
 ViewDay=Dagsvisning
 ViewWeek=Ugevisning
-ViewPerUser=Per user view
-ViewPerType=Per type view
+ViewPerUser=Per brugervisning
+ViewPerType=Per typevisning
 AutoActions= Automatisk udfyldning
 AgendaAutoActionDesc= Her oprettes begivenheder, som Dolibarr automatisk skal oprette i tidsplanen. Hvis intet er afkrydset, vil kun manuelle begivenheder blive medtaget som loggede og synlige i tidsplanen. Automatisk sporing af handelsbegivenheder udført på objekter (bekræftelse, ændring af status) vil ikke blive gemt.
 AgendaSetupOtherDesc= Denne side giver mulighed for at konfigurere andre parametre af dagsorden-modulet.
 AgendaExtSitesDesc=Denne side giver mulighed for at angive eksterne kalendere, så deres begivenheder kan ses i tidsplanen i Dolibarr.
 ActionsEvents=Begivenheder, for hvilke Dolibarr vil skabe en indsats på dagsordenen automatisk
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
+EventRemindersByEmailNotEnabled=Hændelsesindkaldelser via e-mail blev ikke aktiveret til opsætning af Agenda-modul.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredjepart %s oprettet
-ContractValidatedInDolibarr=Contract %s validated
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
+ContractValidatedInDolibarr=Kontrakt %s valideret
+PropalClosedSignedInDolibarr=Forslag %s underskrevet
+PropalClosedRefusedInDolibarr=Forslag %s nægtet
 PropalValidatedInDolibarr=Tilbud %s godkendt
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+PropalClassifiedBilledInDolibarr=Forslag %s klassificeret faktureret
 InvoiceValidatedInDolibarr=Faktura %s godkendt
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Faktura %s valideret fra POS
 InvoiceBackToDraftInDolibarr=Faktura %s sæt status tilbage til udkast
 InvoiceDeleteDolibarr=Faktura %s slettet
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
-MemberModifiedInDolibarr=Member %s modified
-MemberResiliatedInDolibarr=Member %s terminated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
-ShipmentDeletedInDolibarr=Shipment %s deleted
-OrderCreatedInDolibarr=Order %s created
+InvoicePaidInDolibarr=Faktura %s ændret til betalt
+InvoiceCanceledInDolibarr=Faktura %s annulleret
+MemberValidatedInDolibarr=Medlem %s valideret
+MemberModifiedInDolibarr=Medlem %s ændret
+MemberResiliatedInDolibarr=Medlem %s afsluttet
+MemberDeletedInDolibarr=Medlem %s slettet
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Forsendelse %s valideret
+ShipmentClassifyClosedInDolibarr=Forsendelse %s klassificeret faktureret
+ShipmentUnClassifyCloseddInDolibarr=Forsendelse %s klassificeret genåbnet
+ShipmentDeletedInDolibarr=Forsendelse %s slettet
+OrderCreatedInDolibarr=Bestil %s oprettet
 OrderValidatedInDolibarr=Ordre %s bekræftet
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Bestil %s klassificeret leveret
 OrderCanceledInDolibarr=Ordre %s annulleret
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Bestil %s klassificeret faktureret
 OrderApprovedInDolibarr=Ordre %s godkendt
-OrderRefusedInDolibarr=Order %s refused
+OrderRefusedInDolibarr=Bestil %s nægtet
 OrderBackToDraftInDolibarr=Ordre %s sæt status tilbage til udkast
 ProposalSentByEMail=Tilbud %s sendt via e-mail
-ContractSentByEMail=Contract %s sent by EMail
+ContractSentByEMail=Kontrakt %s sendt af EMail
 OrderSentByEMail=Kundeordre %s sendt via e-mail
 InvoiceSentByEMail=Kundefaktura %s sendt via e-mail
 SupplierOrderSentByEMail=Leverandørordre %s sendt via e-mail
 SupplierInvoiceSentByEMail=Leverandørfaktura %s sendt via e-mail
 ShippingSentByEMail=Forsendelse %s sendt via e-mail
-ShippingValidated= Shipment %s validated
+ShippingValidated= Forsendelse %s valideret
 InterventionSentByEMail=Intervention %s sendt via e-mail
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
+ProposalDeleted=Forslag slettet
+OrderDeleted=Ordre slettet
+InvoiceDeleted=Faktura slettet
 PRODUCT_CREATEInDolibarr=Vare %s oprettet
 PRODUCT_MODIFYInDolibarr=Vare %s ændret
 PRODUCT_DELETEInDolibarr=Vare %s slettet
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
-PROJECT_CREATEInDolibarr=Project %s created
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Udgiftsrapport %s oprettet
+EXPENSE_REPORT_VALIDATEInDolibarr=Udgiftsrapport %s valideret
+EXPENSE_REPORT_APPROVEInDolibarr=Udgiftsrapport %s godkendt
+EXPENSE_REPORT_DELETEInDolibarr=Udgiftsrapport %s slettet
+EXPENSE_REPORT_REFUSEDInDolibarr=Udgiftsrapport %s nægtet
+PROJECT_CREATEInDolibarr=Projekt %s oprettet
+PROJECT_MODIFYInDolibarr=Projekt %s ændret
+PROJECT_DELETEInDolibarr=Projekt %s slettet
 ##### End agenda events #####
 AgendaModelModule=Skabeloner for dokument til begivenhed
 DateActionStart=Startdato
 DateActionEnd=Slutdato
 AgendaUrlOptions1=Du kan også tilføje følgende parametre til at filtrere output:
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Show birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
-Busy=Busy
+AgendaUrlOptions3=<b> logind = %s </b> for at begrænse output til handlinger ejet af en bruger <b> %s </b>.
+AgendaUrlOptionsNotAdmin=<b> logina =! %s </ b> for at begrænse output til handlinger, der ikke ejes af brugeren <b> %s </ b>.
+AgendaUrlOptions4=<b> logind = %s </ b> for at begrænse uddata til handlinger tildelt bruger <b> %s </ b> (ejer og andre).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
+AgendaShowBirthdayEvents=Vis fødselsdage på kontakter
+AgendaHideBirthdayEvents=Skjul fødselsdage på kontakter
+Busy=Travl
 ExportDataset_event1=Liste over begivenheder
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Standard arbejdsdage interval i uge (Eksempel: 1-5, 1-6)
+DefaultWorkingHours=Standard arbejdstid i dag (Eksempel: 9-18)
 # External Sites ical
 ExportCal=Eksport kalender
 ExtSites=Importer eksterne kalendere
 ExtSitesEnableThisTool=Vis eksterne kalendere (defineret i den globale opsætning) i tidsplanen. Påvirker eksterne kalendere, der er defineret af brugere.
 ExtSitesNbOfAgenda=Antallet af kalendere
-AgendaExtNb=Kalender nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL for at få adgang. ICal fil
 ExtSiteNoLabel=Ingen beskrivelse
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
+VisibleTimeRange=Synligt tidsinterval
+VisibleDaysRange=Synligt dagsinterval
 AddEvent=Opret begivenhed
-MyAvailability=My availability
+MyAvailability=Min tilgængelighed
 ActionType=Begivenhedstype
 DateActionBegin=Startdato for begivenhed
 CloneAction=Klon begivenhed
 ConfirmCloneEvent=Er du sikker på, du vil klone begivenheden <b>%s</b>?
 RepeatEvent=Begivenhed med gentagelse
-EveryWeek=Every week
-EveryMonth=Every month
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
+EveryWeek=Hver uge
+EveryMonth=Hver måned
+DayOfMonth=Dag i måneden
+DayOfWeek=Ugedag
+DateStartPlusOne=Dato start + 1 time
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 8e06c19c82e..7a6bc198e05 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -11,8 +11,8 @@ BillsSuppliersUnpaidForCompany=Ubetalte leverandørfakturaer for %s
 BillsLate=Forsinkede betalinger
 BillsStatistics=Statistik for kundefakturaer
 BillsStatisticsSuppliers=Statistik for leverandørfakturaer
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseDispatchedInBookkeeping=Deaktiveret, fordi fakturaen blev sendt til bogføring
+DisabledBecauseNotLastInvoice=Deaktiveret, fordi fakturaen ikke kan sletes. Nogle fakturaer blev registreret efter denne og det vil skabe huller i bogføringen.
 DisabledBecauseNotErasable=Deaktiveret, da sletning ikke er muligt
 InvoiceStandard=Standardfaktura
 InvoiceStandardAsk=Standardfaktura
@@ -25,13 +25,13 @@ InvoiceProFormaAsk=Proformafaktura
 InvoiceProFormaDesc=<b>Proformafakturaen</b> ligner en ægte faktura, men har ingen regnskabsmæssig værdi.
 InvoiceReplacement=Erstatningsfaktura.
 InvoiceReplacementAsk=Erstatningsfaktura som faktura
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b> Erstatningsfaktura </b> bruges til at annullere og erstatte en faktura uden betaling allerede modtaget. <br> <br> Bemærk! Kun fakturaer uden betaling på det kan erstattes. Hvis fakturaen du udskifter endnu ikke er lukket, lukkes den automatisk for at "forladt".
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota til korrektion af faktura
 InvoiceAvoirDesc=<b>Kreditnotaen</b> er en negativ faktura, der benyttes for at løse, at en faktura lyder på et beløb, der adskiller sig fra det beløb, der reelt skal betales (fordi kunden har betalt for meget ved en fejl, eller f.eks. har returneret nogle varer).
-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=Opret kreditnota med linjer fra oprindelsesfakturaen
+invoiceAvoirWithPaymentRestAmount=Opret kreditnota med resterende ubetalte oprindelsesfaktura
+invoiceAvoirLineWithPaymentRestAmount=Kreditnota for resterende ubetalte beløb
 ReplaceInvoice=Erstat faktura %s
 ReplacementInvoice=Erstatningsfaktura
 ReplacedByInvoice=Erstattet af faktura %s
@@ -62,15 +62,16 @@ PaymentBack=Tilbagebetaling
 CustomerInvoicePaymentBack=Betaling tilbage
 Payments=Betalinger
 PaymentsBack=Tilbagebetalinger
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=i fakturaer valuta
 PaidBack=Tilbagebetalt
 DeletePayment=Slet betaling
 ConfirmDeletePayment=Er du sikker på, at du vil slette denne betaling?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReduc=Ønsker du at konvertere denne %s til en absolut rabat? <br> Beløbet vil således blive gemt blandt alle rabatter og kunne bruges som rabat for en nuværende eller en fremtidig faktura for denne kunde.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Modtagne betalinger
 ReceivedCustomersPayments=Modtagne kundebetalinger
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Betalinger udbetalt til leverandører
 ReceivedCustomersPaymentsToValid=Modtagne kundebetalinger, der skal godkendes
 PaymentsReportsForYear=Betalinger rapporter for %s
 PaymentsReports=Betalingsrapporter
@@ -78,11 +79,11 @@ PaymentsAlreadyDone=Betalinger allerede udført
 PaymentsBackAlreadyDone=Tilbagebetalinger allerede udført
 PaymentRule=Betalingsregel
 PaymentMode=Betalingstype
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=Debet / Kreditkort
 PaymentTypePP=PayPal
-IdPaymentMode=Payment type (id)
-CodePaymentMode=Payment type (code)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Betalingstype (id)
+CodePaymentMode=Betalingstype (kode)
+LabelPaymentMode=Betalingstype (etiket)
 PaymentModeShort=Betalingstype
 PaymentTerm=Betaling sigt
 PaymentConditions=Betalingsbetingelser
@@ -91,16 +92,16 @@ PaymentAmount=Betalingsbeløb
 ValidatePayment=Godkend betaling
 PaymentHigherThanReminderToPay=Betaling højere end betalingspåmindelse
 HelpPaymentHigherThanReminderToPay=Bemærk at indbetalingsbeløbet af en eller flere regninger er højere end restbeløbet. <br> Ret beløbet eller godkend og påtænk at oprette en kreditnota lydende på det overskydende beløb.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Klassificer som "Betalt"
 ClassifyPaidPartially=Klassificer som "Delvist betalt"
 ClassifyCanceled=Klassificer som "Tabt"
 ClassifyClosed=Klassificer som "Lukket"
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Klassificer 'Ikke Faktureret'
 CreateBill=Opret faktura
 CreateCreditNote=Opret kreditnota
 AddBill=Opret faktura eller kreditnota
-AddToDraftInvoices=Add to draft invoice
+AddToDraftInvoices=Tilføj til udkast faktura
 DeleteBill=Slet faktura
 SearchACustomerInvoice=Søg efter en kundefaktura
 SearchASupplierInvoice=Søg efter en leverandørfaktura
@@ -109,22 +110,23 @@ SendRemindByMail=Send påmindelse via e-mail
 DoPayment=Angiv betaling
 DoPaymentBack=Angiv tilbagebetaling
 ConvertToReduc=Konverter til fremtidig rabat
-ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessReceivedToReduc=Konverter overskud modtaget til fremtidig rabat
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Angive betaling modtaget fra kunden
 EnterPaymentDueToCustomer=Opret påmindelse til kunde
 DisabledBecauseRemainderToPayIsZero=Deaktiveret, da restbeløbet er nul
 PriceBase=Basispris
 BillStatus=Fakturastatus
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Status for genererede fakturaer
 BillStatusDraft=Udkast (skal valideres)
 BillStatusPaid=Betalt
 BillStatusPaidBackOrConverted=Kreditnota refunderet eller konverteret til rabat
-BillStatusConverted=Betalt (klar til endelig faktura)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Tabt
 BillStatusValidated=Godkendt (skal betales)
 BillStatusStarted=Startet
 BillStatusNotPaid=Ikke betalt
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Ikke refunderet
 BillStatusClosedUnpaid=Lukket (ubetalte)
 BillStatusClosedPaidPartially=Betalt (delvis)
 BillShortStatusDraft=Udkast
@@ -135,7 +137,7 @@ BillShortStatusCanceled=Tabt
 BillShortStatusValidated=Godkendt
 BillShortStatusStarted=Startet
 BillShortStatusNotPaid=Ikke betalt
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Ikke refunderet
 BillShortStatusClosedUnpaid=Lukket
 BillShortStatusClosedPaidPartially=Betalt (delvis)
 PaymentStatusToValidShort=Skal godkendes
@@ -148,23 +150,23 @@ ErrorDiscountAlreadyUsed=Fejl, rabat allerede brugt
 ErrorInvoiceAvoirMustBeNegative=Fejl, korrekt faktura skal have et negativt beløb
 ErrorInvoiceOfThisTypeMustBePositive=Fejl, denne type faktura skal have et positivt beløb
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fejl, kan ikke annullere en faktura, som er blevet erstattet af en anden faktura, der stadig har status som udkast
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Denne del eller en anden er allerede brugt, så rabat serien kan ikke fjernes.
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger for faktura
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Skabelon / tilbagevendende faktura
+NoQualifiedRecurringInvoiceTemplateFound=Ingen tilbagevendende fakturaskabelon er kvalificeret til generation.
+FoundXQualifiedRecurringInvoiceTemplate=Fundet %s tilbagevendende fakturaskabelon(er) kvalificeret til generation.
+NotARecurringInvoiceTemplate=Ikke en tilbagevendende fakturaskabelon
 NewBill=Ny faktura
 LastBills=Seneste %s fakturaer
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s supplier template invoices
+LatestTemplateInvoices=Seneste %s fakturaerskabelon
+LatestCustomerTemplateInvoices=Seneste %s kunde fakturaerskabelon
+LatestSupplierTemplateInvoices=Seneste %s leverandør fakturaerskabelon
 LastCustomersBills=Seneste %s kundefakturaer
 LastSuppliersBills=Latest %s supplier invoices
 AllBills=Alle fakturaer
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Alle fakturaerskabelon
 OtherBills=Andre fakturaer
 DraftBills=Udkast til fakturaer
 CustomersDraftInvoices=Igangværende kundefakturaer
@@ -172,17 +174,17 @@ SuppliersDraftInvoices=Kladder til leverandørfaktura
 Unpaid=Ubetalt
 ConfirmDeleteBill=Er du sikker på, du vil slette denne faktura?
 ConfirmValidateBill=Er du sikker på, du vil godkende denne faktura med referencen <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad kunde
+ConfirmUnvalidateBill=Er du sikker på, at du vil ændre fakturaen <b> %s </b> til udkastsstatus?
+ConfirmClassifyPaidBill=Er du sikker på, at du vil ændre fakturaen <b> %s </b> til betalte status?
+ConfirmCancelBill=Er du sikker på, at du vil annullere fakturaen <b> %s </b>?
+ConfirmCancelBillQuestion=Hvorfor vil du klassificere denne faktura 'forladt'?
+ConfirmClassifyPaidPartially=Er du sikker på, at du vil ændre fakturaen <b> %s </b> til betalte status?
+ConfirmClassifyPaidPartiallyQuestion=Denne faktura er ikke blevet betalt helt. Hvad er årsager til at du lukker denne faktura?
+ConfirmClassifyPaidPartiallyReasonAvoir=Resterende ubetalte <b> (%s %s) </b> er en rabat tildelt, fordi betaling blev foretaget før sigt. Jeg regulerer momsen med en kreditnota.
+ConfirmClassifyPaidPartiallyReasonDiscount=Resterende ubetalte <b> (%s %s) </b> er en rabat tildelt, fordi betaling blev foretaget før sigt.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Resterende ubetalte <b> (%s %s) </b> er en rabat tildelt, fordi betaling blev foretaget før sigt. Jeg accepterer at miste momsen på denne rabat.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Resterende ubetalte <b> (%s %s) </b> er en rabat tildelt, fordi betaling blev foretaget før sigt. Jeg inddriver momsen på denne rabat uden en kreditnota.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Dårlig kunde
 ConfirmClassifyPaidPartiallyReasonProductReturned=Varer delvist returneret
 ConfirmClassifyPaidPartiallyReasonOther=Beløb opgives for andre grunde
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Dette valg er muligt, hvis din faktura er blevet forsynet med passende kommentar. (Eksempel «Kun den afgift, der svarer til den pris, der rent faktisk var blevet betalt giver ret til fradrag»)
@@ -193,9 +195,9 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Dette valg bruges, når be
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Brug dette valg, hvis alle andre ikke passer, for eksempel i følgende situation: <br> - betaling ikke fuldført, fordi nogle varer blev sendt tilbage <br> - beløb for højt, fordi en rabat blev glemt <br> I alle tilfælde skal det overskydende beløb korrigeres i regnskabssystemet ved at oprette en kreditnota.
 ConfirmClassifyAbandonReasonOther=Anden
 ConfirmClassifyAbandonReasonOtherDesc=Dette valg vil blive anvendt i alle andre tilfælde. For eksempel fordi du har planer om at oprette en erstatning faktura.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ConfirmCustomerPayment=Bekræfter du denne betalings for <b> %s </b> %s?
+ConfirmSupplierPayment=Bekræfter du denne betalingsindgang for <b> %s </b> %s?
+ConfirmValidatePayment=Er du sikker på, at du vil validere denne betaling? Ingen ændring kan foretages, når betalingen er valideret.
 ValidateBill=Godkend fakturaen
 UnvalidateBill=Fjern godkendelse af faktura
 NumberOfBills=Antal fakturaer
@@ -207,25 +209,26 @@ ShowBill=Vis faktura
 ShowInvoice=Vis faktura
 ShowInvoiceReplace=Vis erstatning faktura
 ShowInvoiceAvoir=Vis kreditnota
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceDeposit=Vis udbetalt faktura
+ShowInvoiceSituation=Vis faktura status
 ShowPayment=Vis betaling
 AlreadyPaid=Allerede betalt
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidBack=Allerede tilbage betalt
+AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uden kredit noter og udbetalinger)
 Abandoned=Opgives
-RemainderToPay=Remaining unpaid
+RemainderToPay=Resterende ubetalte
 RemainderToTake=Resterende beløb at hæve
 RemainderToPayBack=Resterende beløb at refundere
-Rest=Pending
+Rest=Verserende
 AmountExpected=Fordret beløb
-ExcessReceived=Trop Peru
+ExcessReceived=Overskud modtaget
+ExcessPaid=Excess paid
 EscompteOffered=Rabat (betaling før sigt)
 EscompteOfferedShort=Discount
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
+SendBillRef=Indsendelse af faktura %s
+SendReminderBillRef=Indsendelse af faktura %s (påmindelse)
+StandingOrders="Direkte debit" ordre
+StandingOrder="Direct debit" order
 NoDraftBills=Intet udkast til fakturaer
 NoOtherDraftBills=Ingen andre igangværende fakturaer
 NoDraftInvoices=Intet udkast til fakturaer
@@ -237,9 +240,9 @@ SendReminderBillByMail=Send påmindelse via e-mail
 RelatedCommercialProposals=Relaterede tilbud
 RelatedRecurringCustomerInvoices=Tilknyttede tilbagevendende kundefaktuaer
 MenuToValid=På gyldige
-DateMaxPayment=Payment due on
+DateMaxPayment=Betaling på grund af
 DateInvoice=Fakturadato
-DatePointOfTax=Point of tax
+DatePointOfTax=Momsbetaling
 NoInvoice=Ingen faktura
 ClassifyBill=Klassificere faktura
 SupplierBillsToPay=Ubetalte leverandørfakturaer
@@ -247,16 +250,16 @@ CustomerBillsUnpaid=Ubetalte kundefakturaer
 NonPercuRecuperable=Ikke-refunderbar
 SetConditions=Indstil aflønningsvilkår
 SetMode=Indstil betaling mode
-SetRevenuStamp=Set revenue stamp
+SetRevenuStamp=Indstil omsætningsstempel
 Billed=Billed
-RecurringInvoices=Recurring invoices
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RecurringInvoices=Tilbagevendende fakturaer
+RepeatableInvoice=Fakturaskabelon
+RepeatableInvoices=Fakturerskabelon
+Repeatable=Skabelon
+Repeatables=Skabeloner
+ChangeIntoRepeatableInvoice=Konverter til fakturaskabelon
+CreateRepeatableInvoice=Opret fakturaskabelon
+CreateFromRepeatableInvoice=Opret fra fakturaskabelon
 CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturalinjer
 CustomersInvoicesAndPayments=Kundefakturaer og betalinger
 ExportDataset_invoice_1=Liste over kundefakturaer og fakturalinjer
@@ -269,37 +272,41 @@ ReductionsShort=Nedsættelse.
 Discounts=Rabatter
 AddDiscount=Tilføj rabat
 AddRelativeDiscount=Opret relative rabat
-EditRelativeDiscount=Edit relative discount
+EditRelativeDiscount=Rediger relativ rabat
 AddGlobalDiscount=Tilføj rabat
 EditGlobalDiscounts=Rediger absolutte rabatter
 AddCreditNote=Opret kreditnota
 ShowDiscount=Vis rabat
-ShowReduc=Show the deduction
+ShowReduc=Vis fradrag
 RelativeDiscount=Relativ rabat
 GlobalDiscount=Global rabat
-CreditNote=Credit note
-CreditNotes=Credit noter
-Deposit=Down payment
-Deposits=Down payments
+CreditNote=Kreditnota
+CreditNotes=Kredit noter
+Deposit=Forskudsbetaling
+Deposits=Indbetalinger
 DiscountFromCreditNote=Discount fra kreditnota %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromDeposit=Indbetalinger på faktura %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Denne form for kredit kan bruges på faktura før dens validering
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+CreditNoteDepositUse=Faktura skal valideres for at bruge denne type kreditter
 NewGlobalDiscount=Ny discount
 NewRelativeDiscount=Ny relativ discount
+DiscountType=Discount type
 NoteReason=Bemærk / Grund
 ReasonDiscount=Årsag
 DiscountOfferedBy=Ydet af
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
-BillAddress=Bill adresse
+DiscountStillRemaining=Rabatter til rådighed
+DiscountAlreadyCounted=Rabatter allerede forbrugt
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
+BillAddress=Faktura adresse
 HelpEscompte=Denne rabat er en rabat, der ydes til kunden, fordi dens paiement blev foretaget før sigt.
 HelpAbandonBadCustomer=Dette beløb er blevet opgivet (kunde siges at være en dårlig kunde) og betragtes som en exceptionnal løs.
 HelpAbandonOther=Dette beløb er blevet opgivet, da det var en fejl (forkert kunde eller faktura erstattes af en anden for eksempel)
 IdSocialContribution=Vis ID for skat/afgift
 PaymentId=Betaling id
-PaymentRef=Payment ref.
+PaymentRef=Betalings ref.
 InvoiceId=Faktura id
 InvoiceRef=Faktura ref.
 InvoiceDateCreation=Faktura oprettelsesdato
@@ -311,100 +318,100 @@ RemoveDiscount=Fjern rabat
 WatermarkOnDraftBill=Vandmærke on draft fakturaer (ingenting hvis tom)
 InvoiceNotChecked=Ingen valgt faktura
 CloneInvoice=Klon faktura
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+ConfirmCloneInvoice=Er du sikker på, at du vil klone denne faktura <b> %s </b>?
 DisabledBecauseReplacedInvoice=Aktion handicappede, fordi fakturaen er blevet erstattet
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
+DescTaxAndDividendsArea=Dette område præsenterer et resumé af alle betalinger foretaget til særlige udgifter. Kun posten med betaling i det faste år er inkluderet her.
 NbOfPayments=Nb af betalinger
 SplitDiscount=Split rabat i to
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
+ConfirmSplitDiscount=Er du sikker på, at du vil opdele denne rabat på <b>%s</b> %s i 2 lavere rabatter?
 TypeAmountOfEachNewDiscount=Input beløb for hver af to dele:
 TotalOfTwoDiscountMustEqualsOriginal=Summen af to nye rabatter skal svare til det oprindelige rabatbeløb.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+ConfirmRemoveDiscount=Er du sikker på at du vil fjerne denne rabat?
 RelatedBill=Relaterede faktura
 RelatedBills=Relaterede fakturaer
 RelatedCustomerInvoices=Tilknyttede kundefakturaer
-RelatedSupplierInvoices=Related supplier invoices
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
+RelatedSupplierInvoices=Relaterede leverandørfakturaer
+LatestRelatedBill=Seneste relaterede faktura
+WarningBillExist=Advarsel, der findes en eller flere fakturaer
+MergingPDFTool=Sammenlægning af PDF-værktøj
+AmountPaymentDistributedOnInvoice=Betalingsbeløb fordelt på faktura
+PaymentOnDifferentThirdBills=Tillad betalinger på forskellige tredjeparts regninger, men samme moderselskab
+PaymentNote=Betalingsnota
+ListOfPreviousSituationInvoices=Liste over tidligere status fakturaer
+ListOfNextSituationInvoices=Liste over næste status fakturaer
+FrequencyPer_d=Hver %s dage
+FrequencyPer_m=Hver %s måneder
+FrequencyPer_y=Hver %s år
+FrequencyUnit=Hyppihed
+toolTipFrequency=Eksempler: <br> <b> Indstil 7, Dag </b>: Giv en ny faktura hver 7. dag <br> <b> Indstil 3, Måned </b>: Giv en ny faktura hver 3. måned
+NextDateToExecution=Dato for næste faktura generation
+NextDateToExecutionShort=Dato næste gener.
+DateLastGeneration=Dato for seneste generation
+DateLastGenerationShort=Dato seneste gener.
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validér fakturaer automatisk
+GeneratedFromRecurringInvoice=Genereret fra skabelon tilbagevendende faktura %s
+DateIsNotEnough=Dato er endnu ikke nået
+InvoiceGeneratedFromTemplate=Faktura %s genereret fra tilbagevendende fakturaskabelon %s
+WarningInvoiceDateInFuture=Advarsel, fakturadato er højere end den aktuelle dato
+WarningInvoiceDateTooFarInFuture=Advarsel, fakturadato er for langt fra den aktuelle dato
+ViewAvailableGlobalDiscounts=Se ledige rabatter
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Forfald ved modtagelse
+PaymentConditionRECEP=Forfald ved modtagelse
 PaymentConditionShort30D=30 dage
 PaymentCondition30D=30 dage
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=Løb. Mdr + 30 dage
+PaymentCondition30DENDMONTH=Inden for 30 dage efter slutningen af ​​måneden
 PaymentConditionShort60D=60 dage
 PaymentCondition60D=60 dage
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=Løb. Mdr. + 60 dage
+PaymentCondition60DENDMONTH=Inden for 60 dage efter slutningen af ​​måneden
 PaymentConditionShortPT_DELIVERY=Aflevering
 PaymentConditionPT_DELIVERY=Om levering
 PaymentConditionShortPT_ORDER=Rækkefølge
-PaymentConditionPT_ORDER=On order
+PaymentConditionPT_ORDER=På bestilling
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+PaymentConditionPT_5050=50%% på forhånd, 50%% ved levering
+PaymentConditionShort10D=10 dage
+PaymentCondition10D=10 dage
+PaymentConditionShort10DENDMONTH=10 dage måneders slutning
+PaymentCondition10DENDMONTH=Inden for 10 dage efter slutningen af ​​måneden
+PaymentConditionShort14D=14 dage
+PaymentCondition14D=14 dage
+PaymentConditionShort14DENDMONTH=14 dage i slutningen af ​​måneden
+PaymentCondition14DENDMONTH=Inden for 14 dage efter slutningen af ​​måneden
 FixAmount=Ret beløb
-VarAmount=Variable amount (%% tot.)
+VarAmount=Variabel mængde (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bankoverførsel
 PaymentTypeShortVIR=Bankoverførsel
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
+PaymentTypePRE=Betalingsordre med "Direkte debit"
+PaymentTypeShortPRE=Debit betalingsordre
+PaymentTypeLIQ=Kontanter
+PaymentTypeShortLIQ=Kontanter
 PaymentTypeCB=Kreditkort
 PaymentTypeShortCB=Kreditkort
 PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeTIP=TIP (Dokumenter mod betaling)
+PaymentTypeShortTIP=TIP Betaling
 PaymentTypeVAD=Online betaling
 PaymentTypeShortVAD=Online betaling
-PaymentTypeTRA=Bank draft
+PaymentTypeTRA=Bankudkast
 PaymentTypeShortTRA=Udkast til
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
+PaymentTypeFAC=Faktor
+PaymentTypeShortFAC=Faktor
 BankDetails=Bankoplysninger
-BankCode=Bank-kode
+BankCode=Bankkode
 DeskCode=Skrivebord kode
 BankAccountNumber=Kontonummer
 BankAccountNumberKey=Nøgle
-Residence=Direct debit
+Residence="Direkte debit"
 IBANNumber=IBAN-nummer
 IBAN=IBAN
 BIC=BIC / SWIFT
@@ -413,9 +420,9 @@ ExtraInfos=Ekstra infos
 RegulatedOn=Reguleres på
 ChequeNumber=Check N
 ChequeOrTransferNumber=Check / Transfer N
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
-ChequeBank=Bank of check
+ChequeBordereau=Tjekliste
+ChequeMaker=Check / Overfør overførelse
+ChequeBank=Bank Cheque
 CheckBank=Kontrollere
 NetToBePaid=Netto, at betale
 PhoneNumber=Tlf
@@ -433,7 +440,7 @@ LawApplicationPart2=varerne forbliver ejendom
 LawApplicationPart3=sælgeren, indtil den fuldstændige indkassere af
 LawApplicationPart4=deres pris.
 LimitedLiabilityCompanyCapital=SARL med Capital af
-UseLine=Apply
+UseLine=Ansøge
 UseDiscount=Brug rabatten
 UseCredit=Brug kredit
 UseCreditNoteInInvoicePayment=Reducere betalingen med denne kreditnota
@@ -445,40 +452,40 @@ ChequesReceipts=Checks kvitteringer
 ChequesArea=Checks indskud område
 ChequeDeposits=Checks indskud
 Cheques=Checks
-DepositId=Id deposit
-NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+DepositId=Id depositum
+NbCheque=Antal checks
+CreditNoteConvertedIntoDiscount=Dette %s er blevet konverteret til %s
 UsBillingContactAsIncoiveRecipientIfExist=Brug kundens kontakt-adresse fra faktura i stedet for tredjepartsadresse som modtager for fakturaer
 ShowUnpaidAll=Vis alle ubetalte fakturaer
 ShowUnpaidLateOnly=Vis sent unpaid faktura kun
 PaymentInvoiceRef=Betaling faktura %s
 ValidateInvoice=Validér faktura
-ValidateInvoices=Validate invoices
+ValidateInvoices=Valider fakturaer
 Cash=Kontanter
 Reported=Forsinket
 DisabledBecausePayments=Ikke muligt da der er nogle betalinger
 CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betaling, da der er mindst en faktura, der er klassificeret som betalt
 ExpectedToPay=Forventet betaling
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Kan ikke fjerne udlignet betaling
 PayedByThisPayment=Betalt med denne betaling
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
-ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidInvoicesAutomatically=Klassificer "Betalt" alle standard-, forskuds- eller udskiftningsfakturaer, der er fuldt ud betalt.
+ClosePaidCreditNotesAutomatically=Klassificer "Betalt" alle kreditnotaer, der er fuldt ud betalt tilbage.
 ClosePaidContributionsAutomatically=Marker alle ydelser af skat/afgift som "Betalt"
 AllCompletelyPayedInvoiceWillBeClosed=Alle fakturaer med et restbeløb på nul, vil automatisk blive lukket med status "Betalt".
-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 third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+ToMakePayment=Betale
+ToMakePaymentBack=Tilbagebetalt
+ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
+NoteListOfYourUnpaidInvoices=Bemærk: Denne liste indeholder kun fakturaer til tredjeparter, som du er knyttet til som salgsrepræsentant.
+RevenueStamp=Indtægtsstempel
+YouMustCreateInvoiceFromThird=Denne mulighed er kun tilgængelig, når du opretter faktura fra fanen "kunde" hos tredjepart
+YouMustCreateInvoiceFromSupplierThird=Denne mulighed er kun tilgængelig, når du opretter faktura fra fanen "leverandør" af tredjepart
+YouMustCreateStandardInvoiceFirstDesc=Du skal først oprette en standardfaktura og konvertere den til "skabelon" for at oprette en ny skabelonfaktura
 PDFCrabeDescription=Faktura model Crabe. En fuldstændig faktura model (Support moms option, rabatter, betalinger betingelser, logo, etc. ..)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-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 down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-TerreNumRefModelError=Et lovforslag, der begynder med $ syymm allerede eksisterer og er ikke kompatible med denne model af sekvensinformation. Fjern den eller omdøbe den til at aktivere dette modul.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PDFCrevetteDescription=Faktura PDF skabelon Crevette. En komplet faktura skabelon for kontoudtog
+TerreNumRefModelDesc1=Retur nummer med format %syymm-nnnn for standard faktura og %syymm-nnnn for kreditnoter hvor du er år, mm er måned og nnnn er en sekvens uden pause og ingen tilbagevenden til 0
+MarsNumRefModelDesc1=Retur nummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for udskiftningsfakturaer, %syymm-nnnn til fakturaer med forskud og %syymm-nnnn for kreditnoter hvor du er år, mm er måned og nnnn er en sekvens uden pause og nej vende tilbage til 0
+TerreNumRefModelError=Et faktura, der begynder med $ syymm allerede eksisterer og er ikke kompatible med denne model af sekvensinformation. Fjern den eller omdøbe den til at aktivere dette modul.
+CactusNumRefModelDesc1=Returnummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for kreditnotaer og %syymm-nnnn for afbetalingsfakturaer hvor du er år, mm er måned og nnnn er en sekvens uden pause og ingen tilbagevenden til 0
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Repræsentant opfølgning kundefaktura
 TypeContact_facture_external_BILLING=Kundefaktura kontakt
@@ -489,35 +496,39 @@ TypeContact_invoice_supplier_external_BILLING=Leverandør faktura kontakt
 TypeContact_invoice_supplier_external_SHIPPING=Leverandør shipping kontakt
 TypeContact_invoice_supplier_external_SERVICE=Leverandør service kontakt
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-NotLastInCycle=This invoice is not the latest 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 open situations
-InvoiceSituationLast=Final and general invoice
+InvoiceFirstSituationAsk=Første faktura
+InvoiceFirstSituationDesc=<B> Situationsfakturaerne </b> er bundet til situationer, der er relateret til en progression, for eksempel fremdriften af ​​en konstruktion. Hver situation er bundet til en faktura.
+InvoiceSituation=Kontoudtog
+InvoiceSituationAsk=Faktura efter kontoudtog
+InvoiceSituationDesc=Opret en ny situation efter en allerede eksisterende
+SituationAmount=Kontoudtog beløb (netto)
+SituationDeduction=Kontoudtog udtræk
+ModifyAllLines=Rediger alle linjer
+CreateNextSituationInvoice=Opret næste situation
+NotLastInCycle=Denne faktura er ikke den seneste i cyklus og må ikke ændres.
+DisabledBecauseNotLastInCycle=Den næste situation eksisterer allerede.
+DisabledBecauseFinal=Denne situation er endelig.
+CantBeLessThanMinPercent=Værdien kan ikke være mindre end dets værdi i den foregående situation.
+NoSituations=Ingen åbne situationer
+InvoiceSituationLast=Endelig faktura
 PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
+PDFCrevetteSituationInvoiceLineDecompte=Kontoudtog - COUNT
+PDFCrevetteSituationInvoiceTitle=Kontoudtog
+PDFCrevetteSituationInvoiceLine=Kontoudtog N°%s: Inv. N°%s på %s
+TotalSituationInvoice=Samlet kontoudtog
+invoiceLineProgressError=Faktura linje fremskridt kan ikke være større end eller lig med den næste faktura linje
+updatePriceNextInvoiceErrorUpdateline=Fejl: opdateringspris på faktura linje: %s
+ToCreateARecurringInvoice=For at oprette en tilbagevendende faktura for denne kontrakt skal du først oprette dette udkast faktura og derefter konvertere det til en faktura skabelon og definere hyppigheden for generering af fremtidige fakturaer.
+ToCreateARecurringInvoiceGene=For at generere fremtidige fakturaer regelmæssigt og manuelt, skal du bare gå i menuen <strong> %s - %s - %s </strong>.
+ToCreateARecurringInvoiceGeneAuto=Hvis du har brug for at generere sådanne fakturaer automatisk, så spørg administratoren om at aktivere og opsætte modulet <strong> %s </strong>. Bemærk at begge metoder (manuel og automatisk) kan bruges sammen med ingen risiko for overlapning.
+DeleteRepeatableInvoice=Slet fakturaskabelon
+ConfirmDeleteRepeatableInvoice=Er du sikker på, at du vil slette fakturaenskabelon?
+CreateOneBillByThird=Opret en faktura pr. Tredjepart (ellers en faktura pr. Ordre)
+BillCreated=%s regning(er) oprettet
+StatusOfGeneratedDocuments=Status for dokument generering
+DoNotGenerateDoc=Generer ikke dokument fil
+AutogenerateDoc=Auto generere dokument fil
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 7d2d2439e16..dcb9a4646f7 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Firmanavn %s eksisterer allerede. Vælg et andet.
 ErrorSetACountryFirst=Indstil land først
 SelectThirdParty=Vælg en tredjepart
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Er du sikker på, at du vil slette dette firma og alle arvede oplysninger?
 DeleteContact=Slet en kontakt/adresse
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Er du sikker på, at du vil slette denne kontakt og alle arvede oplysninger?
 MenuNewThirdParty=Ny tredjepart
 MenuNewCustomer=Ny kunde
 MenuNewProspect=Nyt emne
@@ -13,8 +13,8 @@ MenuNewPrivateIndividual=Ny privatperson
 NewCompany=Nyt firma (emne, kunde, leverandør)
 NewThirdParty=Ny tredjepart (emne, kunde, leverandør)
 CreateDolibarrThirdPartySupplier=Opret en trediepart (leverandør)
-CreateThirdPartyOnly=Create third party
-CreateThirdPartyAndContact=Create a third party + a child contact
+CreateThirdPartyOnly=Opret tredjepart
+CreateThirdPartyAndContact=Opret en tredjepart + en børnekontakt
 ProspectionArea=Prospektering område
 IdThirdParty=Id tredjepart
 IdCompany=CVR
@@ -24,12 +24,12 @@ ThirdPartyContacts=Kontakter for tredjepart
 ThirdPartyContact=Kontakt for tredjepart 
 Company=Firma
 CompanyName=Firmanavn
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias name
+AliasNames=Alias ​​navn (kommerciel, varemærke, ...)
+AliasNameShort=Alias ​​navn
 Companies=Selskaber
 CountryIsInEEC=Landet er inde i Det Europæiske Økonomiske Fællesskab
 ThirdPartyName=Tredjeparts navn
-ThirdPartyEmail=Third party email
+ThirdPartyEmail=Tredjeparts email
 ThirdParty=Tredjepart
 ThirdParties=Tredjepart
 ThirdPartyProspects=Emner
@@ -40,10 +40,11 @@ ThirdPartyCustomersWithIdProf12=Kunder med %s eller %s
 ThirdPartySuppliers=Leverandører
 ThirdPartyType=Tredjepart type
 Individual=Privatperson
-ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
+ToCreateContactWithSameName=Vil automatisk oprette en kontakt / adresse med samme oplysninger end tredjepart under tredjepart. I de fleste tilfælde er det nok, selvom din tredjepart er et fysisk menneske, at skabe en tredjepart alene.
 ParentCompany=Moderselskab
 Subsidiaries=Datterselskaber
-ReportByCustomers=Rapport fra kunder
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Rapport fra kvartal
 CivilityCode=Høfligt kode
 RegisteredOffice=Hjemsted
@@ -51,12 +52,12 @@ Lastname=Efternavn
 Firstname=Fornavn
 PostOrFunction=Stilling
 UserTitle=Titel
-NatureOfThirdParty=Nature of Third party
+NatureOfThirdParty=Tredjepartens art
 Address=Adresse
 State=Stat/provins
 StateShort=Stat
 Region=Region
-Region-State=Region - State
+Region-State=Region - Stat
 Country=Land
 CountryCode=Landekode
 CountryId=Land id
@@ -68,27 +69,29 @@ Chat=Chat
 PhonePro=Firmatelefon
 PhonePerso=Pers. telefon
 PhoneMobile=Mobil
-No_Email=Refuse mass e-mailings
+No_Email=Afvis massemails
 Fax=Fax
 Zip=Zip Code
 Town=By
 Web=Web
 Poste= Position
 DefaultLang=Sprog som standard
-VATIsUsed=Moms anvendes
-VATIsNotUsed=Moms anvendes ikke
-CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-PaymentBankAccount=Payment bank account
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Fyld adresse med tredjepartsadresse
+ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjepart hverken kunde eller leverandør, ingen tilgængelige henvisningsobjekter
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+PaymentBankAccount=Betaling bankkonto
 OverAllProposals=Tilbud
 OverAllOrders=Ordrer
 OverAllInvoices=Fakturaer
-OverAllSupplierProposals=Price requests
+OverAllSupplierProposals=Prisforespørgsler
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
+LocalTax1IsUsed=Brug anden skat
 LocalTax1IsUsedES= RE bruges
 LocalTax1IsNotUsedES= RE bruges ikke
-LocalTax2IsUsed=Use third tax
+LocalTax2IsUsed=Brug tredje skat
 LocalTax2IsUsedES= IRPF bruges
 LocalTax2IsNotUsedES= IRPF ikke bruges
 LocalTax1ES=RE
@@ -198,7 +201,7 @@ ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId2LU=Id. prof. 2 (erhvervstilladelse)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -252,41 +255,51 @@ ProfId4RU=Prof Id 4 (Okpo)
 ProfId5RU=-
 ProfId6RU=-
 ProfId1DZ=RC
-ProfId2DZ=Art.
+ProfId2DZ=Kunst.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Momsregistreringsnummer
-VATIntraShort=Momsregistreringsnummer
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntaks er gyldigt
+VATReturn=VAT return
 ProspectCustomer=Emne / kunde
 Prospect=Emne
 CustomerCard=Customer Card
 Customer=Kunde
 CustomerRelativeDiscount=Relativ kunde rabat
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relativ rabat
 CustomerAbsoluteDiscountShort=Absolut rabat
 CompanyHasRelativeDiscount=Denne kunde har en rabat <b>på %s%%</b>
 CompanyHasNoRelativeDiscount=Denne kunde har ingen relativ discount som standard
-CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
+CompanyHasAbsoluteDiscount=Denne kunde har rabat til rådighed (kredit noter eller nedbetalinger) for <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Denne kunde har rabat til rådighed (kommerciel, nedbetalinger) til <b> %s </ b> %s
 CompanyHasCreditNote=Denne kunde har stadig kreditnotaer <b>for %s %s</b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Denne kunde har ingen rabat kreditter til rådighed
-CustomerAbsoluteDiscountAllUsers=Absolut rabatter (ydet af alle brugere)
-CustomerAbsoluteDiscountMy=Absolut rabatter (ydet af dig selv)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Ingen
 Supplier=Leverandør
-AddContact=Create contact
-AddContactAddress=Create contact/address
+AddContact=Opret kontakt
+AddContactAddress=Opret kontakt/adresse
 EditContact=Rediger kontakt
-EditContactAddress=Edit contact/address
+EditContactAddress=Rediger kontakt/adresse
 Contact=Kontakt
-ContactId=Contact id
+ContactId=Kontakt id
 ContactsAddresses=Kontakt/adresser
-FromContactName=Name:
-NoContactDefinedForThirdParty=No contact defined for this third party
+FromContactName=Navn:
+NoContactDefinedForThirdParty=Ingen kontakt er defineret for denne tredjepart
 NoContactDefined=Ingen kontakt er defineret
 DefaultContact=Kontakt som standard
-AddThirdParty=Create third party
+AddThirdParty=Opret tredjepart
 DeleteACompany=Slet et selskab
 PersonalInformations=Personoplysninger
 AccountancyCode=Regnskabskonto
@@ -305,17 +318,17 @@ CompanyDeleted=Company " %s" slettet fra databasen.
 ListOfContacts=Liste over kontakter/adresser
 ListOfContactsAddresses=Liste over kontakter/adresser
 ListOfThirdParties=Liste over tredjeparter
-ShowCompany=Show third party
+ShowCompany=Vis tredjepart
 ShowContact=Vis kontakt
 ContactsAllShort=Alle (intet filter)
 ContactType=Type af kontakt
 ContactForOrders=Kontakt for ordre
-ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForOrdersOrShipments=Bestillings eller forsendelsens kontakt
 ContactForProposals=Kontakt for tilbud
 ContactForContracts=Kontakt for kontrakt
 ContactForInvoices=Kontakt for faktura
 NoContactForAnyOrder=Denne kontakt er ikke tilknyttet nogen ordre
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyOrderOrShipments=Denne kontakt er ikke en kontakt for enhver ordre eller forsendelse
 NoContactForAnyProposal=Denne kontakt er ikke tilknyttet noget tilbud
 NoContactForAnyContract=Denne kontakt er ikke tilknyttet nogen kontrakt
 NoContactForAnyInvoice=Denne kontakt er ikke tilknyttet nogen faktura
@@ -360,12 +373,12 @@ TE_PRIVATE=Privatperson
 TE_OTHER=Andre
 StatusProspect-1=Kontakt ikke
 StatusProspect0=Aldrig kontaktet
-StatusProspect1=To be contacted
+StatusProspect1=Skal kontaktes
 StatusProspect2=Kontakt i gang
 StatusProspect3=Er kontaktet
 ChangeDoNotContact=Ændre status til 'Kontakt ikke'
 ChangeNeverContacted=Ændre status til 'Aldrig kontaktet'
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Skift status til 'Skal Kontaktes'
 ChangeContactInProcess=Ændre status til 'Kontakt i gang'
 ChangeContactDone=Ændre status til 'Er kontaktet'
 ProspectsByStatus=Emne ved status
@@ -374,47 +387,48 @@ ExportCardToFormat=Eksporter kort til format
 ContactNotLinkedToCompany=Kontakt ikke knyttet til nogen tredjepart
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Ingen Dolibarr adgang
-ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ExportDataset_company_1=Tredjeparter (Virksomheder / fonde / fysiske personer) og opsætning
 ExportDataset_company_2=Kontakter og egenskaber
-ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontakter/adresser (af trediepart eller ikke) og egenskaber
-ImportDataset_company_3=Bankoplysninger
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_1=Tredjeparter (Virksomheder / fonde / fysiske personer) og opsætning
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Prisniveau
 DeliveryAddress=Leveringsadresse
 AddAddress=Tilføj adresse
 SupplierCategory=Leverandør kategori
-JuridicalStatus200=Independent
+JuridicalStatus200=Uafhængig
 DeleteFile=Slet fil
 ConfirmDeleteFile=Er du sikker på du vil slette denne fil?
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=Tildelt til en salgsrepræsentant
 Organization=Organisationen
 FiscalYearInformation=Oplysninger om regnskabssår
 FiscalMonthStart=Første måned i regnskabsåret
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=Du skal først oprette e-mail til denne bruger for at kunne tilføje e-mail-meddelelser til ham.
+YouMustCreateContactFirst=For at kunne tilføje e-mail-meddelelser skal du først definere kontakter med gyldige e-mails til tredjepart
 ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste over emner
 ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Tredjeparter og kontakter
-LastModifiedThirdParties=Latest %s modified third parties
+LastModifiedThirdParties=Seneste %s ændrede tredjeparter
 UniqueThirdParties=Unikke tredjeparter i alt
 InActivity=Åben
 ActivityCeased=Lukket
-ThirdPartyIsClosed=Third party is closed
+ThirdPartyIsClosed=Tredjepart er lukket
 ProductsIntoElements=Liste over varer/ydelser i %s
 CurrentOutstandingBill=Udestående faktura i øjeblikket
 OutstandingBill=Maks. for udstående faktura
-OutstandingBillReached=Max. for outstanding bill reached
+OutstandingBillReached=Maks. for udestående regning nået
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Retur værdi med format %syymm-nnnn for kunde-kode og %syymm-nnnn for leverandøren kode hvor yy er årstal, MM er måneden og nnnn er en sekvens uden mellemrum og ikke vende tilbage til 0.
 LeopardNumRefModelDesc=Kunde / leverandør-koden er ledig. Denne kode kan til enhver tid ændres.
 ManagingDirectors=Leder(e) navne (CEO, direktør, chef...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeOriginThirdparty=Duplicate tredjepart (tredjepart, du vil slette)
 MergeThirdparties=Flet tredjeparter
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Tredjeparter er blevet flettet
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+ConfirmMergeThirdparties=Er du sikker på, at du vil fusionere denne tredjepart i den nuværende? Alle linkede objekter (fakturaer, ordrer, ...) vil blive flyttet til den aktuelle tredjepart, og tredjepartet vil blive slettet.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login af salgsrepræsentant
+SaleRepresentativeFirstname=Fornavn på salgsrepræsentant
+SaleRepresentativeLastname=Efternavn på salgsrepræsentant
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Ny kunde eller leverandør kode foreslået på duplikat kode
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 339b60ec6b5..463b2c3f035 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+MenuFinancial=Fakturering | Betaling
+TaxModuleSetupToModifyRules=Gå til <a href="%s"> opsætning af skatter modul </a> for at ændre regler for beregning
+TaxModuleSetupToModifyRulesLT=Gå til <a href="%s"> Firmaopsætning </a> for at ændre regler for beregning
 OptionMode=Indstilling for regnskab
 OptionModeTrue=Indtægter/udgifter
 OptionModeVirtual=Kreditor/debitor
@@ -23,43 +23,43 @@ ReportTurnover=Omsætning
 PaymentsNotLinkedToInvoice=Betalinger ikke er knyttet til en faktura, så der ikke er knyttet til nogen tredjepart
 PaymentsNotLinkedToUser=Betalinger ikke er knyttet til en bruger
 Profit=Profit
-AccountingResult=Accounting result
-BalanceBefore=Balance (before)
+AccountingResult=Regnskabsresultat
+BalanceBefore=Balance (før)
 Balance=Balance
 Debit=Debet
 Credit=Kredit
-Piece=Accounting Doc.
+Piece=Regnskabsdokumenter.
 AmountHTVATRealReceived=Netto modtaget
 AmountHTVATRealPaid=Netto udbetalt
-VATToPay=Udgående moms
-VATReceived=Moms modtaget
-VATToCollect=Momskøb
+VATToPay=Tax sales
+VATReceived=SalgsMoms
+VATToCollect=KøbsMoms
 VATSummary=Momsbalance
 VATPaid=Moms betalt
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
+LT1Summary=Skat 2 resumé
+LT2Summary=Skat 3 resumé
 LT1SummaryES=RE balance
 LT2SummaryES=IRPF balance
 LT1SummaryIN=CGST Balance
 LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
+LT1Paid=Skat 2 betalt
+LT2Paid=Skat 3 betalt
 LT1PaidES=RE betalt
 LT2PaidES=IRPF betalt
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
+LT1PaidIN=CGST Betalt
+LT2PaidIN=SGST Betalt
+LT1Customer=Skat 2 salg
+LT1Supplier=Skat 2 køb
 LT1CustomerES=RE salg
 LT1SupplierES=RE indkøb
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
+LT1CustomerIN=CGST salg
+LT1SupplierIN=CGST indkøb
+LT2Customer=Skat 3 salg
+LT2Supplier=Skat 3 køb
 LT2CustomerES=IRPF salg
 LT2SupplierES=IRPF køb
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
+LT2CustomerIN=SGST salg
+LT2SupplierIN=SGST køb
 VATCollected=Modtaget moms
 ToPay=At betale
 SpecialExpensesArea=Særlige betalinger
@@ -67,8 +67,8 @@ SocialContribution=Skat/afgift
 SocialContributions=Skatter/afgifter
 SocialContributionsDeductibles=Fradragsberettigede skatter/afgifter
 SocialContributionsNondeductibles=Ikke-fradragsberettigede skatter/afgifter
-LabelContrib=Label contribution
-TypeContrib=Type contribution
+LabelContrib=Etiketbidrag
+TypeContrib=Type bidrag
 MenuSpecialExpenses=Særlige udgifter
 MenuTaxAndDividends=Skatter og udbytter
 MenuSocialContributions=Skatter/afgifter
@@ -88,12 +88,12 @@ ListOfCustomerPayments=Oversigt over kundebetalinger
 ListOfSupplierPayments=Liste over leverandør betalinger
 DateStartPeriod=Startdato for perioden
 DateEndPeriod=Slutdato for perioden
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
+newLT1Payment=Ny skat 2 betaling
+newLT2Payment=Ny skat 3 betaling
+LT1Payment=Skat 2 betaling
+LT1Payments=Skat 2 betalinger
+LT2Payment=Skat 3 betaling
+LT2Payments=Skat 3 betalinger
 newLT1PaymentES=Ny RE betaling
 newLT2PaymentES=Ny IRPF betaling
 LT1PaymentES=RE betaling
@@ -102,16 +102,17 @@ LT2PaymentES=IRPF betaling
 LT2PaymentsES=IRPF betalinger
 VATPayment=Betaling af udgående moms
 VATPayments=Betalinger af udgående moms
-VATRefund=Sales tax refund
+VATRefund=Salgskat refusion
+NewVATPayment=New sales tax payment
 Refund=Tilbagebetaling
 SocialContributionsPayments=Betalinger af skat/afgift
 ShowVatPayment=Vis momsbetaling
 TotalToPay=At betale i alt
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balancen er kun synlig i denne liste, hvis tabellen sorteres stigende på %s og filtreret til 1 bankkonto
 CustomerAccountancyCode=Regnskabskode for kunde
 SupplierAccountancyCode=Regnskabskode for leverandør
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+CustomerAccountancyCodeShort=Cust. konto. kode
+SupplierAccountancyCodeShort=Sup. konto. kode
 AccountNumber=Kontonummer
 NewAccountingAccount=Ny konto
 SalesTurnover=Omsætning
@@ -121,7 +122,7 @@ ByThirdParties=Tredjemand
 ByUserAuthorOfInvoice=Fakturaforfatter
 CheckReceipt=Checkindbetaling
 CheckReceiptShort=Checkindbetaling
-LastCheckReceiptShort=Latest %s check receipts
+LastCheckReceiptShort=Seneste %s check kvitteringer
 NewCheckReceipt=Ny rabat
 NewCheckDeposit=Ny checkindbetaling
 NewCheckDepositOn=Opret kvittering for indbetaling på konto: %s
@@ -133,54 +134,58 @@ ConfirmPaySocialContribution=Er du sikker på, at du vil markere denne skat/afgi
 DeleteSocialContribution=Slet en betaling af skat/afgift
 ConfirmDeleteSocialContribution=Er du sikker på, at du vil slette denne betaling af skat/afgift?
 ExportDataset_tax_1=Betalinger af skatter/afgifter
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeBookkeeping=Analysis of <b>data journalized in Bookkeeping Ledger table</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeVATDebt=Indstilling <b> %sMoms på forpligtelseskonto%s </b>.
+CalcModeVATEngagement=Mode <b> %sVAT på indkomst-udgifter%s </ b>.
+CalcModeDebt=Mode <b> %sClaims-Debts%s </ b> sagde <b> Forpligtelsesregnskab </ b>.
+CalcModeEngagement=Mode <b> %sIncomes-Expenses%s </ b> sagde <b> kontantregnskab </ b>
+CalcModeBookkeeping=Analyse af <b> data, der er journaliseret i Bookkeeping Ledger-tabellen </ b>
+CalcModeLT1= Mode <b> %sRE på kundefakturaer - leverandører invoices%s </ b>
+CalcModeLT1Debt=Mode <b> %sRE på kundefakturaer%s </ b>
+CalcModeLT1Rec= Mode <b> %sRE på leverandører invoices%s </ b>
+CalcModeLT2= Mode <b> %sIRPF på kundefakturaer - leverandører invoices%s </ b>
+CalcModeLT2Debt=Mode <b> %sIRPF på kundefakturaer%s </ b>
+CalcModeLT2Rec= Mode <b> %sIRPF på leverandører invoices%s </ b>
 AnnualSummaryDueDebtMode=Balance mellem indtægter og udgifter, årligt sammenfattet
 AnnualSummaryInputOutputMode=Balance mellem indtægter og udgifter, årligt sammenfattet
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+AnnualByCompanies=Indkomst- og udgiftsbalance, pr. Foruddefinerede regnskabet
+AnnualByCompaniesDueDebtMode=Indkomst- og udgiftsbalance, detaljer ved foruddefinerede grupper, tilstand <b> %sClaims-Debts%s </b> sagde <b> Forpligtelsesregnskab </b>.
+AnnualByCompaniesInputOutputMode=Indkomst- og udgiftsbalance, detaljer ved foruddefinerede grupper, tilstand <b> %sIncomes-Expenses%s </b> sagde <b> kontantregnskab </b>.
 SeeReportInInputOutputMode=Voir le <b>rapport %sRecettes-Dpenses %s</b> DIT <b>comptabilit de caisse</b> pour un calcul sur les paiements effectivement raliss
 SeeReportInDueDebtMode=Voir le <b>rapport %sCrances-Dettes %s</b> DIT <b>comptabilit d'engagement</b> pour un calcul sur les factures Mises
-SeeReportInBookkeepingMode=See report <b>%sBookeeping%s</b> for a calculation on <b>bookkeeping table analysis</b>
+SeeReportInBookkeepingMode=Se rapport <b> %sBookeeping%s </ b> til en beregning på <b> analyse af bogføringstabeller </ b>
 RulesAmountWithTaxIncluded=- De viste beløb er med alle inkl. moms
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
+RulesResultDue=- Det inkluderer udestående fakturaer, udgifter, moms, donationer, uanset om de er betalt eller ej. Inkluderer også betalte lønninger. <br> - Det er baseret på valideringsdatoen for fakturaer og moms og på forfaldsdagen for udgifter. For lønninger, der er defineret med Lønmodul, anvendes datoen for betaling.
+RulesResultInOut=- Den omfatter de reelle betalinger foretaget på fakturaer, udgifter, moms og løn. <br> - Det er baseret på betalingsdatoer for fakturaer, udgifter, moms og løn. Donationsdatoen for donation.
+RulesCADue=- Det inkluderer kundens fakturaer, uanset om de er betalt eller ej. <br> - Det er baseret på valideringsdatoen for disse fakturaer. <br>
 RulesCAIn=- Den omfatter alle de faktiske betalinger af fakturaer modtaget fra kunder. <br> - Det er baseret på betaling dato med disse fakturaer <br>
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are nor included
-DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Rapport fra tredjepart IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=Momsrapport
-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
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=Det indeholder post i din Ledger med regnskabsregnskaber, der har gruppen "EXPENSE" eller "INCOME"
+RulesResultBookkeepingPredefined=Det indeholder post i din Ledger med regnskabsregnskaber, der har gruppen "EXPENSE" eller "INCOME"
+RulesResultBookkeepingPersonalized=Det viser rekord i din Ledger med regnskabsregnskaber <b> grupperet af personlige grupper </ b>
+SeePageForSetup=Se menuen <a href="%s"> %s </a> til opsætning
+DepositsAreNotIncluded=- Betalingsfakturaer er ikke inkluderet
+DepositsAreIncluded=- Fakturaer med forudbetaling er inkluderet
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Rapport fra tredjepart IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Rapport fra kunden moms indsamlet og betalt
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Rapportér ved RE-sats
+LT2ReportByQuartersES=Rapport med IRPF-sats
 SeeVATReportInInputOutputMode=Voir le <b>rapport %sTVA encaissement %s</b> pour mode de calcul standard
 SeeVATReportInDueDebtMode=Se rapporten for<b>%sMoms for debitorer%s</b> for vælge at se udregning med moms for debitorer
 RulesVATInServices=- For ydelser indeholder rapporten de momsposteringer, der faktisk er modtaget eller udstedt på grundlag af betalingsdatoen.
-RulesVATInProducts=- For materielle aktiver indgår momsfakturaerne på fakturadatoen.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For ydelser indbefatter rapporten momsfakturaer til betaling, betalt eller ej, baseret på fakturadatoen.
-RulesVATDueProducts=- For materielle aktiver indgår momsfakturaerne baseret på fakturadatoen.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Bemærk: For materielle aktiver benyttes leveringsdatoen for at være mere retfærdig.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/faktura
 NotUsedForGoods=Ikke brugt på varer
 ProposalStats=Statistik over forslag
@@ -204,35 +209,36 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Fakturalinjer til afsendelse
 ByProductsAndServices=Varer og ydelser
 RefExt=Ekstern ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=For at oprette en fakturaskabelon skal du oprette en standardfaktura, og uden at godkende den, skal du klikke på knappen "%s".
 LinkedOrder=Link til ordre
 Mode1=Metode 1
 Mode2=Metode 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-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 <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+CalculationRuleDesc=For at beregne total moms er der to metoder: <br> Metode 1 er afrundingskvot på hver linje og derefter opsummerer dem. <br> Metode 2 opsummerer alt moms på hver linje og derefter afrundingsresultat. <br> Endelig resultat kan afvige fra få cent. Standard tilstand er tilstand <b> %s </ b>.
+CalculationRuleDescSupplier=Ifølge leverandør skal du vælge en passende metode til at anvende samme beregningsregel og få det samme resultat, som din leverandør forventes.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Omsætningsrapport pr. Produkt, er det ikke relevant, når du bruger en <b> Kontantkonto </ b> -tilstand. Denne rapport er kun tilgængelig, når du bruger <b> engagement accounting </ b> (se opsætning af regnskabsmodul).
 CalculationMode=Udregningsmåde
 AccountancyJournal=Regnskabskladde
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Regnskabskonto som standard for betaling af moms
+ACCOUNTING_ACCOUNT_CUSTOMER=Regnskabskonto anvendt til kundens tredjepart
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Den dedikerede regnskabskonto, der er defineret på tredjepartskort, vil kun blive brugt til Subledger Accouting. Denne vil blive brugt til General Ledger og som standardværdi for Subledger regnskab, hvis dedikeret kundeaccouting konto på tredjepart ikke er defineret.
+ACCOUNTING_ACCOUNT_SUPPLIER=Regnskabskonto anvendt til leverandør tredjepart
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Den dedikerede regnskabskonto, der er defineret på tredjepartskort, vil kun blive brugt til Subledger Accouting. Denne vil blive brugt til General Ledger og som standardværdi af Subledger regnskab, hvis dedikeret leverandør accouting konto på tredjepart ikke er defineret.
 CloneTax=Klon en skat/afgift
 ConfirmCloneTax=Bekræft, at du vil klone betaling af skat/afgift
-CloneTaxForNextMonth=Clone it for next month
+CloneTaxForNextMonth=Klon det for næste måned
 SimpleReport=Simpel rapport
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
+AddExtraReport=Ekstra rapporter (tilføj udenlandsk og national kunderapport)
+OtherCountriesCustomersReport=Udenlandske kunder rapporterer
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Baseret på de to første bogstaver i momsnummeret er forskelligt fra din egen virksomheds landekode
+SameCountryCustomersWithVAT=Nationale kunder rapport
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Baseret på de to første bogstaver i momsnummeret er det samme som dit eget lands landekode
+LinkedFichinter=Link til en intervention
 ImportDataset_tax_contrib=Skatter/afgifter
 ImportDataset_tax_vat=Momsbetalinger
-ErrorBankAccountNotFound=Error: Bank account not found
+ErrorBankAccountNotFound=Fejl: Bankkonto ikke fundet
 FiscalPeriod=Regnskabsperiode
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
+ListSocialContributionAssociatedProject=Liste over sociale bidrag i forbindelse med projektet
+DeleteFromCat=Fjern fra regnskabsgruppen
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index 512c7ae4532..33b24dee55d 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -10,12 +10,12 @@ CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Kommandolinje for at kontrollere og starte kvalificerede cron-job
 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
 CronMethodDoesNotExists=Class %s does not contains any method %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronJobDefDesc=Cron-jobprofiler er defineret i modulbeskrivelsesfilen. Når modulet er aktiveret, er de indlæst og tilgængeligt, så du kan administrere jobene fra adminværktøjsmenuen %s.
+CronJobProfiles=Liste over forud definerede cron jobprofiler
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Prioritet
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job startet og gennemført
 #Page card
@@ -55,28 +55,29 @@ CronSaveSucess=Save successfully
 CronNote=Kommentar
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
-StatusAtInstall=Status at module installation
+StatusAtInstall=Status ved modul installation
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Deaktivere
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Navn på Dolibarr modul bibliotek (også arbejde med ekstern Dolibarr modul). <BR> For eksempel at kalde/hente metode for Dolibarr Produkt objekt /htdocs/<u>product</u>/class/product.class.php, er værdien for modulet <i> produkt </i>
+CronClassFileHelp=Den relative sti og filnavn, der skal indlæses (stien er i forhold til webserverens rodmappe). <BR> For eksempel at kalde hentningsmetoden for Dolibarr Produktobjekt htdocs / product / class / <u> product.class.php </u> er værdien for klassefilenavnet <br> <i> produkt / klasse / product.class.php </i>
+CronObjectHelp=Objektnavnet, der skal indlæses. <BR> For eksempel at kalde/hente fremgangsmåden for Dolibarr Product objektet /htdocs/product/class/product.class.php, er værdien for klassefilenavnet <br> <i> Produkt </i>
+CronMethodHelp=Objektmetoden til at starte. <BR> For eksempel at kalde hentningsmetoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, er værdien for metoden <i> hent </i>
+CronArgsHelp=Metoden argumenter. <BR> For eksempel at kalde/hente metode for Dolibarr Produkt objekt /htdocs/product/class/product.class.php, kan værdien for paramters være <i> 0, ProductRef </ i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Fra
 # Info
 # Common
 CronType=Job type
-CronType_method=Call method of a PHP Class
+CronType_method=Opkaldsmetode for en PHP klasse
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index e9331ffa00d..958fa38f201 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -73,9 +73,9 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchende er ikke komplet.
 ErrorLDAPMakeManualTest=A. LDIF-fil er blevet genereret i mappen %s. Prøv at indlæse den manuelt fra kommandolinjen for at få flere informationer om fejl.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke gemme en aktion med "vedtægt ikke startes", hvis feltet "udført af" er også fyldt.
 ErrorRefAlreadyExists=Ref bruges til oprettelse eksisterer allerede.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordHasAtLeastOneChildOfType=Objektet har mindst et under objekt af type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
 ErrorModuleRequireJavascript=Javascript skal ikke være deaktiveret for at have denne funktion virker. For at aktivere / deaktivere Javascript, gå til menu Home-> Setup-> Display.
 ErrorPasswordsMustMatch=Begge har skrevet passwords skal matche hinanden
@@ -104,7 +104,7 @@ ErrorForbidden2=Tilladelse til dette login kan defineres af din Dolibarr adminis
 ErrorForbidden3=Det ser ud til, at Dolibarr ikke bruges gennem en godkendt session. Se på Dolibarr installationsdokumentation for at vide mere om, hvordan man administrerer godkendelser (htaccess, mod_auth eller andet ...).
 ErrorNoImagickReadimage=Funktion imagick_readimage er ikke fundet i denne PHP. Intet eksempel kan være til rådighed. Administratorer kan deaktivere denne fane fra menuen Setup - Display.
 ErrorRecordAlreadyExists=Optag allerede findes
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Denne etiket eksisterer allerede
 ErrorCantReadFile=Kunne ikke læse filen ' %s'
 ErrorCantReadDir=Kunne ikke læse directory ' %s'
 ErrorBadLoginPassword=Bad værdi for brugernavn eller password
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -155,12 +155,12 @@ ErrorPriceExpression19=Expression not found
 ErrorPriceExpression20=Empty expression
 ErrorPriceExpression21=Empty result '%s'
 ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpression23=Ukendt eller ikke-sæt variabel '%s' i %s
+ErrorPriceExpression24=Variabel '%s' eksisterer men har ingen værdi
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=Fejl, forsøger at lave en lagerbevægelse uden parti / seriel information på produkt '%s', der kræver meget  parti / seriel 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'
@@ -198,15 +198,16 @@ ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
 ErrorNoWarehouseDefined=Error, no warehouses defined.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
 ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Massvalidering er ikke mulig, når indstillingen for at øge/reducere lager er indstillet på denne handling (du skal validere en for en, så du kan definere lageret for at øge / formindske)
+ErrorObjectMustHaveStatusDraftToBeValidated=Objekt %s skal have status 'Udkast', der skal valideres.
+ErrorObjectMustHaveLinesToBeValidated=Objekt %s skal have linjer, der skal valideres.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Kun validerede fakturaer kan sendes ved hjælp af massearrangementet Send via email.
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du skal vælge, om artiklen er en foruddefineret vare eller ej
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Den rabat, du forsøger at anvende, er større end det der forblive at betale. Opdel rabatten i 2 mindre rabatter før.
+ErrorFileNotFoundWithSharedLink=Filen blev ikke fundet. Det kan være, at dele nøglen blev ændret eller filen blev fjernet for nylig.
+ErrorProductBarCodeAlreadyExists=Produktets stregkode %s eksisterer allerede på en anden produktreference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Bemærk også, at brug af virtuelt produkt med automatisk forøgelse / nedsættelse af underprodukter ikke er mulig, når mindst et underprodukt (eller underprodukt af underprodukter) har brug for et serienummer / parti nummer.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -223,9 +224,10 @@ WarningCloseAlways=Warning, closing is done even if amount differs between sourc
 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).
 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.
+WarningPaymentDateLowerThanInvoiceDate=Betalingsdato (%s) er tidligere end faktura dato (%s) for faktura %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antallet af forskellige modtagere er begrænset til <b> %s </b>, når du bruger bulkhandlingerne på lister
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/da_DK/loan.lang b/htdocs/langs/da_DK/loan.lang
index e3b2d65c544..cb23cb801d2 100644
--- a/htdocs/langs/da_DK/loan.lang
+++ b/htdocs/langs/da_DK/loan.lang
@@ -44,10 +44,12 @@ GoToInterest=%s will go towards INTEREST
 GoToPrincipal=%s will go towards PRINCIPAL
 YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
+AddLoan=Opret lån
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 87e2bc94b6b..0c25294eae9 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sendt delvist
 MailingStatusSentCompletely=Sendte helt
 MailingStatusError=Fejl
 MailingStatusNotSent=Ikke sendt
-MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
+MailSuccessfulySent=Email (fra %s til %s) er accepteret til levering med succes
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -49,7 +49,7 @@ NbOfUniqueEMails=Nb af unikke e-mails
 NbOfEMails=Nb af e-mails
 TotalNbOfDistinctRecipients=Antal forskellige modtagere
 NoTargetYet=Ingen modtagere er endnu valgt (gå til fanen "modtagere")
-NoRecipientEmail=No recipient email for %s
+NoRecipientEmail=Ingen modtager email for %s
 RemoveRecipient=Fjern modtageren
 YouCanAddYourOwnPredefindedListHere=Til at oprette din e-mail selector modulet, se htdocs / includes / modules / postforsendelser / README.
 EMailTestSubstitutionReplacedByGenericValues=Når du bruger testtilstand, substitutioner variabler er erstattet af generiske værdier
@@ -69,25 +69,26 @@ ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubc
 EMailSentToNRecipients=EMail sent to %s recipients.
 EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+OnlyPDFattachmentSupported=Hvis PDF-dokumenterne allerede er genereret til de objekter, der skal sendes, bliver de knyttet til e-mail. Hvis ikke, vil der ikke blive sendt email (også bemærk, at kun pdf-dokumenter understøttes som vedhæftet fil i masse mail, der sendes i denne version).
+AllRecipientSelected=Modtagerne af den %s-rekord, der er valgt (hvis deres email er kendt).
+GroupEmails=Gruppe e-mails
+OneEmailPerRecipient=Én email pr. Modtager (som standard er der valgt en e-mail pr. Post)
+WarningIfYouCheckOneRecipientPerEmail=Advarsel, hvis du markerer denne boks betyder det kun, at en e-mail vil blive sendt til flere forskellige valgte poster, så hvis din besked indeholder substitutionsvariabler, der refererer til data i en post, bliver det ikke muligt at erstatte dem.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
 MailingModuleDescContactsByCategory=Contacts by categories
 MailingModuleDescContactsByFunction=Contacts by position
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+MailingModuleDescEmailsFromFile=E-mails fra filen
+MailingModuleDescEmailsFromUser=Emails indlæst af brugeren
+MailingModuleDescDolibarrUsers=Brugere med e-mails
+MailingModuleDescThirdPartiesByCategories=Tredjeparter (efter kategorier)
+SendingFromWebInterfaceIsNotAllowed=Afsendelse fra webgrænseflade er ikke tilladt.
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s filtjenester
@@ -115,7 +116,7 @@ DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Du kan bruge <b>comma</b> separator til at angive flere modtagere.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
-TagSignature=Signature of sending user
+TagSignature=Signatur af afsender
 EMailRecipient=Recipient EMail
 TagMailtoEmail=Recipient EMail (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
@@ -160,7 +161,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetupForEmailing=Udgående e-mail opsætning (til masse emailing)
+DefaultOutgoingEmailSetup=Standard udgående e-mail opsætning
 Information=Information
 
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index b3ec26dd205..67269e14399 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/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=TT:MM
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -24,13 +24,13 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Database forbindelse
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
+NoTemplateDefined=Ingen skabelon til rådighed for denne e-mail-type
+AvailableVariables=Tilgængelige substitutionsvariabler
 NoTranslation=Ingen oversættelse
 Translation=Oversættelse
 NoRecordFound=Ingen poster fundet
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NoRecordDeleted=Ingen post slettet
+NotEnoughDataYet=Ikke nok data
 NoError=Ingen fejl
 Error=Fejl
 Errors=Fejl
@@ -38,13 +38,13 @@ ErrorFieldRequired=Felt ' %s' er påkrævet
 ErrorFieldFormat=Felt ' %s' har en dårlig værdi
 ErrorFileDoesNotExists=Fil %s ikke eksisterer
 ErrorFailedToOpenFile=Kunne ikke åbne filen %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=Kan ikke oprette dir %s
+ErrorCanNotReadDir=Kan ikke læse dir %s
 ErrorConstantNotDefined=Parameter %s ikke defineret
 ErrorUnknown=Ukendt fejl
 ErrorSQL=SQL Fejl
 ErrorLogoFileNotFound=Logo fil ' %s' blev ikke fundet
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Gå til Modul setup at rette dette
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=Det lykkedes ikke at sende e-mails (afsender= %s, receiver= %s)
 ErrorFileNotUploaded=Filen blev ikke uploadet. Kontroller, at størrelse ikke overstiger den maksimalt tilladte, at den frie plads der er til rådighed på disken, og at der ikke allerede en fil med samme navn i denne mappe.
@@ -63,58 +63,60 @@ ErrorCantLoadUserFromDolibarrDatabase=Kunne ikke finde <b>bruger %s</b> i Doliba
 ErrorNoVATRateDefinedForSellerCountry=Fejl, der ikke momssatser defineret for land ' %s'.
 ErrorNoSocialContributionForSellerCountry=Fejl, ingen type af skatter/afgifter defineret for landet '%s'.
 ErrorFailedToSaveFile=Fejl, kunne ikke gemme filen.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Maks. antal poster pr. side
-NotAuthorized=You are not authorized to do that.
+ErrorCannotAddThisParentWarehouse=Du forsøger at tilføje et forældrelager, som allerede er et barn i den nuværende
+MaxNbOfRecordPerPage=Max number of record per page
+NotAuthorized=Du har ikke tilladelse til at gøre det.
 SetDate=Indstil dato
-SelectDate=Select a date
+SelectDate=Vælg en dato
 SeeAlso=Se også %s
-SeeHere=See here
-Apply=Apply
+SeeHere=Se her
+ClickHere=Klik her
+Here=Here
+Apply=ansøge
 BackgroundColorByDefault=Standard baggrundsfarve
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
+FileRenamed=Filen blev omdøbt
+FileGenerated=Filen blev genereret
 FileSaved=Filen er blevet gemt
 FileUploaded=Filen blev uploadet
-FileTransferComplete=File(s) was uploaded successfully
-FilesDeleted=File(s) successfully deleted
+FileTransferComplete=File(s) er blevet uploadet
+FilesDeleted=Fil (er), der er slettet korrekt
 FileWasNotUploaded=En fil er valgt for udlæg, men endnu ikke var uploadet. Klik på "Vedhæft fil" for dette.
 NbOfEntries=Nb af tilmeldinger
-GoToWikiHelpPage=Read online help (Internet access needed)
+GoToWikiHelpPage=Læs online hjælp (med adgang til Internettet er nødvendig)
 GoToHelpPage=Læs hjælpe
 RecordSaved=Optag gemt
 RecordDeleted=Post slettet
 LevelOfFeature=Niveau funktionsliste
 NotDefined=Ikke defineret
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode er sat til <b>%s</b> i konfigurationsfilen <b>conf.php</b>.<br>Dette betyder, at adgangskoden database er ekstern i forhold til Dolibarr, så ændrer dette felt har ingen effekt.
 Administrator=Administrator
 Undefined=Undefined
-PasswordForgotten=Password forgotten?
+PasswordForgotten=Har du glemt dit kodeord ?
 SeeAbove=Se ovenfor
 HomeArea=Hjem
-LastConnexion=Latest connection
+LastConnexion=Seneste forbindelse
 PreviousConnexion=Forrige forbindelse
-PreviousValue=Previous value
+PreviousValue=Tidligere værdi
 ConnectedOnMultiCompany=Connected på enhed
 ConnectedSince=Connected siden
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+AuthenticationMode=Autentificeringstilstand
+RequestedUrl=Angivne URL
 DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+RequestLastAccessInError=Seneste database adgang anmodning fejl
+ReturnCodeLastAccessInError=Vende tilbage kode for seneste database adgang anmodning fejl
+InformationLastAccessInError=Information efter seneste database adgang anmodning fejl
 DolibarrHasDetectedError=Dolibarr har opdaget en teknisk fejl
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+YouCanSetOptionDolibarrMainProdToZero=Du kan læse logfil eller sæt indstillingen $ dolibarr_main_prod til '0' i din config-fil for at få flere oplysninger.
+InformationToHelpDiagnose=Denne information kan være nyttig til diagnostiske formål (du kan indstille mulighed $dolibarr_main_prod til " 1 " for at fjerne sådanne oplysninger)
 MoreInformation=Mere information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
+TechnicalInformation=Tekniske oplysninger
+TechnicalID=Teknisk id
 NotePublic=Note (offentlige)
 NotePrivate=Note (privat)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr blev setup at begrænse præcision på enhedspriser <b>til %s</b> decimaler.
 DoTest=Test
 ToFilter=Filter
-NoFilter=No filter
+NoFilter=Intet filter
 WarningYouHaveAtLeastOneTaskLate=Advarsel, du har mindst ét element, der har oversteget den tolerance forsinkelse.
 yes=ja
 Yes=Ja
@@ -125,42 +127,42 @@ Home=Hjem
 Help=Hjælp
 OnlineHelp=Online hjælp
 PageWiki=Wiki side
-MediaBrowser=Media browser
+MediaBrowser=Mediebrowser
 Always=Altid
 Never=Aldrig
 Under=under
 Period=Periode
 PeriodEndDate=Slutdato for perioden
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
+SelectedPeriod=Udvalgt periode
+PreviousPeriod=Tidligere periode
 Activate=Aktivér
 Activated=Aktiveret
 Closed=Lukket
 Closed2=Lukket
-NotClosed=Not closed
+NotClosed=Ikke lukket
 Enabled=Aktiveret
 Deprecated=Underkendt
 Disable=Deaktivere
 Disabled=Deaktiveret
 Add=Tilføj
 AddLink=Tilføj link
-RemoveLink=Remove link
-AddToDraft=Add to draft
+RemoveLink=Fjern link
+AddToDraft=Tilføj til udkast
 Update=Opdatering
 Close=Luk
-CloseBox=Remove widget from your dashboard
+CloseBox=Fjern widget fra dit dashboard
 Confirm=Bekræft
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Ønsker du virkelig at sende indhold af dette kort pr. Mail til <b> %s </b>?
 Delete=Slet
 Remove=Fjerne
-Resiliate=Terminate
+Resiliate=Afslutte
 Cancel=Annuller
 Modify=Gem
 Edit=Redigér
 Validate=Validate
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Validere og Godkende
 ToValidate=At validere
-NotValidated=Not validated
+NotValidated=Ikke valideret
 Save=Gem
 SaveAs=Gem som
 TestConnection=Test forbindelse
@@ -172,26 +174,27 @@ Go=Gå
 Run=Kør
 CopyOf=Kopi af
 Show=Vis
-Hide=Hide
+Hide=Skjule
 ShowCardHere=Vis kort
 Search=Søgning
 SearchOf=Søg
 Valid=Gyldig
 Approve=Godkend
-Disapprove=Disapprove
+Disapprove=Afvist
 ReOpen=Re-Open
 Upload=Send fil
 ToLink=Link
 Select=Vælg
 Choose=Vælge
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Forfatter
 User=Bruger
 Users=Brugere
 Group=Gruppe
 Groups=Grupper
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Ingen brugergruppe definéret
 Password=Password
 PasswordRetype=Gentag dit password
 NoteSomeFeaturesAreDisabled=Bemærk, at en masse funktioner / moduler er slået fra i denne demonstration.
@@ -201,7 +204,7 @@ Parameter=Parameter
 Parameters=Parametre
 Value=Værdi
 PersonalValue=Personlige værdi
-NewObject=New %s
+NewObject=Ny %s
 NewValue=Ny værdi
 CurrentValue=Nuværende værdi
 Code=Kode
@@ -216,8 +219,8 @@ Info=Log
 Family=Familie
 Description=Beskrivelse
 Designation=Beskrivelse
-Model=Doc template
-DefaultModel=Default doc template
+Model=Dokumenter skabeloner
+DefaultModel=Standard dokument skabelon
 Action=Begivenhed
 About=Om
 Number=Antal
@@ -227,7 +230,7 @@ Numero=Numero
 Limit=Limit
 Limits=Grænseværdier
 Logout=Log ud
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+NoLogoutProcessWithAuthMode=Ingen applicative afbryd funktion med authentication mode <b>%s</b>
 Connection=Forbindelsesstyring
 Setup=Opsætning
 Alert=Alarm
@@ -237,18 +240,18 @@ Next=Næste
 Cards=Postkort
 Card=Kort
 Now=Nu
-HourStart=Start hour
+HourStart=Start time
 Date=Dato
 DateAndHour=Dato og tid
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Dags dato
+DateReference=Referencedato
 DateStart=Startdato
 DateEnd=Slutdato
 DateCreation=Lavet dato
-DateCreationShort=Creat. date
+DateCreationShort=Creat. dato
 DateModification=Ændringsdatoen
 DateModificationShort=Modif. dato
-DateLastModification=Latest modification date
+DateLastModification=Seneste ændring dato
 DateValidation=Validering dato
 DateClosing=Udløbsdato
 DateDue=Forfaldsdag
@@ -261,15 +264,15 @@ DateRequest=Anmodning dato
 DateProcess=Proces dato
 DateBuild=Rapport genereret den
 DatePayment=Dato for betaling
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-UserValidationShort=Valid. user
+DateApprove=Godkendelse af dato
+DateApprove2=Godkendelse af dato (anden godkendelse)
+RegistrationDate=Registrerings dato
+UserCreation=Oprettelsesbruger
+UserModification=Modifikation bruger
+UserValidation=Valideringsbruger
+UserCreationShort=Creat. bruger
+UserModificationShort=Modif. bruger
+UserValidationShort=Gyldig. bruger
 DurationYear=år
 DurationMonth=måned
 DurationWeek=uge
@@ -293,26 +296,26 @@ days=dage
 Hours=Timer
 Minutes=Minutter
 Seconds=Sekunder
-Weeks=Weeks
+Weeks=Uger
 Today=I dag
 Yesterday=I går
 Tomorrow=I morgen
-Morning=Morning
-Afternoon=Afternoon
+Morning=Morgen
+Afternoon=Eftermiddag
 Quadri=Quadri
 MonthOfDay=Måned fra den dato
 HourShort=H
 MinuteShort=mn
 Rate=Hyppighed
-CurrencyRate=Currency conversion rate
-UseLocalTax=Incl. afgift
+CurrencyRate=Valutaomregningskurs
+UseLocalTax=Incl. Moms
 Bytes=Bytes
 KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Bruger af oprettelsen
+UserModif=Bruger af sidste opdatering
 b=b.
 Kb=Kb
 Mb=Mb
@@ -325,27 +328,30 @@ Default=Standard
 DefaultValue=Standardværdi
 DefaultValues=Standardværdier
 Price=Pris
+PriceCurrency=Price (currency)
 UnitPrice=Enhedspris
 UnitPriceHT=Enhedspris (netto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Enhedspris
 PriceU=UP
 PriceUHT=UP (netto)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
+PriceUHTCurrency=Brutto (beløb)
+PriceUTTC=Brutto(Inkl.Moms)
 Amount=Beløb
 AmountInvoice=Fakturabeløbet
+AmountInvoiced=Amount invoiced
 AmountPayment=Indbetalingsbeløb
 AmountHTShort=Beløb (netto)
 AmountTTCShort=Beløb (inkl. moms)
 AmountHT=Beløb (ekskl. moms)
 AmountTTC=Beløb (inkl. moms)
 AmountVAT=Beløb moms
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAlreadyPaid=Allerede betalt, oprindelig valuta
+MulticurrencyRemainderToPay=Forblive at betale, original valuta
+MulticurrencyPaymentAmount=Betalingsbeløb, oprindelig valuta
+MulticurrencyAmountHT=Beløb (Ex. Moms), oprindelig valuta 
+MulticurrencyAmountTTC=Beløb (inkl. Moms), oprindelig valuta
+MulticurrencyAmountVAT=Beløb i Moms, oprindelige valuta
 AmountLT1=Beløb afgift 2
 AmountLT2=Beløb afgift 3
 AmountLT1ES=Beløb RE
@@ -353,47 +359,50 @@ AmountLT2ES=Beløb IRPF
 AmountTotal=Beløb i alt
 AmountAverage=Gennemsnitligt beløb
 PriceQtyMinHT=Pris mindsteantal (inkl. moms)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Pourcentage
 Total=I alt
 SubTotal=I alt
 TotalHTShort=I alt (netto)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=I alt (netto)
 TotalTTCShort=I alt (inkl. moms)
-TotalHT=I alt (inkl. moms)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
+TotalHT=I alt (Ex. moms)
+TotalHTforthispage=Beløb (ekskl. moms) for denne side
+Totalforthispage=I alt for denne side
 TotalTTC=I alt (inkl. moms)
 TotalTTCToYourCredit=I alt (inkl. moms) til dit kredit
 TotalVAT=Moms i alt
-TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Afgift 3 i alt
+TotalVATIN=IGST i alt
+TotalLT1=Total moms 2
+TotalLT2=Total Moms 3
 TotalLT1ES=RE i alt
 TotalLT2ES=IRPF i alt
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
+TotalLT1IN=I alt CGST
+TotalLT2IN=I alt SGST
 HT=Ekskl. moms
 TTC=Inkl. moms
-INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
+INCVATONLY=Inc. moms
+INCT=Inc. Alle skatter 
 VAT=Moms
 VATIN=IGST
-VATs=Sales taxes
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATs=Salgs Moms
+VATINs=IGST skatter
+LT1=Omsætningsafgift 2
+LT1Type=Omsætningsafgift 2 type
+LT2=Moms 3
+LT2Type=Omsætningsafgift 3 type
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Momssats
-DefaultTaxRate=Default tax rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Standardskattesats
 Average=Gennemsnit
 Sum=Sum
 Delta=Delta
-Module=Module/Application
+Module=Modul/Applikation
 Modules=Moduler/applikationer
 Option=Option
 List=Liste
@@ -415,21 +424,25 @@ ActionsToDoShort=At gøre
 ActionsDoneShort=Gjort
 ActionNotApplicable=Ikke relevant
 ActionRunningNotStarted=Ikke startet
-ActionRunningShort=In progress
+ActionRunningShort=I gang
 ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Firma/organisation
+ActionUncomplete=Uafsluttet
+LatestLinkedEvents=Seneste %s linkede begivenheder
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kontakter for denne tredjepart
 ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresse for denne tredjepart
 ActionsOnCompany=Begivenheder for denne tredjepart
 ActionsOnMember=Begivenheder for dette medlem
-ActionsOnProduct=Events about this product
+ActionsOnProduct=Begivenheder omkring dette produkt
 NActionsLate=%s sent
-RequestAlreadyDone=Request already recorded
+ToDo=Udestående
+Completed=Completed
+Running=I gang
+RequestAlreadyDone=Anmodning allerede er registreret
 Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+FilterOnInto=Søgekriterier '<strong> %s </strong>' i felter %s
 RemoveFilter=Fjern filter
 ChartGenerated=Chart genereret
 ChartNotGenerated=Chart ikke genereret
@@ -438,14 +451,14 @@ Generate=Generer
 Duration=Varighed
 TotalDuration=Varighed i alt
 Summary=Resumé
-DolibarrStateBoard=Database statistics
-DolibarrWorkBoard=Open items dashboard
-NoOpenedElementToProcess=No opened element to process
+DolibarrStateBoard=Database statistik
+DolibarrWorkBoard=Åbne poster instrumentbræt
+NoOpenedElementToProcess=Intet åbnet element til behandling
 Available=Tilgængelig
 NotYetAvailable=Endnu ikke tilgængelig
 NotAvailable=Ikke til rådighed
-Categories=Tags/categories
-Category=Tag/category
+Categories=Tags/kategorier
+Category=Tags/kategori
 By=Ved
 From=Fra
 to=til
@@ -475,10 +488,10 @@ Discount=Discount
 Unknown=Ukendt
 General=Almindelige
 Size=Størrelse
-OriginalSize=Original size
+OriginalSize=Originalstørrelse
 Received=Modtaget
 Paid=Betales
-Topic=Subject
+Topic=Emne
 ByCompanies=Tredjeparter
 ByUsers=Brugere
 Links=Links
@@ -489,19 +502,19 @@ NextStep=Næste skridt
 Datas=Oplysningerne
 None=Ingen
 NoneF=Ingen
-NoneOrSeveral=None or several
+NoneOrSeveral=Ingen eller flere
 Late=Sen
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+LateDesc=Forsinkelse om at definere, om en optegnelse er forsinket eller ikke, afhænger af dit opsætning. Bed din administrator om at ændre forsinkelsen fra menuen Hjem - Opsætning - Advarsler.
 Photo=Billede
 Photos=Billeder
 AddPhoto=Tilføj billede
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
+DeletePicture=Billede slette
+ConfirmDeletePicture=Bekræft billed sletning?
 Login=Login
 LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginOrEmail=Login eller Email
 CurrentLogin=Nuværende login
-EnterLoginDetail=Enter login details
+EnterLoginDetail=Indtast loginoplysninger
 January=Januar
 February=Februar
 March=Marts
@@ -553,17 +566,17 @@ MonthShort12=dec
 MonthVeryShort01=J
 MonthVeryShort02=F
 MonthVeryShort03=M
-MonthVeryShort04=A
+MonthVeryShort04=EN
 MonthVeryShort05=M
 MonthVeryShort06=J
 MonthVeryShort07=J
-MonthVeryShort08=A
+MonthVeryShort08=EN
 MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Vedhæftede filer og dokumenter
-JoinMainDoc=Join main document
+JoinMainDoc=Tilmeld dig hoveddokumentet
 DateFormatYYYYMM=ÅÅÅÅ-MM
 DateFormatYYYYMMDD=ÅÅÅÅ-MM-DD
 DateFormatYYYYMMDDHHMM=ÅÅÅÅ-MM-DD HH: SS
@@ -571,8 +584,8 @@ ReportName=Rapportnavn
 ReportPeriod=Beretningsperioden
 ReportDescription=Beskrivelse
 Report=Rapport
-Keyword=Keyword
-Origin=Origin
+Keyword=Nøgleord
+Origin=Oprindelse
 Legend=Legend
 Fill=Udfyld
 Reset=Nulstil
@@ -588,14 +601,14 @@ FindBug=Fejlmeld
 NbOfThirdParties=Antal tredjeparter
 NbOfLines=Antal linjer
 NbOfObjects=Antallet af objekter
-NbOfObjectReferers=Number of related items
-Referers=Related items
+NbOfObjectReferers=Antal relaterede poster
+Referers=Relaterede emner
 TotalQuantity=Antal i alt
 DateFromTo=Fra %s til %s
 DateFrom=Fra %s
 DateUntil=Indtil %s
 Check=Kontrollere
-Uncheck=Uncheck
+Uncheck=Fravælg
 Internal=Intern
 External=Eksterne
 Internals=Intern
@@ -616,7 +629,7 @@ Undo=Fortryd
 Redo=Redo
 ExpandAll=Udvid alle
 UndoExpandAll=Fortryd udvide
-SeeAll=See all
+SeeAll=Se alt
 Reason=Årsag
 FeatureNotYetSupported=Feature endnu ikke understøttet
 CloseWindow=Luk vindue
@@ -625,12 +638,12 @@ Priority=Prioritet
 SendByMail=Send via e-mail
 MailSentBy=E-mail sendt fra
 TextUsedInTheMessageBody=Email organ
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=Send bekræftelses e-mail
 SendMail=Send email
 EMail=E-mail
 NoEMail=Ingen e-mail
 Email=EMail
-NoMobilePhone=No mobile phone
+NoMobilePhone=Ingen mobil telefon
 Owner=Ejer
 FollowingConstantsWillBeSubstituted=Efter konstanterne skal erstatte med tilsvarende værdi.
 Refresh=Opdatér
@@ -639,29 +652,29 @@ GoBack=Gå tilbage
 CanBeModifiedIfOk=Kan ændres, hvis det er gyldigt
 CanBeModifiedIfKo=Kan ændres, hvis ikke gyldigt
 ValueIsValid=Værdi er gyldigt
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
+ValueIsNotValid=Værdien er ikke gyldig
+RecordCreatedSuccessfully=Optag oprettet med succes
 RecordModifiedSuccessfully=Optag modificerede held
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
+RecordsModified=%s  optag ændret
+RecordsDeleted=%s post slettet
 AutomaticCode=Automatisk kode
 FeatureDisabled=Feature handicappede
-MoveBox=Move widget
+MoveBox=Flyt box
 Offered=Fri
 NotEnoughPermissions=Du har ikke tilladelse til denne handling
 SessionName=Session navn
 Method=Metode
 Receive=Modtag
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
+CompleteOrNoMoreReceptionExpected=Komplet eller intet mere forventet
+ExpectedValue=Forventet værdi
 CurrentValue=Nuværende værdi
 PartialWoman=Delvis
 TotalWoman=I alt
 NeverReceived=Aldrig modtaget
 Canceled=Annulleret
 YouCanChangeValuesForThisListFromDictionarySetup=Du kan ændre værdier for denne liste fra menuen Opsætning - Ordbøger
-YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanChangeValuesForThisListFrom=Du kan ændre værdierne for denne liste fra menuen %s
+YouCanSetDefaultValueInModuleSetup=Du kan indstille standard værdi, der bruges, når du opretter en ny post i modul opsætning
 Color=Color
 Documents=Linkede filer
 Documents2=Dokumenter
@@ -678,12 +691,12 @@ CurrentTheme=Nuværende tema
 CurrentMenuManager=Aktuel menuhåndtering
 Browser=Browser
 Layout=Layout
-Screen=Screen
+Screen=skærm
 DisabledModules=Handikappede moduler
 For=For
 ForCustomer=For kunder
 Signature=Underskrift
-DateOfSignature=Date of signature
+DateOfSignature=Dato for underskrift
 HidePassword=Vis kommandoen med adgangskode skjulte
 UnHidePassword=Vis reelle kommandoen med klare adgangskode
 Root=Rot
@@ -692,18 +705,20 @@ Page=Page
 Notes=Noter
 AddNewLine=Tilføj ny linje
 AddFile=Tilføj fil
-FreeZone=Not a predefined product/service
-FreeLineOfType=Not a predefined entry of type
+FreeZone=Ingen registrerede varer/ydelser
+FreeLineOfType=Ikke en foruddefineret indlæg af type
 CloneMainAttributes=Klon formål med sine vigtigste attributter
 PDFMerge=PDF Sammenflet
 Merge=Merge
-DocumentModelStandardPDF=Standard PDF template
+DocumentModelStandardPDF=Standard PDF-skabelon
 PrintContentArea=Vis side for at udskrive hovedindhold område
 MenuManager=Menuhåndtering
 WarningYouAreInMaintenanceMode=Advarsel, du er i en vedligeholdelses mode, så kun login <b>%s</b> er tilladt at bruge ansøgningen på i øjeblikket.
 CoreErrorTitle=Systemfejl
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CoreErrorMessage=Beklager, der opstod en fejl. Kontakt systemadministratoren for at kontrollere logfilerne eller deaktivere $dolibarr_main_prod=1 for at få flere oplysninger.
 CreditCard=Kreditkort
+ValidatePayment=Godkend betaling
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Felter med <b>%s</b> er obligatoriske
 FieldsWithIsForPublic=Felter med <b>%s</b> er vist på offentlig liste over medlemmer. Hvis du ikke ønsker dette, se "offentlige" boks.
 AccordingToGeoIPDatabase=(Ifølge GeoIP konvertering)
@@ -728,21 +743,21 @@ NewAttribute=Ny attribut
 AttributeCode=Attribut koden
 URLPhoto=Url af foto / logo
 SetLinkToAnotherThirdParty=Link til en anden tredjepart
-LinkTo=Link to
-LinkToProposal=Link to proposal
+LinkTo=Link til
+LinkToProposal=Link til forslag
 LinkToOrder=Link til ordre
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
+LinkToInvoice=Link til faktura
+LinkToSupplierOrder=Link til leverandørordre
+LinkToSupplierProposal=Link til leverandørforslag
+LinkToSupplierInvoice=Link til leverandørfaktura
+LinkToContract=Link til kontrakt
+LinkToIntervention=Link til intervention
 CreateDraft=Opret udkast
-SetToDraft=Back to draft
+SetToDraft=Tilbage til udkast
 ClickToEdit=Klik for at redigere
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
+EditWithEditor=Rediger med CKEditor
+EditWithTextEditor=Rediger med tekst editor
+EditHTMLSource=Rediger HTML-kilde
 ObjectDeleted=Objekt %s slettet
 ByCountry=Land
 ByTown=By
@@ -760,97 +775,99 @@ ModulesSystemTools=Modul værktøjer
 Test=Test
 Element=Element
 NoPhotoYet=Inge billeder til rådighed
-Dashboard=Dashboard
+Dashboard=Instrumentbræt
 MyDashboard=Mit kontrolpanel
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-SelectTargetUser=Select target user/employee
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+Deductible=Fradragsberettigede
+from=fra
+toward=mod
+Access=Adgang
+SelectAction=Vælg handling
+SelectTargetUser=Vælg målbruger / medarbejder
+HelpCopyToClipboard=Brug Ctrl+C for at kopiere til udklipsholderen
 SaveUploadedFileWithMask=Gem filen på serveren med navnet "<strong>%s</strong>" (ellers "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-ShowMoreLines=Show more/less lines
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClick=Select an element and click %s
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
+OriginFileName=Orginal filnavn
+SetDemandReason=Sæt kilden
+SetBankAccount=Definér bankkonto
+AccountCurrency=Konto møntsort
+ViewPrivateNote=Vis noter
+XMoreLines=%s linje(r) skjult
+ShowMoreLines=Vis flere / færre linjer
+PublicUrl=Offentlige URL
+AddBox=Tilføj box
+SelectElementAndClick=Vælg et element og klik på %s
+PrintFile=Print fil %s
+ShowTransaction=Vis indlæg på bankkonto
 ShowIntervention=Vis indgreb
 ShowContract=Vis kontrakt
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
+GoIntoSetupToChangeLogo=Gå ind i Home - Setup - Firma for at skifte logo eller gå ind i Home - Setup - Display for at skjule.
+Deny=Nægte
 Denied=Denied
-ListOf=List of %s
+ListOf=Liste over %s
 ListOfTemplates=Liste over skabeloner
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Gender=Køn
+Genderman=Mand
+Genderwoman=Kvinde
 ViewList=Vis liste
-Mandatory=Mandatory
-Hello=Hello
-GoodBye=GoodBye
-Sincerely=Sincerely
+Mandatory=Obligatorisk
+Hello=Hallo
+GoodBye=Farvel
+Sincerely=Med venlig hilsen
 DeleteLine=Slet linie
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-ConfirmMassDeletion=Bulk delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
-RelatedObjects=Related Objects
+ConfirmDeleteLine=Er du sikker på, at du vil slette denne linje?
+NoPDFAvailableForDocGenAmongChecked=Der var ikke nogen PDF til dokumentgenerering blandt kontrollerede poster
+TooManyRecordForMassAction=For mange poster valgt til massehandling. Handlingen er begrænset til en liste over %s rekord.
+NoRecordSelected=Ingen rekord valgt
+MassFilesArea=Område for filer opbygget af massehandlinger
+ShowTempMassFilesArea=Vis område af filer bygget af massehandlinger
+ConfirmMassDeletion=Bulk slet bekræftelse
+ConfirmMassDeletionQuestion=Er du sikker på, at du vil slette den %s valgte post?
+RelatedObjects=Relaterede objekter
 ClassifyBilled=Klassificere faktureret
+ClassifyUnbilled=Classify unbilled
 Progress=Fremskridt
-ClickHere=Klik her
-FrontOffice=Front office
+FrontOffice=Forreste kontor
 BackOffice=Back office
-View=View
+View=Udsigt
 Export=Export
 Exports=Eksporter
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=Eksporter filtreret liste
+ExportList=Eksportliste
 ExportOptions=Eksportindstillinger
 Miscellaneous=Diverse
 Calendar=Kalender
 GroupBy=Gruppér efter
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
-Download=Download
-DownloadDocument=Download document
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
-SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
-ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
+ViewFlatList=Se flad liste
+RemoveString=Fjern streng '%s'
+SomeTranslationAreUncomplete=Nogle sprog kan oversættes delvis eller kan indeholde fejl. Hvis du registrerer noget, kan du rette sprogfiler, der registrerer dig til <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/ Dolibarr / </a>.
+DirectDownloadLink=Direkte download link (offentlig / ekstern)
+DirectDownloadInternalLink=Direkte download link (skal logges og har brug for tilladelser)
+Download=Hent
+DownloadDocument=Hent dokument
+ActualizeCurrency=Opdater valutakurs
+Fiscalyear=Regnskabsår
+ModuleBuilder=Modulbygger
+SetMultiCurrencyCode=Indstil valuta
+BulkActions=Bulk handlinger
+ClickToShowHelp=Klik for at vise værktøjstiphjælp
+WebSite=Internet side
+WebSites=Websteder
+WebSiteAccounts=Webstedkonti
+ExpenseReport=Udgiftsrapport
+ExpenseReports=Udgiftsrapporter
 HR=HR
-HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatically calculated
-TitleSetToDraft=Go back to draft
-ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
+HRAndBank=HR og Bank
+AutomaticallyCalculated=Automatisk beregnet
+TitleSetToDraft=Gå tilbage til udkast
+ConfirmSetToDraft=Er du sikker på, at du vil gå tilbage til Udkast status?
 ImportId=Import id
 Events=Begivenheder
 EMailTemplates=E-mail skabeloner
-FileNotShared=File not shared to exernal public
+FileNotShared=Filen er ikke delt til ekstern offentlighed
 Project=Projekt
 Projects=Projekter
 Rights=Tilladelser
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -880,39 +897,47 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
-SelectMailModel=Select an email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Tredjeparter
+SelectMailModel=Vælg en e-mail-skabelon
+SetRef=Sæt ref
+Select2ResultFoundUseArrows=Nogle resultater fundet. Brug pilene til at vælge.
+Select2NotFound=Intet resultat fundet
+Select2Enter=Gå ind
+Select2MoreCharacter=eller mere karakter
+Select2MoreCharacters=eller flere tegn
+Select2MoreCharactersMore=<strong> Søg syntaks: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> ELLER </kbd> (a | b) <br> <kbd> <strong> </strong> </kbd> <kbd> Et hvilket som helst tegn </kbd> (a * b) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> Start med </kbd> (^ ab) <br> <kbd> <strong> $ </strong> </kbd> <kbd> Slut med </kbd> (ab $) <br>
+Select2LoadingMoreResults=Indlæser flere resultater ...
+Select2SearchInProgress=Søg i gang ...
+SearchIntoThirdparties=Tredjepart
 SearchIntoContacts=Kontakter
 SearchIntoMembers=Medlemmer
 SearchIntoUsers=Brugere
-SearchIntoProductsOrServices=Products or services
+SearchIntoProductsOrServices=Produkter eller tjenester
 SearchIntoProjects=Projekter
 SearchIntoTasks=Opgaver
 SearchIntoCustomerInvoices=Kundefakturaer
 SearchIntoSupplierInvoices=Leverandørfakturaer
 SearchIntoCustomerOrders=Kundeordrer
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierOrders=Leverandør ordrer
+SearchIntoCustomerProposals=Kundeforslag
+SearchIntoSupplierProposals=Leverandørforslag
 SearchIntoInterventions=Interventioner
 SearchIntoContracts=Kontrakter
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
+SearchIntoCustomerShipments=Kundeforsendelser
+SearchIntoExpenseReports=Udgiftsrapporter
 SearchIntoLeaves=Leaves
 CommentLink=Kommentarer
-NbComments=Number of comments
-CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
+NbComments=Antal kommentarer
+CommentPage=Kommentarer plads
+CommentAdded=Kommentar tilføjet
+CommentDeleted=Kommentar slettet
 Everybody=Fælles projekt
-PayedBy=Payed by
-PayedTo=Payed to
+PayedBy=Betalt af
+PayedTo=Betalt til
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Tildelt til
diff --git a/htdocs/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang
index 8779da4eabb..b35189a865c 100644
--- a/htdocs/langs/da_DK/margins.lang
+++ b/htdocs/langs/da_DK/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 60ca95da27e..10b29d9b263 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -6,15 +6,13 @@ Member=Medlem
 Members=Medlemmer
 ShowMember=Vis medlem kortet
 UserNotLinkedToMember=Brugeren ikke er knyttet til et medlem
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Tredjepart, der ikke er knyttet til et medlem
 MembersTickets=Medlemmer Billetter
 FundationMembers=Instituttets medlemmer
 ListOfValidatedPublicMembers=Liste over validerede offentlige medlemmer
 ErrorThisMemberIsNotPublic=Dette medlem er ikke offentlige
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Et andet medlem <b>(navn: %s, login: %s)</b> er allerede knyttet til en <b>tredjepart %s.</b> Fjern dette link første fordi en tredjepart ikke kan forbindes med kun et medlem (og omvendt).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Af sikkerhedsmæssige grunde skal du være tildelt tilladelser til at redigere alle brugere til at kunne knytte et medlem til en bruger, der ikke er dit.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Indholdet af din medlem kortet
 SetLinkToUser=Link til en Dolibarr bruger
 SetLinkToThirdParty=Link til en Dolibarr tredjepart
 MembersCards=Medlemmer udskrive kort
@@ -23,13 +21,13 @@ MembersListToValid=Liste over udkast til medlemmer (der skal bekræftes)
 MembersListValid=Liste over gyldige medlemmer
 MembersListUpToDate=Liste over gyldige medlemmer ajour abonnement
 MembersListNotUpToDate=Liste over gyldige medlemmer med abonnement uaktuel
-MembersListResiliated=List of terminated members
+MembersListResiliated=Liste over opsatte medlemmer
 MembersListQualified=Liste over kvalificerede medlemmer
 MenuMembersToValidate=Udkast til medlemmer
 MenuMembersValidated=Valideret medlemmer
 MenuMembersUpToDate=Ajour medlemmer
 MenuMembersNotUpToDate=Uaktuel medlemmer
-MenuMembersResiliated=Terminated members
+MenuMembersResiliated=Afsluttede medlemmer
 MembersWithSubscriptionToReceive=Medlemmer med abonnement for at modtage
 DateSubscription=Subscription dato
 DateEndSubscription=Subscription slutdato
@@ -45,23 +43,23 @@ MemberStatusDraft=Udkast (skal valideres)
 MemberStatusDraftShort=Udkast til
 MemberStatusActive=Valideret (venter abonnement)
 MemberStatusActiveShort=Valideret
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=Abonnement udløbet
 MemberStatusActiveLateShort=Udløbet
 MemberStatusPaid=Subscription ajour
 MemberStatusPaidShort=Ajour
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusResiliated=Afsluttet medlem
+MemberStatusResiliatedShort=opsagte
 MembersStatusToValid=Udkast til medlemmer
-MembersStatusResiliated=Terminated members
+MembersStatusResiliated=Afsluttede medlemmer
 NewCotisation=Nye bidrag
 PaymentSubscription=Nye bidrag betaling
 SubscriptionEndDate=Subscription slutdato
 MembersTypeSetup=Medlemmer type setup
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
+MemberTypeModified=Medlemstype ændret
+DeleteAMemberType=Slet en medlemstype
+ConfirmDeleteMemberType=Er du sikker på, at du vil slette denne medlemstype?
+MemberTypeDeleted=Medlemstype slettet
+MemberTypeCanNotBeDeleted=Medlemstype kan ikke slettes
 NewSubscription=Nyt abonnement
 NewSubscriptionDesc=Denne form giver dig mulighed for at registrere dit abonnement som nyt medlem af fundamentet. Hvis du ønsker at forny dit abonnement (hvis der allerede er medlem), bedes du kontakte fundament bord i stedet via e-mail %s.
 Subscription=Subscription
@@ -70,7 +68,7 @@ SubscriptionLate=Sen
 SubscriptionNotReceived=Subscription aldrig modtaget
 ListOfSubscriptions=Liste over abonnementer
 SendCardByMail=Send kort
-AddMember=Create member
+AddMember=Opret medlem
 NoTypeDefinedGoToSetup=Intet medlem definerede typer. Gå til opsætning - Medlemmer typer
 NewMemberType=Nyt medlem type
 WelcomeEMail=Velkommen e-mail
@@ -81,47 +79,63 @@ Physical=Fysisk
 Moral=Moral
 MorPhy=Moralske / Fysisk
 Reenable=Genaktivere
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
+ResiliateMember=Afslut et medlem
+ConfirmResiliateMember=Er du sikker på at du vil opsige dette medlem?
 DeleteMember=Slet medlem
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+ConfirmDeleteMember=Er du sikker på, at du vil slette dette medlem (Sletter et medlem vil slette alle hans abonnementer)?
 DeleteSubscription=Slet abonnement
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+ConfirmDeleteSubscription=Er du sikker på, at du vil slette dette abonnement?
 Filehtpasswd=htpasswd fil
 ValidateMember=Validere et medlem
-ConfirmValidateMember=Are you sure you want to validate this member?
+ConfirmValidateMember=Er du sikker på, at du vil validere dette medlem?
 FollowingLinksArePublic=De følgende links er åbne sider ikke er beskyttet af nogen Dolibarr tilladelse. De er ikke formated sider, gives som eksempel for at vise, hvordan man listen medlemmer database.
 PublicMemberList=Offentlige medlem liste
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
+BlankSubscriptionForm=Offentlig selvtilmeldingsblanket
+BlankSubscriptionFormDesc=Dolibarr kan give dig en offentlig webadresse / hjemmeside for at give eksterne besøgende mulighed for at anmode om at abonnere på fundamentet. Hvis et online betalingsmodul er aktiveret, kan et betalingsformular også automatisk leveres.
+EnablePublicSubscriptionForm=Aktivér det offentlige websted med selv abonnementsformular
+ForceMemberType=Force medlemstypen
 ExportDataset_member_1=Medlemmer og abonnementer
 ImportDataset_member_1=Medlemmer
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastMembersModified=Seneste %s ændrede medlemmer
+LastSubscriptionsModified=Seneste %s ændrede abonnementer
 String=String
 Text=Tekst
 Int=Int
 DateAndTime=Dato og tid
 PublicMemberCard=Medlem offentlige kortet
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
+SubscriptionNotRecorded=Abonnement ikke registreret
+AddSubscription=Opret abonnement
 ShowSubscription=Vis tegning
-SendAnEMailToMember=Send information email til medlem
-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_MAIL_SUBJECT=E-mail emne til medlem autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for medlem autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=E-mail emne til medlem validering
-DescADHERENT_MAIL_VALID=E-mail for medlem validering
-DescADHERENT_MAIL_COTIS_SUBJECT=E-mail emne for tegning
-DescADHERENT_MAIL_COTIS=E-mail for abonnement
-DescADHERENT_MAIL_RESIL_SUBJECT=E-mail emne til medlem resiliation
-DescADHERENT_MAIL_RESIL=E-mail for medlem resiliation
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Indholdet af din medlem kortet
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Emne af den e-mail, der modtages i tilfælde af automatisk indtastning af en gæst
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail modtaget i tilfælde af automatisk indtastning af en gæst
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender e-mail for automatiske e-mails
 DescADHERENT_ETIQUETTE_TYPE=Etiketter format
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Tekst udskrives på medlems adresseblade
 DescADHERENT_CARD_TYPE=Format af kort side
 DescADHERENT_CARD_HEADER_TEXT=Tekst trykt på toppen af medlem-kort
 DescADHERENT_CARD_TEXT=Tekst påtrykt medlem kort
@@ -132,9 +146,9 @@ HTPasswordExport=htpassword fil generation
 NoThirdPartyAssociatedToMember=Ingen tredjepart forbundet til dette medlem
 MembersAndSubscriptions= Medlemmer og Subscriptions
 MoreActions=Supplerende aktion om kontrolapparatet
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionsOnSubscription=Supplerende handling, som standard foreslået, når du optager et abonnement
+MoreActionBankDirect=Opret en direkte indtastning på bankkonto
+MoreActionBankViaInvoice=Opret en faktura og en betaling på bankkonto
 MoreActionInvoiceOnly=Opret en faktura uden betaling
 LinkToGeneratedPages=Generer besøg kort
 LinkToGeneratedPagesDesc=Denne skærm giver dig mulighed for at generere PDF-filer med visitkort til alle dine medlemmer eller et bestemt medlem.
@@ -147,7 +161,7 @@ LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
-MembersStatisticsByRegion=Members statistics by region
+MembersStatisticsByRegion=Medlemsstatistik efter region
 NbOfMembers=Antal medlemmer
 NoValidatedMemberYet=Ingen validerede medlemmer fundet
 MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.
@@ -155,7 +169,7 @@ MembersByStateDesc=Denne skærm viser dig statistikker om medlemmer fra staten /
 MembersByTownDesc=Denne skærm viser dig statistikker over medlemmer af byen.
 MembersStatisticsDesc=Vælg statistikker, du ønsker at læse ...
 MenuMembersStats=Statistik
-LastMemberDate=Latest member date
+LastMemberDate=Seneste medlem dato
 LatestSubscriptionDate=Latest subscription date
 Nature=Natur
 Public=Information er offentlige
@@ -168,12 +182,17 @@ TurnoverOrBudget=Omsætning (for et selskab) eller Budget (en fond)
 DefaultAmount=Standard mængden af ​​abonnement
 CanEditAmount=Besøgende kan vælge / redigere størrelsen af ​​sit indskud
 MEMBER_NEWFORM_PAYONLINE=Hop på integreret online betaling side
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
-NameOrCompany=Name or company
+ByProperties=Af natur
+MembersStatisticsByProperties=Medlemsstatistik af natur
+MembersByNature=Denne skærm viser dig statistik over medlemmer af natur.
+MembersByRegion=Denne skærm viser statistik over medlemmer efter region.
+VATToUseForSubscriptions=Moms sats at bruge til abonnementer
+NoVatOnSubscription=Ingen TVA til abonnementer
+MEMBER_PAYONLINE_SENDEMAIL=Email til brug for e-mail advarsel, når Dolibarr modtager en bekræftelse af en valideret betaling for et abonnement (Eksempel: paymentdone@example.com)
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt anvendt til abonnementslinje i faktura: %s
+NameOrCompany=Navn eller firma
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 8104651bd02..db4ecd95d2f 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -1,94 +1,97 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tools must be used by experienced users or developers. It gives you utilities to build or edit your own module (Documentation for alternative <a href="%s" target="_blank">manual development is here</a>).
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
-NewObject=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a long text to describe the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All files of module but also structured data and documentation will be definitly lost !
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be definitly lost !
-DangerZone=Danger zone
-BuildPackage=Build package/documentation
-BuildDocumentation=Build documentation
-ModuleIsNotActive=This module was not activated yet. Go into %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-SpecificationFile=File with business rules
-LanguageFile=File for language
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
+ModuleBuilderDesc=Disse værktøjer skal bruges af erfarne brugere eller udviklere. Det giver dig hjælpeprogrammer til at opbygge eller redigere dit eget modul (Dokumentation for alternativ <a href="%s" target="_blank"> manuel udvikling er her </a>).
+EnterNameOfModuleDesc=Indtast navnet på modulet / programmet for at oprette uden mellemrum. Brug store bogstaver til at adskille ord (For eksempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
+EnterNameOfObjectDesc=Indtast navnet på objektet, der skal oprettes uden mellemrum. Brug store bogstaver til at adskille ord (For eksempel: MyObject, Student, Lærer ...). CRUD-klassefilen, men også API-filen, vil der blive genereret sider til liste / tilføj / rediger / slet objekt og SQL-filer.
+ModuleBuilderDesc2=Sti, hvor moduler genereres / redigeres (første alternative mappe defineret i %s): <strong> %s </strong>
+ModuleBuilderDesc3=Genererede / redigerbare moduler fundet: <strong> %s </strong>
+ModuleBuilderDesc4=Et modul registreres som 'redigerbart', når filen <strong> %s </strong> findes i root af modulmappen
+NewModule=Nyt modul
+NewObject=Nyt objekt
+ModuleKey=Modul nøgle
+ObjectKey=Objektnøgle
+ModuleInitialized=Modul initialiseret
+FilesForObjectInitialized=Filer til nyt objekt '%s' initialiseret
+FilesForObjectUpdated=Filer til objekt '%s' opdateret (.sql-filer og .class.php-fil)
+ModuleBuilderDescdescription=Indtast her alle generelle oplysninger, der beskriver dit modul.
+ModuleBuilderDescspecifications=Du kan indtaste en lang tekst her for at beskrive specifikationerne for dit modul, der ikke allerede er struktureret i andre faner. Så du har inden for rækkevidde alle de regler, der skal udvikles. Også dette tekstindhold vil blive inkluderet i den genererede dokumentation (se sidste faneblad). Du kan bruge Markdown-format, men det anbefales at bruge Asciidoc-format (Sammenligning mellem .md og .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+ModuleBuilderDescobjects=Definer her de objekter, du vil styre med dit modul. En CRUD DAO klasse, SQL-filer, side til liste over objekter, for at oprette / redigere / se en post og en API vil blive genereret.
+ModuleBuilderDescmenus=Denne fane er dedikeret til at definere menupunkter, der leveres af dit modul.
+ModuleBuilderDescpermissions=Denne fane er dedikeret til at definere de nye tilladelser, du vil levere med dit modul.
+ModuleBuilderDesctriggers=Dette er udsigten til udløsere, der leveres af dit modul. Hvis du vil inkludere kode, der udføres, når en udløst forretningshændelse er lanceret, skal du blot redigere denne fil.
+ModuleBuilderDeschooks=Denne fane er dedikeret til kroge.
+ModuleBuilderDescwidgets=Denne fane er dedikeret til at administrere / opbygge widgets.
+ModuleBuilderDescbuildpackage=Du kan generere her en "klar til at distribuere" pakkefil (en normaliseret .zip-fil) af dit modul og en "klar til at distribuere" dokumentationsfil. Bare klik på knappen for at opbygge pakken eller dokumentationsfilen.
+EnterNameOfModuleToDeleteDesc=Du kan slette dit modul. ADVARSEL: Alle filer i modulet, men også strukturerede data og dokumentation vil blive helt tabt!
+EnterNameOfObjectToDeleteDesc=Du kan slette et objekt. ADVARSEL: Alle filer relateret til objekt vil blive helt tabt!
+DangerZone=Farezone
+BuildPackage=Byg pakke / dokumentation
+BuildDocumentation=Byg dokumentation
+ModuleIsNotActive=Dette modul blev ikke aktiveret endnu. Gå ind på %s for at få det til live eller klik her:
+ModuleIsLive=Dette modul er blevet aktiveret. Enhver ændring på den kan ødelægge en aktuel aktiv funktion.
+DescriptionLong=Lang beskrivelse
+EditorName=Redaktørens navn
+EditorUrl=URL til redaktør
+DescriptorFile=Beskrivelsesfil af modul
+ClassFile=Fil til PHP DAO CRUD klasse
+ApiClassFile=Fil til PHP API klasse
+PageForList=PHP side for liste over rekord
+PageForCreateEditView=PHP side til at oprette / redigere / se en post
+PageForAgendaTab=PHP side for fanen begivenhed
+PageForDocumentTab=PHP-side for dokumentfanen
+PageForNoteTab=PHP side til notatfane
+PathToModulePackage=Sti til zip af modul / applikationspakke
+PathToModuleDocumentation=Sti til fil af modul / ansøgningsdokumentation
+SpaceOrSpecialCharAreNotAllowed=Mellemrum eller specialtegn er ikke tilladt.
+FileNotYetGenerated=Filen er endnu ikke genereret
+RegenerateClassAndSql=Slet og regenerere klasse- og sql-filer
+RegenerateMissingFiles=Generer manglende filer
+SpecificationFile=Fil med forretningsregler
+LanguageFile=Fil til sprog
+ConfirmDeleteProperty=Er du sikker på, at du vil slette ejendommen <strong> %s </strong>? Dette vil ændre kode i PHP klasse, men også fjerne kolonne fra tabeldefinition af objekt.
+NotNull=Ikke NULL
+NotNullDesc=1 = Indstil database til IKKE NULL. -1 = Tillad null værdier og tving værdien til NULL, hvis tom ('' eller 0).
+SearchAll=Brugt til 'Søg alle'
+DatabaseIndex=Database indeks
+FileAlreadyExists=Fil %s eksisterer allerede
+TriggersFile=Fil til udløserkode
+HooksFile=Fil til kroge kode
 ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for PHP libraries
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=Go to API explorer
-ListOfMenusEntries=List of menu entries
-ListOfPermissionsDefined=List of defined permissions
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only. Using a negative value means field is not shown by default on list but can be selected for viewing)
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list ? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool ? (Examples: 1 or 0)
-SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
-LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
-HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to use the native module builder wizard. Just enable the module and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu. Warning: This is a developer feature, bad use may breaks your application.
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
+ArrayOfKeyValuesDesc=Array af nøgler og værdier, hvis feltet er en kombinationsliste med faste værdier
+WidgetFile=Widget-fil
+ReadmeFile=Readme-fil
+ChangeLog=ChangeLog-fil
+TestClassFile=Fil til PHP Unit Test klasse
+SqlFile=SQL-fil
+PageForLib=Fil til PHP biblioteker
+SqlFileExtraFields=SQL-fil for komplementære attributter
+SqlFileKey=Sql-fil for nøgler
+AnObjectAlreadyExistWithThisNameAndDiffCase=Der findes allerede et objekt med dette navn og en anden sag
+UseAsciiDocFormat=Du kan bruge Markdown-format, men det anbefales at bruge Asciidoc-format (Sammenligning mellem .md og .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Er en foranstaltning
+DirScanned=Directory scannet
+NoTrigger=Ingen udløser
+NoWidget=Ingen widget
+GoToApiExplorer=Gå til API Explorer
+ListOfMenusEntries=Liste over menupunkter
+ListOfPermissionsDefined=Liste over definerede tilladelser
+EnabledDesc=Tilstand at have dette felt aktivt (Eksempler: 1 eller $ conf-> global-> MYMODULE_MYOPTION)
+VisibleDesc=Er feltet synligt? (Eksempler: 0 = Aldrig synlig, 1 = Synlig på liste og oprette / opdatere / se formularer, 2 = Kun synlig på listen, 3 = Synlig på oprette / opdatere / kun se formular. Ved hjælp af en negativ værdi betyder feltet ikke vist ved standard på listen men kan vælges til visning)
+IsAMeasureDesc=Kan værdien af ​​feltet akkumuleres for at få en samlet liste? (Eksempler: 1 eller 0)
+SearchAllDesc=Er feltet brugt til at foretage en søgning fra hurtigsøgningsværktøjet? (Eksempler: 1 eller 0)
+SpecDefDesc=Indtast her alt dokumentation, du vil levere med dit modul, som ikke allerede er defineret af andre faner. Du kan bruge .md eller bedre den rige .asciidoc-syntaks.
+LanguageDefDesc=Indtast i denne fil, alle nøgler og oversættelsen for hver sprogfil.
+MenusDefDesc=Definer her menuerne fra dit modul (når de er defineret, er de synlige i menufunktionen %s)
+PermissionsDefDesc=Definer her de nye tilladelser fra dit modul (når de er defineret, er de synlige i standard tilladelsesopsætningen %s)
+HooksDefDesc=Definer i egenskaben <b> module_parts ['hooks'] </b> i modulbeskrivelsen den kontekst af kroge, du vil administrere (liste over sammenhænge kan findes ved en søgning på '<b> initHooks (</b> 'i kernekode). <br> Rediger krogfilen for at tilføje kode for dine hooked funktioner (hookable funktioner kan findes ved en søgning på' <b> executeHooks </b> 'i kernekode).
+TriggerDefDesc=Definer i udløseren filen den kode, du vil udføre for hver forretningsbegivenhed, der udføres.
+SeeIDsInUse=Se ID'er i brug i din installation
+SeeReservedIDsRangeHere=Se række af reserverede id'er
+ToolkitForDevelopers=Værktøjskasse til Dolibarr-udviklere
+TryToUseTheModuleBuilder=Hvis du har viden i SQL og PHP, kan du prøve at bruge guiden til native modulbygger. Bare aktiver modulet og brug guiden ved at klikke på <span class = "fa fa-bug"> </span> i øverste højre menu. Advarsel: Dette er en udvikler funktion, dårlig brug kan ødelægge din ansøgning.
+SeeTopRightMenu=Se <span class = "fa fa-bug"> </span> i øverste højre menu
+AddLanguageFile=Tilføj sprogfil
+YouCanUseTranslationKey=Du kan her bruge en nøgle, der er oversættelsessnøglen fundet i sprogfilen (se fanen "Sprog").
+DropTableIfEmpty=(Slet tabel hvis tom)
+TableDoesNotExists=Tabellen %s findes ikke
+TableDropped=Tabel %s slettet
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 1fb92198c9b..9827de23cdb 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -1,121 +1,123 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Sikkerhedskode
-NumberingShort=N°
+NumberingShort=N °
 Tools=Værktøj
 TMenuTools=Værktøjer
-ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br><br>All the tools can be reached in the left menu.
+ToolsDesc=Alle diverse værktøjer, der ikke er medtaget i andre menuposter, er samlet her. <br> <br> Alle værktøjerne kan nås i menuen til venstre.
 Birthday=Fødselsdag
-BirthdayDate=Birthday date
+BirthdayDate=Fødselsdato
 DateToBirth=Dato for fødsel
 BirthdayAlertOn=fødselsdag alarm aktive
 BirthdayAlertOff=fødselsdag alarm inaktive
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
+TransKey=Oversættelse af nøgle TransKey
+MonthOfInvoice=Måned (nummer 1-12) på fakturadato
+TextMonthOfInvoice=Måned (tekst) af faktura dato
+PreviousMonthOfInvoice=Forrige måned (nummer 1-12) på faktura dato
+TextPreviousMonthOfInvoice=Forrige måned (tekst) af faktura dato
+NextMonthOfInvoice=Følgende måned (nummer 1-12) på faktura dato
+TextNextMonthOfInvoice=Følgende måned (tekst) af faktura dato
+ZipFileGeneratedInto=Zip-fil genereret til <b> %s </ b>.
+DocFileGeneratedInto=Doc-fil genereret til <b> %s </ b>.
+JumpToLogin=Afbrudt. Gå til login side ...
+MessageForm=Besked på online betalingsformular
 MessageOK=Besked på validerede betaling tilbage side
 MessageKO=Besked om annulleret betaling tilbage side
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
+YearOfInvoice=År for faktura dato
+PreviousYearOfInvoice=Tidligere års faktura dato
+NextYearOfInvoice=Følgende års faktura dato
+DateNextInvoiceBeforeGen=Dato for næste faktura (før generation)
+DateNextInvoiceAfterGen=Dato for næste faktura (efter generation)
 
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_ADD_CONTACT=Tilføjet kontakt til intervention
 Notify_FICHINTER_VALIDATE=Valider intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_SENTBYMAIL=Intervention sendt via post
 Notify_ORDER_VALIDATE=Kundeordre valideret
 Notify_ORDER_SENTBYMAIL=Kundens ordre sendes med posten
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverandør orden sendt med posten
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
+Notify_ORDER_SUPPLIER_VALIDATE=Leverandør ordre registreret
 Notify_ORDER_SUPPLIER_APPROVE=Leverandør for godkendt
 Notify_ORDER_SUPPLIER_REFUSE=Leverandør For nægtes
 Notify_PROPAL_VALIDATE=Tilbud godkendt
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Kunde propal lukket underskrevet
+Notify_PROPAL_CLOSE_REFUSED=Kunde propal lukket nægtet
 Notify_PROPAL_SENTBYMAIL=Tilbud sendt med posten
 Notify_WITHDRAW_TRANSMIT=Transmission tilbagetrækning
 Notify_WITHDRAW_CREDIT=Credit tilbagetrækning
 Notify_WITHDRAW_EMIT=Isue tilbagetrækning
 Notify_COMPANY_CREATE=Tredjeparts oprettet
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Mails sendt fra tredjepartskort
 Notify_BILL_VALIDATE=Valider regningen
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=Kundefaktura ugyldiggjort
 Notify_BILL_PAYED=Kundens faktura betales
 Notify_BILL_CANCEL=Kundefaktura aflyst
 Notify_BILL_SENTBYMAIL=Kundens faktura sendes med posten
 Notify_BILL_SUPPLIER_VALIDATE=Leverandør faktura valideret
 Notify_BILL_SUPPLIER_PAYED=Leverandør faktura betales
 Notify_BILL_SUPPLIER_SENTBYMAIL=Leverandør faktura tilsendt med posten
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Leverandør faktura annulleret
 Notify_CONTRACT_VALIDATE=Kontrakt valideret
 Notify_FICHEINTER_VALIDATE=Intervention valideret
 Notify_SHIPPING_VALIDATE=Forsendelse valideret
 Notify_SHIPPING_SENTBYMAIL=Shipping sendes med posten
 Notify_MEMBER_VALIDATE=Medlem valideret
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Medlem ændret
 Notify_MEMBER_SUBSCRIPTION=Medlem abonnerer
-Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_RESILIATE=Medlem afsluttet
 Notify_MEMBER_DELETE=Medlem slettet
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See setup of module %s
+Notify_PROJECT_CREATE=Projektoprettelse
+Notify_TASK_CREATE=Opgave oprettet
+Notify_TASK_MODIFY=Opgave ændret
+Notify_TASK_DELETE=Opgave slettet
+SeeModuleSetup=Se opsætning af modul %s
 NbOfAttachedFiles=Antal vedhæftede filer / dokumenter
 TotalSizeOfAttachedFiles=Samlede størrelse på vedhæftede filer / dokumenter
 MaxSize=Maksimumstørrelse
 AttachANewFile=Vedhæfte en ny fil / dokument
 LinkedObject=Linket objekt
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nYou will find here the shipping __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nYou will find here the intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+NbOfActiveNotifications=Antal meddelelser (nb modtager e-mails)
+PredefinedMailTest=__(Hej)__\nDette er en testpost sendt til __EMAIL__.\nDe to linjer er adskilt af en vognretur.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hej)__\nDette er en <b> test </ b> mail (ordtesten skal være fed skrift). De to linjer er adskilt af en vognretur. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hej)__\n\nHer finder du det kommercielle forslag __PREF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hej)__\n\nHer finder du prisforespørgsel __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hej)__\n\nHer finder du ordren __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hej)__\n\nHer finder du vores ordre __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hej)__\n\nHer finder du fakturaen __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hej)__\n\nHer finder du forsendelsen __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hej)__\n\nHer finder du interventionen __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+DemoDesc=Dolibarr er en kompakt ERP / CRM, der understøtter flere forretningsmoduler. En demo, der viser alle moduler, giver ingen mening, da dette scenario aldrig forekommer (flere hundrede tilgængelige). Så flere demo profiler er tilgængelige.
+ChooseYourDemoProfil=Vælg den demoprofil, der passer bedst til dine behov ...
+ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuel modulvalg)
 DemoFundation=Administrer medlemmer af en fond
 DemoFundation2=Administrer medlemmer og bankkonto i en fond
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=Kun firma eller freelance-salgstjeneste
 DemoCompanyShopWithCashDesk=Administrer en butik med et kontant desk
 DemoCompanyProductAndStocks=Firma, der sælger varer med en butik
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyAll=Virksomhed med flere aktiviteter (alle hovedmoduler)
 CreatedBy=Oprettet af %s
 ModifiedBy=Modificeret af %s
 ValidatedBy=Attesteret af %s
 ClosedBy=Lukket af %s
-CreatedById=User id who created
-ModifiedById=User id who made latest 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 latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+CreatedById=Bruger id, der oprettede
+ModifiedById=Bruger id, der lavede den seneste ændring
+ValidatedById=Bruger id, der er valideret
+CanceledById=Bruger id, der annulleret
+ClosedById=Bruger id, der lukket
+CreatedByLogin=Bruger login, der oprettes
+ModifiedByLogin=Bruger login, som lavede den seneste ændring
+ValidatedByLogin=Bruger login, der valideres
+CanceledByLogin=Bruger login, der blev annulleret
+ClosedByLogin=Bruger login som lukket
 FileWasRemoved=Fil blev slettet
 DirWasRemoved=Directory blev fjernet
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
+FeatureNotYetAvailable=Funktionen er endnu ikke tilgængelig i den aktuelle version
+FeaturesSupported=Understøttede funktioner
 Width=Bredde
 Height=Højde
 Depth=Dybde
@@ -126,7 +128,7 @@ Right=Højre
 CalculatedWeight=Beregnet vægt
 CalculatedVolume=Beregnet mængde
 Weight=Vægt
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -147,8 +149,8 @@ SurfaceUnitinch2=in²
 Volume=Volumen
 VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
-VolumeUnitcm3=cm³ (ml)
-VolumeUnitmm3=mm³ (µl)
+VolumeUnitcm3=cm3 (ml)
+VolumeUnitmm3=mm³ (μl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
 VolumeUnitounce=unse
@@ -160,40 +162,40 @@ SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=tomme
 SizeUnitfoot=mund
-SizeUnitpoint=point
+SizeUnitpoint=punkt
 BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+SendNewPasswordDesc=Denne formular giver dig mulighed for at anmode om en ny adgangskode. Det vil blive sendt til din email-adresse. <br> Ændring vil træde i kraft, når du klikker på bekræftelseslinket i emailen. <br> Kontroller din indbakke.
 BackToLoginPage=Tilbage til login-siden
 AuthenticationDoesNotAllowSendNewPassword=Authentication mode <b>er %s.</b> <br> I denne tilstand, Dolibarr ikke kan vide eller ændre din adgangskode. <br> Kontakt din systemadministrator, hvis du ønsker at ændre din adgangskode.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+EnableGDLibraryDesc=Installer eller aktiver GD bibliotek på din PHP installation for at bruge denne indstilling.
 ProfIdShortDesc=<b>Prof Id %s</b> er en information afhængigt tredjepart land. <br> For eksempel, for <b>land %s,</b> er det <b>kode %s.</b>
 DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of customer orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of supplier proposals
-NumberOfSupplierOrders=Number of supplier orders
-NumberOfSupplierInvoices=Number of supplier invoices
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on customer orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals
-NumberOfUnitsSupplierOrders=Number of units on supplier orders
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
-EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
+StatsByNumberOfUnits=Statistikker for summen af ​​produkter / tjenester
+StatsByNumberOfEntities=Statistikker i antal henvisende enheder (nb faktura eller ordre ...)
+NumberOfProposals=Antal forslag
+NumberOfCustomerOrders=Antal kundeordrer
+NumberOfCustomerInvoices=Antal kundefakturaer
+NumberOfSupplierProposals=Antal leverandørforslag
+NumberOfSupplierOrders=Antal leverandørordrer
+NumberOfSupplierInvoices=Antal leverandørfakturaer
+NumberOfUnitsProposals=Antal enheder på forslag
+NumberOfUnitsCustomerOrders=Antal enheder på kundeordrer
+NumberOfUnitsCustomerInvoices=Antal enheder på kundefakturaer
+NumberOfUnitsSupplierProposals=Antal enheder på leverandørforslag
+NumberOfUnitsSupplierOrders=Antal enheder på leverandørordrer
+NumberOfUnitsSupplierInvoices=Antal enheder på leverandørfakturaer
+EMailTextInterventionAddedContact=En nyintervention %s er blevet tildelt dig.
 EMailTextInterventionValidated=Intervention %s valideret
 EMailTextInvoiceValidated=Faktura %s valideret
 EMailTextProposalValidated=Tilbuddet %s er ikke godkendt.
-EMailTextProposalClosedSigned=The proposal %s has been closed signed.
+EMailTextProposalClosedSigned=Forslaget %s er blevet lukket underskrevet.
 EMailTextOrderValidated=Ordren %s er blevet valideret.
 EMailTextOrderApproved=Bestil %s godkendt
-EMailTextOrderValidatedBy=The order %s has been recorded by %s.
+EMailTextOrderValidatedBy=Ordren %s er optaget af %s.
 EMailTextOrderApprovedBy=Bestil %s er godkendt af %s
 EMailTextOrderRefused=Bestil %s nægtet
 EMailTextOrderRefusedBy=Bestil %s afvises af %s
-EMailTextExpeditionValidated=The shipping %s has been validated.
+EMailTextExpeditionValidated=Forsendelsen %s er blevet valideret.
 ImportedWithSet=Indførsel datasæt
 DolibarrNotification=Automatisk anmeldelse
 ResizeDesc=Indtast nye bredde <b>OR</b> ny højde. Ratio vil blive holdt i resizing ...
@@ -214,32 +216,34 @@ StartUpload=Start upload
 CancelUpload=Annuller upload
 FileIsTooBig=Filer er for store
 PleaseBePatient=Vær tålmodig ...
-ResetPassword=Reset password
-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.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
+NewPassword=New password
+ResetPassword=Nulstille kodeord
+RequestToResetPasswordReceived=En anmodning om at ændre dit Dolibarr kodeord er blevet modtaget
+NewKeyIs=Dette er dine nye nøgler til login
+NewKeyWillBe=Din nye nøgle til login til software vil være
+ClickHereToGoTo=Klik her for at gå til %s
+YouMustClickToChange=Du skal dog først klikke på følgende link for at validere denne adgangskode ændring
+ForgetIfNothing=Hvis du ikke har anmodet om denne ændring, skal du bare glemme denne email. Dine legitimationsoplysninger holdes sikre.
+IfAmountHigherThan=Hvis beløb højere end <strong> %s </ strong>
+SourcesRepository=Repository for kilder
+Chart=Diagram
+PassEncoding=Kodeord for kodeord
+PermissionsAdd=Tilladelser tilføjet
+PermissionsDelete=Tilladelser fjernet
+YourPasswordMustHaveAtLeastXChars=Dit kodeord skal have mindst <strong> %s </ strong> tegn
+YourPasswordHasBeenReset=Dit kodeord er nulstillet
+ApplicantIpAddress=Ansøgerens IP-adresse
 ##### Export #####
 ExportsArea=Eksport område
 AvailableFormats=Tilgængelige formater
 LibraryUsed=Librairie
-LibraryVersion=Library version
+LibraryVersion=Biblioteksversion
 ExportableDatas=Exportable oplysningerne
 NoExportableData=Ingen data at eksportere (intet modul med eksporterbare data, eller manglende rettigheder)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=Opsætning af modulets hjemmeside
+WEBSITE_PAGEURL=URL til side
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Beskrivelse
-WEBSITE_KEYWORDS=Keywords
+WEBSITE_KEYWORDS=nøgleord
+LinesToImport=Lines to import
diff --git a/htdocs/langs/da_DK/paypal.lang b/htdocs/langs/da_DK/paypal.lang
index ea2990137dc..42a5bffc8ca 100644
--- a/htdocs/langs/da_DK/paypal.lang
+++ b/htdocs/langs/da_DK/paypal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal-modul opsætning
 PaypalDesc=Dette modul tilbyder sider til at tillade betaling på <a href="http://www.paypal.com" target="_blank">PayPal</a> af kunderne. Dette kan bruges til en gratis betaling eller til en betaling på en bestemt Dolibarr objekt (faktura, ordre, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
+PaypalOrCBDoPayment=Betal med Paypal (Kreditkort eller Paypal)
 PaypalDoPayment=Betal med Paypal
 PAYPAL_API_SANDBOX=Mode test / sandkasse
 PAYPAL_API_USER=API brugernavn
@@ -10,23 +10,26 @@ PAYPAL_API_SIGNATURE=API signatur
 PAYPAL_SSLVERSION=Curl SSL Version
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Tilbyder betaling &quot;integreret&quot; (kreditkort + Paypal) eller &quot;Paypal&quot; kun
 PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+PaypalModeOnlyPaypal=Kun PayPal
+ONLINE_PAYMENT_CSS_URL=Valgfri URL til CSS stilark på online betalingsside
 ThisIsTransactionId=Dette er id af transaktionen: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Tilsæt url Paypal betaling, når du sender et dokument med posten
-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=You are currently in the %s "sandbox" mode
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
+YouAreCurrentlyInSandboxMode=Du er i øjeblikket i %s "sandbox" -tilstanden
+NewOnlinePaymentReceived=Ny online betaling modtaget
+NewOnlinePaymentFailed=Ny online betaling forsøgt men mislykkedes
+ONLINE_PAYMENT_SENDEMAIL=E-mail for at advare efter en betaling (succes eller ej)
+ReturnURLAfterPayment=Returadresse efter betaling
+ValidationOfOnlinePaymentFailed=Validering af online betaling mislykkedes
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Betalingsbekræftelsessiden blev kaldt af betalings system returnerede en fejl
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API-opkald mislykkedes.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API-opkald mislykkedes.
+DetailedErrorMessage=Detaljeret fejlmeddelelse
+ShortErrorMessage=Kort fejlmeddelelse
+ErrorCode=Fejlkode
+ErrorSeverityCode=Fejl Severity Code
+OnlinePaymentSystem=Online betalings system
+PaypalLiveEnabled=Paypal live aktiveret (ellers test / sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index e27db07cc8a..8c58f74503a 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Produkt ref.
 ProductLabel=Produktmærke
-ProductLabelTranslated=Translated product label
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
+ProductLabelTranslated=Oversat produktmærke
+ProductDescriptionTranslated=Oversat produktbeskrivelse
+ProductNoteTranslated=Oversat produkt notat
 ProductServiceCard=Produkter / Tjenester kortet
 TMenuProducts=Varer
 TMenuServices=Services
@@ -16,25 +16,26 @@ Create=Opret
 Reference=Reference
 NewProduct=Ny vare
 NewService=Ny ydelse
-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.
+ProductVatMassChange=Masse momsændring
+ProductVatMassChangeDesc=Denne side kan bruges til at ændre en momsfaktor defineret på produkter eller tjenester fra en værdi til en anden. Advarsel, denne ændring er udført på hele databasen.
 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.
+MassBarcodeInitDesc=Denne side kan bruges til at initialisere en stregkode på objekter, der ikke har stregkode defineret. Kontroller, inden opsætningen af ​​modulets stregkode er afsluttet.
 ProductAccountancyBuyCode=Regnskabskode (køb)
 ProductAccountancySellCode=Regnskabskode (salg)
-ProductAccountancySellIntraCode=Accounting code (sale intra-community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancySellIntraCode=Regnskabskode (salg intra-community)
+ProductAccountancySellExportCode=Regnskabskode (salg eksport)
 ProductOrService=Vare eller ydelse
 ProductsAndServices=Varer og ydelser
 ProductsOrServices=Varer eller ydelser
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Varer kun til salg
-ProductsOnPurchaseOnly=Varer kun til køb
+ProductsOnPurchaseOnly=Varer kun til indkøb
 ProductsNotOnSell=Varer, der ikke er til salg og ikke kan købes
-ProductsOnSellAndOnBuy=Products for sale and for purchase
+ProductsOnSellAndOnBuy=Produkter til salg og til køb
 ServicesOnSaleOnly=Ydelser kun til salg
-ServicesOnPurchaseOnly=Ydelser kun til køb
+ServicesOnPurchaseOnly=Ydelser kun til indkøb
 ServicesNotOnSell=Ydelse, der ikke er til salg og ikke kan købes
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ServicesOnSellAndOnBuy=Tjenester til salg og til køb
 LastModifiedProductsAndServices=Seneste %s ændrede varer/ydelser
 LastRecordedProducts=Seneste %s registrerede varer
 LastRecordedServices=Seneste %s registrerede ydelser
@@ -46,35 +47,35 @@ Movements=Bevægelser
 Sell=Salg
 Buy=Køb
 OnSell=Til salg
-OnBuy=Til køb
+OnBuy=Til indkøb
 NotOnSell=Ikke til salg
 ProductStatusOnSell=Til salg
 ProductStatusNotOnSell=Ikke til salg
 ProductStatusOnSellShort=Til salg
 ProductStatusNotOnSellShort=Ikke til salg
-ProductStatusOnBuy=Til køb
-ProductStatusNotOnBuy=Ikke til køb
-ProductStatusOnBuyShort=Til køb
-ProductStatusNotOnBuyShort=Ikke til køb
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
+ProductStatusOnBuy=Til indkøb
+ProductStatusNotOnBuy=Ikke til indkøb
+ProductStatusOnBuyShort=Til indkøb
+ProductStatusNotOnBuyShort=Ikke til indkøb
+UpdateVAT=Opdater moms
+UpdateDefaultPrice=Opdater standardpris
+UpdateLevelPrices=Opdater priser for hvert niveau
 AppliedPricesFrom=Anvendte priser fra
 SellingPrice=Salgspris
 SellingPriceHT=Salgspris (ekskl. moms)
 SellingPriceTTC=Salgspris (inkl. moms)
-CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
+CostPriceDescription=Denne pris (ekskl. Moms) kan bruges til at gemme det gennemsnitlige beløb, som denne vare koster til din virksomhed. Det kan være en pris, du beregner dig selv, for eksempel fra den gennemsnitlige købspris plus gennemsnitlige produktions- og distributionsomkostninger.
+CostPriceUsage=Denne værdi kan bruges til margenberegning.
+SoldAmount=Solgt beløb
+PurchasedAmount=Købt beløb
 NewPrice=Ny pris
 MinPrice=Min. salgspris
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere end det minimum, der er tilladt for denne vare (%s uden moms). Denne meddelelse kan også ses, hvis du bruger en for høj rabat.
 ContractStatusClosed=Lukket
 ErrorProductAlreadyExists=En vare med reference %s findes allerede.
 ErrorProductBadRefOrLabel=Forkert værdi for reference eller etiket.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+ErrorProductClone=Der opstod et problem under forsøg på at klone produktet eller tjenesten.
+ErrorPriceCantBeLowerThanMinPrice=Fejl, prisen kan ikke være lavere end minimumsprisen.
 Suppliers=Leverandører
 SupplierRef=Leverandørs vare-ref.
 ShowProduct=Vis vare
@@ -84,7 +85,7 @@ ProductsArea=Varer
 ServicesArea=Ydelser
 ListOfStockMovements=Liste over lagerbevægelser
 BuyingPrice=Købspris
-PriceForEachProduct=Products with specific prices
+PriceForEachProduct=Produkter med specifikke priser
 SupplierCard=Leverandørside
 PriceRemoved=Pris fjernet
 BarCode=Stregkode
@@ -93,21 +94,21 @@ SetDefaultBarcodeType=Vælg stregkodetype
 BarcodeValue=Stregkodeværdi
 NoteNotVisibleOnBill=Note (ikke synlig på fakturaer, tilbud ...)
 ServiceLimitedDuration=Hvis varen er en ydelse med begrænset varighed:
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=Flere segmenter af priser pr. Produkt / service (hver kunde er i et segment)
 MultiPricesNumPrices=Antal priser
-AssociatedProductsAbility=Activate the feature to manage virtual products
+AssociatedProductsAbility=Aktivér funktionen til at styre virtuelle produkter
 AssociatedProducts=Virtuel vare
 AssociatedProductsNumber=Antal varer, der udgør denne virtuelle vare
 ParentProductsNumber=Antal forældrevarer
-ParentProducts=Parent products
+ParentProducts=Moderselskaber
 IfZeroItIsNotAVirtualProduct=Hvis 0, er denne vare ikke en virtuel vare
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotUsedByVirtualProduct=Hvis 0, bruges dette produkt ikke af noget virtuel produkt
 KeywordFilter=Keyword filter
 CategoryFilter=Kategori filter
 ProductToAddSearch=Søg produkt for at tilføje
 NoMatchFound=Ingen match fundet
-ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component of this virtual product/package
+ListOfProductsServices=Liste over produkter / tjenester
+ProductAssociationList=Liste over produkter / tjenester, der er en del af dette virtuelle produkt / pakke
 ProductParentList=Liste over produkter / services med dette produkt som en komponent
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet en vare/ydelse
@@ -122,17 +123,18 @@ ConfirmDeleteProductLine=Er du sikker på du vil slette denne varelinje?
 ProductSpecial=Særlig
 QtyMin=Mindsteantal
 PriceQtyMin=Pris for dette mindsteantal (uden rabat)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Momssats (for denne leverandør/vare)
-DiscountQtyMin=Default discount for qty
+DiscountQtyMin=Standardrabat for antal
 NoPriceDefinedForThisSupplier=Ingen pris/mængde defineret for denne leverandør/vare
 NoSupplierPriceDefinedForThisProduct=Ingen leverandør-pris/mængde defineret for denne vare
-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
-NotPredefinedProducts=Not predefined products/services
+PredefinedProductsToSell=Predefinerede produkter til salg
+PredefinedServicesToSell=Predefinerede tjenester til at sælge
+PredefinedProductsAndServicesToSell=Predefinerede produkter / tjenester til salg
+PredefinedProductsToPurchase=Predefineret produkt til køb
+PredefinedServicesToPurchase=Predefinerede tjenester til køb
+PredefinedProductsAndServicesToPurchase=Predefinerede produkter / tjenester til puchase
+NotPredefinedProducts=Ikke foruddefinerede produkter / tjenester
 GenerateThumb=Generer tommelfinger
 ServiceNb=Service # %s
 ListProductServiceByPopularity=Liste over varer/ydelser efter popularitet
@@ -141,37 +143,37 @@ ListServiceByPopularity=Liste over tjenesteydelser efter popularitet
 Finished=Fremstillet vare
 RowMaterial=Råvare
 CloneProduct=Klon vare eller ydelse
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+ConfirmCloneProduct=Er du sikker på at du vil klone produktet eller tjenesten <b> %s </b>?
 CloneContentProduct=Klon alle de vigtigste informationer af produkt / service
-ClonePricesProduct=Clone prices
-CloneCompositionProduct=Clone packaged product/service
-CloneCombinationsProduct=Clone product variants
+ClonePricesProduct=Klonpriser
+CloneCompositionProduct=Klonemballeret produkt / service
+CloneCombinationsProduct=Klon produkt varianter
 ProductIsUsed=Denne vare er brugt
 NewRefForClone=Ref. for nye vare/ydelse
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Supplier prices
-SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+SellingPrices=Salgspriser
+BuyingPrices=Købspriser
+CustomerPrices=Kundepriser
+SuppliersPrices=Leverandørpriser
+SuppliersPricesOfProductsOrServices=Leverandørpriser (af varer eller tjenesteydelser)
+CustomCode=Told/Vare/HS-kode
 CountryOrigin=Oprindelsesland
 Nature=Natur
-ShortLabel=Short label
+ShortLabel=Kort etiket
 Unit=Enhed
 p=u.
-set=set
-se=set
-second=second
+set=sæt
+se=sæt
+second=anden
 s=s
-hour=hour
+hour=time
 h=h
 day=dag
 d=d
 kilogram=kilogram
-kg=Kg
+kg=kg
 gram=gram
 g=g
-meter=meter
+meter=måler
 m=m
 lm=lm
 m2=m²
@@ -179,155 +181,155 @@ m3=m³
 liter=liter
 l=L
 unitP=Stk.
-unitSET=Set
+unitSET=Sæt
 unitS=Anden
 unitH=Time
 unitD=Dag
 unitKG=Kilogram
 unitG=Gram
 unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
+unitLM=Lineær meter
+unitM2=Kvadratmeter
 unitM3=Kubikmeter
 unitL=Liter
 ProductCodeModel=Skabelon for vare-ref 
-ServiceCodeModel=Service ref template
+ServiceCodeModel=Service ref skabelon
 CurrentProductPrice=Nuværende pris
 AlwaysUseNewPrice=Brug altid den aktuelle pris for vare/ydelse
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
-DisablePriceByQty=Disable prices by quantity
-PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
-UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
+AlwaysUseFixedPrice=Brug den faste pris
+PriceByQuantity=Forskellige priser efter mængde
+DisablePriceByQty=Deaktiver priserne efter antal
+PriceByQuantityRange=Mængdeområde
+MultipriceRules=Prissegmentregler
+UseMultipriceRules=Brug prissegmentregler (defineret i opsætning af produktmodul) for at autokalulere priser for alt andet segment i henhold til første segment
 PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Example: COL
-VariantLabelExample=Example: Color
+PercentDiscountOver=%% rabat over %s
+KeepEmptyForAutoCalculation=Hold tom for at få dette beregnet automatisk ud fra vægt eller volumen af ​​produkter
+VariantRefExample=Eksempel: COL
+VariantLabelExample=Eksempel: Farve
 ### composition fabrication
-Build=Produce
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-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 <b>%s</b>.
-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 third party.
-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 third party %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of third party %s :
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
-AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %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 <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
+Build=Fremstille
+ProductsMultiPrice=Produkter og priser for hvert prissegment
+ProductsOrServiceMultiPrice=Kundepriser (af produkter eller tjenester, multi-priser)
+ProductSellByQuarterHT=Produktomsætning kvartalsvis før Moms
+ServiceSellByQuarterHT=Tjenesteydelser omsætning kvartalsvis før Moms
+Quarter1=1st. Kvarter
+Quarter2=2nd. Kvarter
+Quarter3=3rd. Kvarter
+Quarter4=4th. Kvarter
+BarCodePrintsheet=Udskriv stregkode
+PageToGenerateBarCodeSheets=Med dette værktøj kan du udskrive ark med stregkode klistermærker. Vælg format for din klistermærke side, type stregkode og værdi af stregkode, og klik derefter på knappen <b> %s </b>.
+NumberOfStickers=Antal klistermærker til udskrivning på side
+PrintsheetForOneBarCode=Udskriv flere klistermærker for en stregkode
+BuildPageToPrint=Generer side, der skal udskrives
+FillBarCodeTypeAndValueManually=Udfyld stregkode type og værdi manuelt.
+FillBarCodeTypeAndValueFromProduct=Udfyld stregkode type og værdi fra stregkode for et produkt.
+FillBarCodeTypeAndValueFromThirdParty=Udfyld stregkode type og værdi fra stregkode for en tredjepart.
+DefinitionOfBarCodeForProductNotComplete=Definition af type eller værdi af stregkode ikke komplet for produkt %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition af type eller værdi af stregkode ikke komplet for tredjepart %s.
+BarCodeDataForProduct=Stregkodeoplysninger af produkt %s:
+BarCodeDataForThirdparty=Stregkodeoplysninger af tredjepart %s:
+ResetBarcodeForAllRecords=Definer stregkodeværdi for alle poster (dette vil også nulstille stregkodeværdi allerede defineret med nye værdier)
+PriceByCustomer=Forskellige priser for hver kunde
+PriceCatalogue=En enkelt salgspris pr. Produkt / service
+PricingRule=Regler for salgspriser
+AddCustomerPrice=Tilføj pris ved kunde
+ForceUpdateChildPriceSoc=Indstil samme pris på kundernes datterselskaber
+PriceByCustomerLog=Log af tidligere kundepriser
+MinimumPriceLimit=Minimumsprisen kan ikke være lavere end %s
+MinimumRecommendedPrice=Minimum anbefalet pris er: %s
+PriceExpressionEditor=Pris Udtryks Editor
+PriceExpressionSelected=Udvalgt prisudtryk
+PriceExpressionEditorHelp1="pris = 2 + 2" eller "2 + 2" til indstilling af prisen. Brug ; at adskille udtryk
+PriceExpressionEditorHelp2=Du kan få adgang til ExtraFields med variabler som <b> #extrafield_myextrafieldkey # </b> og globale variabler med <b> #global_mycode # </b>
+PriceExpressionEditorHelp3=I både produkt / service og leverandørpriser findes disse variabler: <br> <b> # tva_tx # # localtax1_tx # # localtax2_tx # # vægt # # længde # # overflade # #price_min # </b>
+PriceExpressionEditorHelp4=Kun i produkt / servicepris: <b> #supplier_min_price # </b> <br> Kun i leverandørpriser: <b> # supplier_quantity # og #supplier_tva_tx # </b>
+PriceExpressionEditorHelp5=Tilgængelige globale værdier:
+PriceMode=Pris-tilstand
 PriceNumeric=Numero
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-MinCustomerPrice=Minimum customer price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+DefaultPrice=Standard pris
+ComposedProductIncDecStock=Forøg / sænk lagerbeholdning ved forældreændring
+ComposedProduct=Sub-produkt
+MinSupplierPrice=Minimum leverandørpris
+MinCustomerPrice=Minimum kundepris
+DynamicPriceConfiguration=Dynamisk priskonfiguration
+DynamicPriceDesc=På produktkort, med dette modul aktiveret, skal du kunne indstille matematiske funktioner til at beregne kunde- eller leverandørpriser. En sådan funktion kan bruge alle matematiske operatører, nogle konstanter og variabler. Du kan indstille de variabler, du vil kunne bruge, og hvis variablen skal have en automatisk opdatering, skal den eksterne webadresse, der bruges til at spørge Dolibarr, opdatere værdien automatisk.
+AddVariable=Tilføj variabel
+AddUpdater=Tilføj opdaterer
+GlobalVariables=Globale variabler
+VariableToUpdate=Variabel for opdatering
+GlobalVariableUpdaters=Globale variable opdateringer
 GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterHelp0=Analyserer JSON-data fra den angivne webadresse, VALUE angiver placeringen af ​​den relevante værdi,
+GlobalVariableUpdaterHelpFormat0=Formatér for anmodning {"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 for request 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=Latest update
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
+GlobalVariableUpdaterHelp1=Parser WebService-data fra den angivne webadresse, NS angiver navneområde, VALUE angiver placeringen af ​​relevant værdi, DATA skal indeholde de data, der skal sendes, og METHOD er ​​den kaldende WS-metode
+GlobalVariableUpdaterHelpFormat1=Format for anmodning er {"URL": "http://example.com/urlofws", "VALUE": "array, målværdi", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"din": "data", "til": "send"}}
+UpdateInterval=Opdateringsinterval (minutter)
+LastUpdated=Seneste opdatering
+CorrectlyUpdated=Korrekt opdateret
+PropalMergePdfProductActualFile=Filer bruges til at tilføje til PDF Azur er / er
+PropalMergePdfProductChooseFile=Vælg PDF-filer
+IncludingProductWithTag=Herunder produkt / service med tag
+DefaultPriceRealPriceMayDependOnCustomer=Standard pris, reel pris kan afhænge af kunde
+WarningSelectOneDocument=Vælg mindst et dokument
 DefaultUnitToShow=Enhed
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products or services translation
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
-SubProduct=Sub product
+NbOfQtyInProposals=Antal i forslag
+ClinkOnALinkOfColumn=Klik på et link i kolonne %s for at få en detaljeret visning ...
+ProductsOrServicesTranslations=Produkter eller tjenesteydelser oversættelse
+TranslatedLabel=Oversat etiket
+TranslatedDescription=Oversat beskrivelse
+TranslatedNote=Oversatte noter
+ProductWeight=Vægt for 1 produkt
+ProductVolume=Volumen for 1 produkt
+WeightUnits=Vægt enhed
+VolumeUnits=Volumen enhed
+SizeUnits=Størrelsesenhed
+DeleteProductBuyPrice=Slet købspris
+ConfirmDeleteProductBuyPrice=Er du sikker på, at du vil slette denne købspris?
+SubProduct=Subprodukt
 ProductSheet=Vareside
 ServiceSheet=Serviceblad
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+PossibleValues=Mulige værdier
+GoOnMenuToCreateVairants=Gå på menu %s - %s for at forberede attributvarianter (som farver, størrelse, ...)
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-PropagateVariant=Propagate variants
-HideProductCombinations=Hide products variant in the products selector
+VariantAttributes=Variant attributter
+ProductAttributes=Variant attributter for produkter
+ProductAttributeName=Variant attribut %s
+ProductAttribute=Variantattribut
+ProductAttributeDeleteDialog=Er du sikker på, at du vil slette denne attribut? Alle værdier slettes
+ProductAttributeValueDeleteDialog=Er du sikker på, at du vil slette værdien "%s" med reference "%s" af denne attribut?
+ProductCombinationDeleteDialog=Er du sikker på, at du vil slette varianter af produktet "<strong> %s </strong>"?
+ProductCombinationAlreadyUsed=Der opstod en fejl under sletningen af ​​varianten. Kontroller, at det ikke bruges i noget objekt
+ProductCombinations=Varianter
+PropagateVariant=Propagate varianter
+HideProductCombinations=Skjul varianter i produktvælgeren
 ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-NewProductCombinations=New variants
-EditProductCombinations=Editing variants
+NewProductCombination=Ny variant
+EditProductCombination=Redigeringsvariant
+NewProductCombinations=Nye varianter
+EditProductCombinations=Redigerer varianter
 SelectCombination=Vælg kombination
-ProductCombinationGenerator=Variants generator
-Features=Features
-PriceImpact=Price impact
-WeightImpact=Weight impact
+ProductCombinationGenerator=Varianter generator
+Features=Funktioner
+PriceImpact=Prispåvirkning
+WeightImpact=Vægtpåvirkning
 NewProductAttribute=Ny attribut
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=Nb of different values
-NbProducts=Nb. of products
+NewProductAttributeValue=Ny attributværdi
+ErrorCreatingProductAttributeValue=Der opstod en fejl under oprettelsen af ​​attributværdien. Det kan skyldes, at der allerede er en eksisterende værdi med denne reference
+ProductCombinationGeneratorWarning=Hvis du fortsætter, inden du genererer nye varianter, vil alle tidligere blive slettet. Allerede eksisterende vil blive opdateret med de nye værdier
+TooMuchCombinationsWarning=Generering af mange varianter kan resultere i høj CPU, hukommelsesforbrug og Dolibarr ikke kunne oprette dem. Aktivering af indstillingen "%s" kan medvirke til at reducere hukommelsesforbruget.
+DoNotRemovePreviousCombinations=Fjern ikke tidligere varianter
+UsePercentageVariations=Brug procentvise variationer
+PercentageVariation=Procentvis variation
+ErrorDeletingGeneratedProducts=Der opstod en fejl under forsøg på at slette eksisterende varianter
+NbOfDifferentValues=Nb af forskellige værdier
+NbProducts=Nb. af produkter
 ParentProduct=Forældrevarer
 HideChildProducts=Skjul varevarianter
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
+ConfirmCloneProductCombinations=Vil du gerne kopiere alle varianter til det andet overordnede produkt med den givne reference?
+CloneDestinationReference=Bestemmelsesproduktreference
+ErrorCopyProductCombinations=Der opstod en fejl under kopiering af varianter af varen
+ErrorDestinationProductNotFound=Destination produkt ikke fundet
 ErrorProductCombinationNotFound=Varevariant ikke fundet
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index dfece3c4c96..6515e7e544c 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -1,155 +1,159 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
-ProjectsArea=Projects Area
-ProjectStatus=Project status
+RefProject=Ref. projekt
+ProjectRef=Projekt ref.
+ProjectId=Projekt-id
+ProjectLabel=Projektetiket
+ProjectsArea=Projekter Område
+ProjectStatus=Projektstatus
 SharedProject=Fælles projekt
 PrivateProject=Projekt kontakter
-ProjectsImContactFor=Projects I'm explicitely a contact of
-AllAllowedProjects=All project I can read (mine + public)
+ProjectsImContactFor=Projekter Jeg er udtrykkeligt en kontaktperson af
+AllAllowedProjects=Alt projekt jeg kan læse (mine + offentlige)
 AllProjects=Alle projekter
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Dette synspunkt præsenterer alle projekter du får lov til at læse.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=Denne visning præsenterer alle opgaver på projekter, som du må læse.
 ProjectsPublicTaskDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du får lov til at læse.
 ProjectsDesc=Dette synspunkt præsenterer alle projekter (din brugertilladelser give dig tilladelse til at se alt).
-TasksOnProjectsDesc=This view presents all tasks on 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.
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
+TasksOnProjectsDesc=Denne visning præsenterer alle opgaver på alle projekter (dine brugerrettigheder giver dig tilladelse til at se alt).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Kun åbne projekter er synlige (projekter i udkast eller lukket status er ikke synlige).
+ClosedProjectsAreHidden=Afsluttede projekter er ikke synlige.
 TasksPublicDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du får lov til at læse.
 TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertilladelser give dig tilladelse til at se alt).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
+AllTaskVisibleButEditIfYouAreAssigned=Alle opgaver for kvalificerede projekter er synlige, men du kan kun indtaste tid til opgave tildelt til den valgte bruger. Tildel opgave, hvis du skal indtaste tid på den.
+OnlyYourTaskAreVisible=Kun de opgaver, der er tildelt dig, er synlige. Tildel opgaven til dig selv, hvis den ikke er synlig, og du skal indtaste tid på den.
+ImportDatasetTasks=Opgaver af projekter
+ProjectCategories=Projektetiketter / kategorier
 NewProject=Nyt projekt
-AddProject=Create project
+AddProject=Opret projekt
 DeleteAProject=Slet et projekt
 DeleteATask=Slet en opgave
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+ConfirmDeleteAProject=Er du sikker på, at du vil slette dette projekt?
+ConfirmDeleteATask=Er du sikker på, at du vil slette denne opgave?
+OpenedProjects=Åbne projekter
+OpenedTasks=Åbn opgaver
+OpportunitiesStatusForOpenedProjects=Muligheder Antal åbne projekter efter status
+OpportunitiesStatusForProjects=Muligheder antal projekter efter status
 ShowProject=Vis projekt
 ShowTask=Vis opgave
 SetProject=Indstil projekt
 NoProject=Intet projekt defineret
 NbOfProjects=Nb af projekter
-NbOfTasks=Nb of tasks
+NbOfTasks=Nb af opgaver
 TimeSpent=Tid brugt
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Tid brugt af dig
+TimeSpentByUser=Tid brugt af brugeren
 TimesSpent=Tid brugt
 RefTask=Ref. opgave
 LabelTask=Label opgave
-TaskTimeSpent=Time spent on tasks
+TaskTimeSpent=Tid brugt på opgaver
 TaskTimeUser=Bruger
 TaskTimeNote=Note
 TaskTimeDate=Dato
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=Opgaver på åbne projekter
+WorkloadNotDefined=Arbejdsbyrden er ikke defineret
 NewTimeSpent=Tid brugt
 MyTimeSpent=Min tid
+BillTime=Bill the time spent
 Tasks=Opgaver
 Task=Opgave
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Opgave startdato
+TaskDateEnd=Opgave slutdato
+TaskDescription=Opgavebeskrivelse
 NewTask=Ny opgave
-AddTask=Create task
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
+AddTask=Opret opgave
+AddTimeSpent=Opret tid brugt
+AddHereTimeSpentForDay=Tilføj her brugt tid til denne dag / opgave
 Activity=Aktivitet
 Activities=Opgaver / aktiviteter
 MyActivities=Mine opgaver / aktiviteter
 MyProjects=Mine projekter
-MyProjectsArea=My projects Area
+MyProjectsArea=Mine projekter Område
 DurationEffective=Effektiv varighed
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Erklæret fremskridt
+ProgressCalculated=Beregnede fremskridt
 Time=Tid
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Go to list of tasks
+ListOfTasks=Liste over opgaver
+GoToListOfTimeConsumed=Gå til listen over tid forbrugt
+GoToListOfTasks=Gå til listen over opgaver
 GanttView=Gantt View
 ListProposalsAssociatedProject=Liste over tilbud forbundet med projektet
-ListOrdersAssociatedProject=List of customer orders associated with the project
-ListInvoicesAssociatedProject=List of customer invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
+ListOrdersAssociatedProject=Liste over kundeordrer i forbindelse med projektet
+ListInvoicesAssociatedProject=Liste over kundefakturaer i forbindelse med projektet
+ListPredefinedInvoicesAssociatedProject=Liste over fakturaer til kundemaler i forbindelse med projektet
+ListSupplierOrdersAssociatedProject=Liste over leverandørordrer i forbindelse med projektet
+ListSupplierInvoicesAssociatedProject=Liste over leverandørfakturaer knyttet til projektet
 ListContractAssociatedProject=Liste over kontrakter i forbindelse med projektet
-ListShippingAssociatedProject=List of shippings associated with the project
+ListShippingAssociatedProject=Liste over afskibninger 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
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
+ListExpenseReportsAssociatedProject=Liste over udgiftsrapporter tilknyttet projektet
+ListDonationsAssociatedProject=Liste over donationer i forbindelse med projektet
+ListVariousPaymentsAssociatedProject=Liste over diverse betalinger forbundet med projektet
 ListActionsAssociatedProject=Liste over begivenheder i forbindelse med projektet
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
+ListTaskTimeUserProject=Liste over tid, der indtages på projektets opgaver
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Aktivitet på projektet i dag
+ActivityOnProjectYesterday=Aktivitet på projektet i går
 ActivityOnProjectThisWeek=Aktivitet på projektet i denne uge
 ActivityOnProjectThisMonth=Aktivitet på projektet i denne måned
 ActivityOnProjectThisYear=Aktivitet på projektet i år
 ChildOfProjectTask=Barn af projekt / opgave
-ChildOfTask=Child of task
+ChildOfTask=Opgavebarn
+TaskHasChild=Task has child
 NotOwnerOfProject=Ikke ejer af denne private projekt
 AffectedTo=Påvirkes i
 CantRemoveProject=Dette projekt kan ikke fjernes, da det er der henvises til nogle andre objekter (faktura, ordrer eller andet). Se referers fane.
 ValidateProject=Validér projet
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=Er du sikker på, at du vil validere dette projekt?
 CloseAProject=Luk projekt
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ConfirmCloseAProject=Er du sikker på at du vil lukke dette projekt?
+AlsoCloseAProject=Luk også projektet (hold det åbent, hvis du stadig skal følge produktionsopgaverne på det)
 ReOpenAProject=Åbn projekt
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=Er du sikker på, at du vil genåbne dette projekt?
 ProjectContact=Projekt kontakter
-TaskContact=Task contacts
+TaskContact=Opgavekontakter
 ActionsOnProject=Begivenheder for projektet
 YouAreNotContactOfProject=Du er ikke en kontakt af denne private projekt
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=Bruger er ikke en kontaktperson af dette private projekt
 DeleteATimeSpent=Slet tid
-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=Contacts task
+ConfirmDeleteATimeSpent=Er du sikker på, at du vil slette denne tid brugt?
+DoNotShowMyTasksOnly=Se også opgaver, der ikke er tildelt mig
+ShowMyTasksOnly=Se kun de opgaver, der er tildelt mig
+TaskRessourceLinks=Kontakter opgave
 ProjectsDedicatedToThisThirdParty=Projekter dedikeret til denne tredjepart
 NoTasks=Ingen opgaver for dette projekt
 LinkedToAnotherCompany=Knyttet til tredjemand
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=Opgave ikke tildelt brugeren. Brug knappen '<strong> %s </ strong>' for at tildele opgaven nu.
 ErrorTimeSpentIsEmpty=Tilbragte Tiden er tom
 ThisWillAlsoRemoveTasks=Denne handling vil også slette alle opgaver i projektet <b>(%s</b> opgaver i øjeblikket), og alle indgange af tid.
 IfNeedToUseOhterObjectKeepEmpty=Hvis nogle objekter (faktura, ordre, ...), der tilhører en anden tredjepart, skal knyttet til projektet for at skabe, holde denne tomme for at få projektet er flere tredjeparter.
-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 dates according to new project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-ProjectModifiedInDolibarr=Project %s modified
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Opportunity status
+CloneProject=Klonprojekt
+CloneTasks=Klonopgaver
+CloneContacts=Klon kontakter
+CloneNotes=Klon noter
+CloneProjectFiles=Kloneprojektet blev tilsluttet filer
+CloneTaskFiles=Klon opgave (er) blev tilsluttet filer (hvis opgave (er) klonede)
+CloneMoveDate=Opdater projekt / opgaver datoer fra nu?
+ConfirmCloneProject=Er du sikker på at klone dette projekt?
+ProjectReportDate=Skift opgaver datoer i henhold til ny projekt startdato
+ErrorShiftTaskDate=Det er umuligt at skifte arbejdsdato i henhold til ny projekt startdato
+ProjectsAndTasksLines=Projekter og opgaver
+ProjectCreatedInDolibarr=Projekt %s oprettet
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Projekt %s ændret
+TaskCreatedInDolibarr=Opgave %s oprettet
+TaskModifiedInDolibarr=Opgave %s ændret
+TaskDeletedInDolibarr=Opgave %s slettet
+OpportunityStatus=Mulighed for status
 OpportunityStatusShort=Opp. status
-OpportunityProbability=Opportunity probability
+OpportunityProbability=Muligheds sandsynlighed
 OpportunityProbabilityShort=Opp. probab.
-OpportunityAmount=Opportunity amount
-OpportunityAmountShort=Opp. amount
-OpportunityAmountAverageShort=Average Opp. amount
-OpportunityAmountWeigthedShort=Weighted Opp. amount
-WonLostExcluded=Won/Lost excluded
+OpportunityAmount=Mulighed beløb
+OpportunityAmountShort=Opp. beløb
+OpportunityAmountAverageShort=Gennemsnitlig oppe. beløb
+OpportunityAmountWeigthedShort=Vægtet oppe. beløb
+WonLostExcluded=Vundet / tabt udelukket
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Projektleder
 TypeContact_project_external_PROJECTLEADER=Projektleder
@@ -159,64 +163,67 @@ TypeContact_project_task_internal_TASKEXECUTIVE=Task udøvende
 TypeContact_project_task_external_TASKEXECUTIVE=Task udøvende
 TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragyder
 TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragyder
-SelectElement=Select element
-AddElement=Link to element
+SelectElement=Vælg element
+AddElement=Link til element
 # Documents models
-DocumentModelBeluga=Project template for linked objects overview
-DocumentModelBaleine=Project report template for tasks
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-ProjectReferers=Related items
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and time
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=Nb of created projects by month
-ProjectNbTaskByMonth=Nb of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
-ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
-NotAnOpportunityShort=Not an opportunity
-OpportunityTotalAmount=Opportunities total amount
-OpportunityPonderatedAmount=Opportunities weighted amount
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
+DocumentModelBeluga=Projektskabelon for oversigt over objekter
+DocumentModelBaleine=Projektrapport skabelon til opgaver
+PlannedWorkload=Planlagt arbejdsbyrde
+PlannedWorkloadShort=arbejdsbyrde
+ProjectReferers=Relaterede emner
+ProjectMustBeValidatedFirst=Projektet skal valideres først
+FirstAddRessourceToAllocateTime=Tildel en brugerressource til opgaven for at allokere tid
+InputPerDay=Indgang pr. Dag
+InputPerWeek=Indgang pr. Uge
+InputDetail=Indgangsdetalje
+TimeAlreadyRecorded=Dette er den tid, der allerede er registreret for denne opgave / dag og bruger %s
+ProjectsWithThisUserAsContact=Projekter med denne bruger som kontaktperson
+TasksWithThisUserAsContact=Opgaver tildelt denne bruger
+ResourceNotAssignedToProject=Ikke tildelt til projekt
+ResourceNotAssignedToTheTask=Ikke tildelt opgaven
+TimeSpentBy=Tid brugt af
+TasksAssignedTo=Opgaver tildelt
+AssignTaskToMe=Tildel opgave til mig
+AssignTaskToUser=Tildel opgave til %s
+SelectTaskToAssign=Vælg opgave for at tildele ...
+AssignTask=Tildel
+ProjectOverview=Oversigt
+ManageTasks=Brug projekter til at følge opgaver og tid
+ManageOpportunitiesStatus=Brug projekter til at følge leads / opportunuties
+ProjectNbProjectByMonth=Nb af oprettede projekter pr. Måned
+ProjectNbTaskByMonth=Nb af oprettede opgaver efter måned
+ProjectOppAmountOfProjectsByMonth=Antal muligheder pr. Måned
+ProjectWeightedOppAmountOfProjectsByMonth=Vægtet antal muligheder pr. Måned
+ProjectOpenedProjectByOppStatus=Åbn projekt / led efter mulighedstilstand
+ProjectsStatistics=Statistik over projekter / ledere
+TasksStatistics=Statistik over projekt / hovedopgaver
+TaskAssignedToEnterTime=Opgave tildelt. Indtastning af tid på denne opgave skal være muligt.
+IdTaskTime=Id opgave tid
+YouCanCompleteRef=Hvis du vil udfylde referencen med nogle oplysninger (for at bruge den som søgefiltre), anbefales det at tilføje et tegn til at adskille det, så den automatiske nummerering fungerer stadig korrekt for de næste projekter. For eksempel %s-ABC. Du kan også foretrække at tilføje søge nøgler til etiket. Men bedste praksis kan være at tilføje et dedikeret felt, også kaldet komplementære attributter.
+OpenedProjectsByThirdparties=Åbne projekter af tredjeparter
+OnlyOpportunitiesShort=Kun muligheder
+OpenedOpportunitiesShort=Åben muligheder
+NotAnOpportunityShort=Ikke en mulighed
+OpportunityTotalAmount=Muligheder samlede beløb
+OpportunityPonderatedAmount=Muligheder vægtet beløb
+OpportunityPonderatedAmountDesc=Muligheder beløbet vægtet med sandsynlighed
+OppStatusPROSP=prospektering
+OppStatusQUAL=Kvalifikation
 OppStatusPROPO=Tilbud
-OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
-OppStatusWON=Won
-OppStatusLOST=Lost
+OppStatusNEGO=negociation
+OppStatusPENDING=Verserende
+OppStatusWON=Vandt
+OppStatusLOST=Faret vild
 Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values :</u><br>- Keep empty: Can link any project of the company (default)<br>- "all" : Can link any projects, even project of other companies<br>- A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+AllowToLinkFromOtherCompany=Tillad at linke projekt fra andet firma <br> <br> <u> Understøttede værdier: </ u> <br> - Hold tom: Kan forbinde ethvert projekt i virksomheden (standard) <br> - "alle": Kan forbinde eventuelle projekter, endda projekter fra andre virksomheder <br> - En liste over tredjepart id adskilt med kommaer: Kan forbinde alle projekter af disse tredjeparter defineret (Eksempel: 123,4795,53) <br>
+LatestProjects=Seneste %s projekter
+LatestModifiedProjects=Seneste %s ændrede projekter
+OtherFilteredTasks=Andre filtrerede opgaver
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-
+AllowCommentOnTask=Tillad brugernes kommentarer til opgaver
+AllowCommentOnProject=Tillad brugernes kommentarer til projekter
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
index bfa10000f6b..5d5bdc0039b 100644
--- a/htdocs/langs/da_DK/propal.lang
+++ b/htdocs/langs/da_DK/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Underskrevet (til bill)
 PropalStatusNotSigned=Ikke underskrevet (lukket)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Udkast
+PropalStatusValidatedShort=valideret
 PropalStatusClosedShort=Lukket
 PropalStatusSignedShort=Underskrevet
 PropalStatusNotSignedShort=Ikke underskrevet
diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
index d5bc87d0bf8..37a60883839 100644
--- a/htdocs/langs/da_DK/salaries.lang
+++ b/htdocs/langs/da_DK/salaries.lang
@@ -1,17 +1,18 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
-Salary=Salary
-Salaries=Salaries
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly rate
-TJM=Average daily rate
-CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Regnskabskonto bruges til tredjepart
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Den dedikerede regnskabskonto, der er defineret på brugerkort, vil kun blive brugt til mellemregnings bogholderi. Denne vil blive brugt til hoved bogholderi og som standardværdi for bogholderi regnskab, hvis dedikeret brugerkonto på bruger ikke er defineret.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Regnskabskonto som standard for lønudbetalinger
+Salary=Løn
+Salaries=Løn
+NewSalaryPayment=Ny lønbetaling
+SalaryPayment=Løn betaling
+SalariesPayments=Lønudbetalinger
+ShowSalaryPayment=Vis lønbetaling
+THM=Gennemsnitlig timepris
+TJM=Gennemsnitlig dagspris
+CurrentSalary=Nuværende løn
+THMDescription=Denne værdi kan bruges til at beregne kostpris for forbrugt tid på et projekt indtastet af brugere, hvis modulprojekt anvendes
+TJMDescription=Denne værdi er i øjeblikket kun som information og bruges ikke til nogen beregning
+LastSalaries=Seneste %s lønbetalinger
+AllSalaries=Alle lønudbetalinger
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index fc01df3cd3d..76f06404c94 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -2,201 +2,204 @@
 WarehouseCard=Warehouse kortet
 Warehouse=Warehouse
 Warehouses=Lager
-ParentWarehouse=Parent warehouse
+ParentWarehouse=Moderselskab
 NewWarehouse=Nyt oplag / Stock område
 WarehouseEdit=Rediger lager
 MenuNewWarehouse=Ny lagerhal
 WarehouseSource=Kilde lagerhal
-WarehouseSourceNotDefined=No warehouse defined,
-AddOne=Add one
+WarehouseSourceNotDefined=Intet lager defineret,
+AddWarehouse=Create warehouse
+AddOne=Tilføj en
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Målret lager
 ValidateSending=Slet afsendelse
 CancelSending=Annuller afsendelse
 DeleteSending=Slet afsendelse
 Stock=Stock
 Stocks=Lagre
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+StocksByLotSerial=Lagre efter lot / seriel
+LotSerial=Masser / Serials
+LotSerialList=Liste over partier / serier
 Movements=Bevægelser
 ErrorWarehouseRefRequired=Warehouse reference navn er påkrævet
 ListOfWarehouses=Liste over pakhuse
 ListOfStockMovements=Liste over lagerbevægelserne
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
+ListOfInventories=List of inventories
+MovementId=Bevægelses-id
+StockMovementForId=Bevægelses-id %d
+ListMouvementStockProject=Liste over lagerbevægelser forbundet med projektet
+StocksArea=Pakhuse
 Location=Lieu
 LocationSummary=Kortnavn placering
 NumberOfDifferentProducts=Antal forskellige varer
 NumberOfProducts=Samlet antal varer
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=Seneste bevægelse
+LastMovements=Seneste bevægelser
 Units=Enheder
 Unit=Enhed
-StockCorrection=Stock correction
+StockCorrection=Lagerkorrektion
 CorrectStock=Korrekt lager
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-LabelMovement=Movement label
+StockTransfer=Aktieoverførsel
+TransferStock=Overførselslager
+MassStockTransferShort=Massebestemmelse overførsel
+StockMovement=Stock bevægelse
+StockMovements=Aktiebevægelser
+LabelMovement=Bevægelsesmærke
 NumberOfUnit=Antal enheder
-UnitPurchaseValue=Unit purchase price
+UnitPurchaseValue=Enhedskøbspris
 StockTooLow=Stock for lavt
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=Lager lavere end advarselsgrænse (%s)
 EnhancedValue=Værdi
 PMPValue=Værdi
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lager værdi
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+UserWarehouseAutoCreate=Opret et brugerlager automatisk, når du opretter en bruger
+AllowAddLimitStockByWarehouse=Tillad at tilføje grænse og ønsket lager pr. Par (produkt, lager) i stedet for pr. Produkt
+IndependantSubProductStock=Produktbeholdning og underprodukt er uafhængige
 QtyDispatched=Afsendte mængde
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
+QtyDispatchedShort=Antal afsendt
+QtyToDispatchShort=Antal til afsendelse
+OrderDispatch=Vareindtægter
+RuleForStockManagementDecrease=Regel for automatisk lagerstyring mindskes (manuel reduktion er altid muligt, selvom en automatisk reduktionsregel er aktiveret)
+RuleForStockManagementIncrease=Regel for automatisk lagerstyring øges (manuel stigning er altid mulig, selvom en automatisk stigningsregel er aktiveret)
 DeStockOnBill=Fraførsel reelle bestande på fakturaer / kreditnotaer
 DeStockOnValidateOrder=Fraførsel reelle bestande om ordrer noter
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
+DeStockOnShipment=Reducer reelle aktier på forsendelse validering
+DeStockOnShipmentOnClosing=Sænk reelle aktier på fragtklassifikation lukket
 ReStockOnBill=Forhøjelse reelle bestande på fakturaer / kreditnotaer
 ReStockOnValidateOrder=Forhøjelse reelle bestande om ordrer noter
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+ReStockOnDispatchOrder=Forøg ægte lagre ved manuel afsendelse til lager, efter leverandørens bestilling af varer
 OrderStatusNotReadyToDispatch=Ordren har endnu ikke eller ikke længere en status, der tillader afsendelse af varer fra varelagre.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+StockDiffPhysicTeoric=Forklaring til forskel mellem fysisk og virtuel bestand
 NoPredefinedProductToDispatch=Ingen foruddefinerede produkter for dette objekt. Så ingen ekspedition på lager er påkrævet.
 DispatchVerb=Forsendelse
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitShort=Begræns for advarsel
+StockLimit=Lagergrænse for advarsel
+StockLimitDesc=(tom) betyder ingen advarsel. <br> 0 kan bruges til en advarsel, så snart lageret er tomt.
 PhysicalStock=Fysiske lager
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Fysisk eller reel bestand er den beholdning du i øjeblikket har i dine interne lagre / emplacements.
+RealStockWillAutomaticallyWhen=Den reelle beholdning ændres automatisk i henhold til disse regler (se lagermodul opsætning for at ændre dette):
 VirtualStock=Virtual lager
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock er den aktie, du får, når alle åbne ventende handlinger, der påvirker aktierne, vil blive lukket (leverandør ordre modtaget, afsendelse af kundeordre, ...)
 IdWarehouse=Id lager
 DescWareHouse=Beskrivelse lager
 LieuWareHouse=Lokalisering lager
 WarehousesAndProducts=Varelagre og varer
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+WarehousesAndProductsBatchDetail=Lager og produkter (med detaljer pr. Lot / serie)
 AverageUnitPricePMPShort=Gennemsnitlig input pris
 AverageUnitPricePMP=Gennemsnitlig input pris
 SellPriceMin=Salgsenhed Pris
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
+EstimatedStockValueSellShort=Værdi for salg
+EstimatedStockValueSell=Værdi for salg
 EstimatedStockValueShort=Anslåede værdi af materiel
 EstimatedStockValue=Anslåede værdi af materiel
 DeleteAWarehouse=Slet et lager
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+ConfirmDeleteWarehouse=Er du sikker på, at du vil slette lageret <b> %s </ b>?
 PersonalStock=Personligt lager %s
 ThisWarehouseIsPersonalStock=Denne lagerhal er personlig status over %s %s
 SelectWarehouseForStockDecrease=Vælg lageret skal bruges til lager fald
 SelectWarehouseForStockIncrease=Vælg lageret skal bruges til lager stigning
-NoStockAction=No stock action
-DesiredStock=Desired optimal stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-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=Current selection mode
+NoStockAction=Ingen lager aktion
+DesiredStock=Ønsket optimal lager
+DesiredStockDesc=Dette lagerbeløb er den værdi, der bruges til at fylde lageret ved genopfyldningsfunktionen.
+StockToBuy=At bestille
+Replenishment=genopfyldning
+ReplenishmentOrders=Replenishment ordrer
+VirtualDiffersFromPhysical=Ifølge stigning / nedsættelse af aktieoptioner kan fysisk lager og virtuelle aktier (fysiske + nuværende ordrer) afvige
+UseVirtualStockByDefault=Brug virtuelt lager som standard, i stedet for fysisk lager, til genopfyldningsfunktion
+UseVirtualStock=Brug virtuelt lager
+UsePhysicalStock=Brug fysisk lager
+CurentSelectionMode=Aktuel valgtilstand
 CurentlyUsingVirtualStock=Virtual lager
 CurentlyUsingPhysicalStock=Fysiske lager
-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 <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-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). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open 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)
-MassMovement=Mass 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 transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
-MovementLabel=Label of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+RuleForStockReplenishment=Regel for lageropfyldning
+SelectProductWithNotNullQty=Vælg mindst et produkt med et antal ikke null og en leverandør
+AlertOnly= Kun advarsler
+WarehouseForStockDecrease=Lageret <b> %s </ b> vil blive brugt til lagernedgang
+WarehouseForStockIncrease=Lageret <b> %s </ b> vil blive brugt til lagerforhøjelse
+ForThisWarehouse=Til dette lager
+ReplenishmentStatusDesc=Dette er en liste over alle produkter med en lagerbeholdning lavere end ønsket lager (eller lavere end advarselsværdi, hvis afkrydsningsfeltet "alarm kun" er markeret). Ved at bruge afkrydsningsfeltet kan du oprette leverandørordrer for at udfylde forskellen.
+ReplenishmentOrdersDesc=Dette er en liste over alle åbne leverandørordrer inklusive foruddefinerede produkter. Kun åbne ordrer med foruddefinerede produkter, så ordrer der kan påvirke lagre, er synlige her.
+Replenishments=genopfyldninger
+NbOfProductBeforePeriod=Mængde af produkt %s på lager inden valgt periode (<%s)
+NbOfProductAfterPeriod=Mængde af produkt %s på lager efter valgt periode (> %s)
+MassMovement=Massebehandling
+SelectProductInAndOutWareHouse=Vælg et produkt, en mængde, et kildelager og et mållager, og klik derefter på "%s". Når dette er gjort for alle nødvendige bevægelser, skal du klikke på "%s".
+RecordMovement=Optag overførsel
+ReceivingForSameOrder=Kvitteringer for denne ordre
+StockMovementRecorded=Aktiebevægelser registreret
+RuleForStockAvailability=Regler om lagerkrav
+StockMustBeEnoughForInvoice=Lager niveau skal være nok til at tilføje produkt / service til faktura (check er udført på nuværende reelle lager, når du tilføjer en linje til faktura uanset hvad der gælder for automatisk lagerændring)
+StockMustBeEnoughForOrder=Lagerniveau skal være nok til at tilføje produkt / service til ordre (check er udført på nuværende reelle lager, når du tilføjer en linje i rækkefølge, uanset hvad der gælder for automatisk lagerændring)
+StockMustBeEnoughForShipment= Lagerniveau skal være nok til at tilføje produkt / service til forsendelse (check er udført på nuværende reelle lager, når du tilføjer en linje til forsendelse, uanset hvad der gælder for automatisk lagerændring)
+MovementLabel=Etikett for bevægelse
+DateMovement=Dato for bevægelse
+InventoryCode=Bevægelse eller lager kode
+IsInPackage=Indeholdt i pakken
+WarehouseAllowNegativeTransfer=Lager kan være negativ
+qtyToTranferIsNotEnough=Du har ikke nok lager fra dit kildelager, og din opsætning tillader ikke negative lagre.
 ShowWarehouse=Vis lager
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+MovementCorrectStock=Lagerkorrektion for produkt %s
+MovementTransferStock=Lageroverførsel af produkt %s til et andet lager
+InventoryCodeShort=Inv./Mov. kode
+NoPendingReceptionOnSupplierOrder=Ingen venter modtagelse på grund af åben leverandørbestilling
+ThisSerialAlreadyExistWithDifferentDate=Dette lot / serienummer (<strong> %s </ strong>) findes allerede, men med forskellige eatby eller sellby dato (fundet <strong> %s </ strong>, men du indtaster <strong> %s </ strong>).
+OpenAll=Åbn for alle handlinger
+OpenInternal=Åben kun for interne handlinger
+UseDispatchStatus=Brug en afsendelsesstatus (godkend / afvis) for produktlinjer ved modtagelse af leverandørbestilling
+OptionMULTIPRICESIsOn=Mulighed for "flere priser pr. Segment" er på. Det betyder, at et produkt har flere salgspriser, så værdien til salg ikke kan beregnes
+ProductStockWarehouseCreated=Lagergrænse for alarm og ønsket optimal lager korrekt oprettet
+ProductStockWarehouseUpdated=Lagergrænse for alarm og ønsket optimal lager korrekt opdateret
+ProductStockWarehouseDeleted=Lagergrænse for advarsel og ønsket optimal lager slettet korrekt
+AddNewProductStockWarehouse=Indstil ny grænse for alarm og ønsket optimal lager
+AddStockLocationLine=Sænk mængde og klik derefter for at tilføje et andet lager til dette produkt
+InventoryDate=Lagerdato
+NewInventory=Ny opgørelse
+inventorySetup = Opstilling af lager
+inventoryCreatePermission=Opret ny opgørelse
+inventoryReadPermission=Se varebeholdninger
+inventoryWritePermission=Opdater inventar
+inventoryValidatePermission=Valider inventar
+inventoryTitle=Beholdning
+inventoryListTitle=Varebeholdninger
+inventoryListEmpty=Ingen opgørelse pågår
+inventoryCreateDelete=Opret / Slet inventar
+inventoryCreate=Lav ny
 inventoryEdit=Redigér
 inventoryValidate=Valideret
 inventoryDraft=Kørsel
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Lagervalg
 inventoryConfirmCreate=Opret
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryOfWarehouse=Lagerbeholdning: %s
+inventoryErrorQtyAdd=Fejl: En mængde er leaser end nul
+inventoryMvtStock=Ved opgørelse
+inventoryWarningProductAlreadyExists=Dette produkt er allerede på listen
 SelectCategory=Kategori filter
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
+SelectFournisseur=Leverandørfilter
+inventoryOnDate=Beholdning
+INVENTORY_DISABLE_VIRTUAL=Tillad ikke at afstøde børneprodukt fra et sæt på lager
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Brug købsprisen, hvis der ikke findes nogen sidste købspris
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Lagerbevægelse har datoen for lagerbeholdningen
+inventoryChangePMPPermission=Tillad at ændre PMP-værdi for en vare
+ColumnNewPMP=Ny enhed PMP
+OnlyProdsInStock=Tilføj ikke produkt uden lager
+TheoricalQty=Teoretisk antal
+TheoricalValue=Teoretisk antal
+LastPA=Sidste BP
 CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+RealQty=Real Antal
+RealValue=Reel værdi
+RegulatedQty=Reguleret antal
+AddInventoryProduct=Tilføj produkt til lager
 AddProduct=Tilføj
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=Påfør PMP
+FlushInventory=Spyl opgørelse
+ConfirmFlushInventory=Bekræfter du denne handling?
+InventoryFlushed=Lagerbeholdningen skyllet
+ExitEditMode=Afslutningsudgave
 inventoryDeleteLine=Slet linie
-RegulateStock=Regulate Stock
+RegulateStock=Reguler lager
 ListInventory=Liste
-StockSupportServices=Stock management support services
+StockSupportServices=Støtte til lageradministration
 StockSupportServicesDesc=Som standard kan du kun lagre varer af typen "vare". Hvis slået til, og hvis modulet for ydelser er slået til, kan du også lagre varer af typen "ydelse"
diff --git a/htdocs/langs/da_DK/stripe.lang b/htdocs/langs/da_DK/stripe.lang
index 6aa86f8c039..e70c5a14b2f 100644
--- a/htdocs/langs/da_DK/stripe.lang
+++ b/htdocs/langs/da_DK/stripe.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
+StripeSetup=Stripe-modul opsætning
+StripeDesc=Modul til at tilbyde en online betalingsside, der accepterer betalinger med kredit- / betalingskort via <a href="http://www.stripe.com" target="_blank"> stripe </a>. Dette kan bruges til at give dine kunder mulighed for at foretage gratis betalinger eller til betaling på et bestemt Dolibarr-objekt (faktura, ordre, ...)
+StripeOrCBDoPayment=Betal med kreditkort eller stripe
 FollowingUrlAreAvailableToMakePayments=Følgende webadresser findes til at tilbyde en side til en kunde for at foretage en indbetaling på Dolibarr objekter
 PaymentForm=Betaling form
 WelcomeOnPaymentPage=Velkommen på vores online betalingstjenesten
@@ -9,11 +9,11 @@ ThisScreenAllowsYouToPay=Dette skærmbillede giver dig mulighed for at foretage
 ThisIsInformationOnPayment=Dette er informationer om betaling for at gøre
 ToComplete=For at fuldføre
 YourEMail=E-mail til bekræftelse af betaling,
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=E-mail for at advare efter en betaling (succes eller ej)
 Creditor=Kreditor
 PaymentCode=Betaling kode
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Betal med kredit eller betalingskort (Stripe)
+YouWillBeRedirectedOnStripe=Du bliver omdirigeret på sikret stripeside for at indtaste dig kreditkortoplysninger
 Continue=Næste
 ToOfferALinkForOnlinePayment=URL til %s betaling
 ToOfferALinkForOnlinePaymentOnOrder=URL til at tilbyde en %s online betaling brugergrænseflade til en ordre
@@ -22,19 +22,44 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL til at tilbyde en %s online betal
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL til at tilbyde en %s online betaling brugergrænseflade til et frit beløb
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL til at tilbyde en %s online betaling brugergrænseflade til et medlem abonnement
 YouCanAddTagOnUrl=Du kan også tilføje webadresseparameter <b>& tag= <i>værdi</i></b> til nogen af disse URL (kræves kun for fri betaling) for at tilføje din egen betaling kommentere tag.
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+SetupStripeToHavePaymentCreatedAutomatically=Indstil din stripe med url <b> %s </ b> for at få betaling oprettet automatisk, når valideret af Stripe.
 YourPaymentHasBeenRecorded=Denne side bekræfter, at din betaling er registreret. Tak.
 YourPaymentHasNotBeenRecorded=Du betalingen ikke er blevet registreret, og transaktionen er blevet aflyst. Tak.
 AccountParameter=Konto parametre
 UsageParameter=Usage parametre
 InformationToFindParameters=Hjælp til at finde din %s kontooplysninger
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+STRIPE_CGI_URL_V2=Url af Stripe CGI-modul til betaling
 VendorName=Navn på leverandør
 CSSUrlForPaymentForm=CSS stylesheet url til indbetalingskort
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+NewStripePaymentReceived=Ny Stripe betaling modtaget
+NewStripePaymentFailed=Ny Stripe betaling forsøgt men mislykkedes
+STRIPE_TEST_SECRET_KEY=Hemmelig testnøgle
+STRIPE_TEST_PUBLISHABLE_KEY=Udgivelig testnøgle
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret levende nøgle
+STRIPE_LIVE_PUBLISHABLE_KEY=Udgivelig levende nøgle
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live aktiveret (ellers test / sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang
index 06a22daf2de..b5acebb07c4 100644
--- a/htdocs/langs/da_DK/trips.lang
+++ b/htdocs/langs/da_DK/trips.lang
@@ -1,156 +1,157 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
+ShowExpenseReport=Vis omkostningsrapport
+Trips=Udgiftsrapporter
+TripsAndExpenses=Udgifter rapporter
+TripsAndExpensesStatistics=Omkostningsrapporteringstatistik
+TripCard=Udgiftsrapport kort
+AddTrip=Opret omkostningsrapport
+ListOfTrips=Liste over udgiftsrapporter
 ListOfFees=Liste over gebyrer
-TypeFees=Types of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+TypeFees=Typer af gebyrer
+ShowTrip=Vis omkostningsrapport
+NewTrip=Ny udgiftsrapport
+LastExpenseReports=Seneste %s udgiftsrapporter
+AllExpenseReports=Alle udgiftsrapporter
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Beløb eller kilometer
-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
-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
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+DeleteTrip=Slet udgiftsrapport
+ConfirmDeleteTrip=Er du sikker på, at du vil slette denne udgiftsrapport?
+ListTripsAndExpenses=Liste over udgiftsrapporter
+ListToApprove=Venter på godkendelse
+ExpensesArea=Omkostningsrapporteringsområde
+ClassifyRefunded=Klassificer 'refunderet'
+ExpenseReportWaitingForApproval=En ny udgiftsrapport er indsendt til godkendelse
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=En udgiftsrapport er indsendt til genoptagelse
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=En udgiftsrapport blev godkendt
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=En udgiftsrapport blev afvist
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=En udgiftsrapport blev annulleret
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=En udgiftsrapport blev betalt
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id udgiftsrapport
+AnyOtherInThisListCanValidate=Person til oplysning om validering.
+TripSociete=Informationsselskab
+TripNDF=Informationsomkostningsrapport
+PDFStandardExpenseReports=Standard skabelon til at generere et PDF-dokument til udgiftsrapport
+ExpenseReportLine=Udgiftsrapport linje
 TF_OTHER=Anden
-TF_TRIP=Transportation
+TF_TRIP=Transport
 TF_LUNCH=Frokost
 TF_METRO=Metro
-TF_TRAIN=Train
+TF_TRAIN=Tog
 TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
+TF_CAR=Bil
+TF_PEAGE=Afgift
+TF_ESSENCE=Brændstof
 TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
+TF_TAXI=Taxa
+EX_KME=Mileage omkostninger
+EX_FUE=Brændstof CV
 EX_HOT=Hotel
-EX_PAR=Parking CV
+EX_PAR=Parkering CV
 EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-EX_FUE_VP=Fuel PV
+EX_TAX=Forskellige skatter
+EX_IND=Skadesløsholdelse transport abonnement
+EX_SUM=Vedligeholdelsesforsyning
+EX_SUO=Kontorartikler
+EX_CAR=Biludlejning
+EX_DOC=Dokumentation
+EX_CUR=Kunder modtager
+EX_OTR=Anden modtagelse
+EX_POS=Porto
+EX_CAM=CV vedligeholdelse og reparation
+EX_EMM=Ansatte måltid
+EX_GUM=Gæster måltid
+EX_BRE=Morgenmad
+EX_FUE_VP=Brændstof PV
 EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=PV maintenance and repair
-DefaultCategoryCar=Default transportation mode
-DefaultRangeNumber=Default range number
+EX_PAR_VP=Parkering PV
+EX_CAM_VP=PV vedligeholdelse og reparation
+DefaultCategoryCar=Standard transport mode
+DefaultRangeNumber=Standard interval nummer
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=Du har erklæret en anden regningsrapport i et lignende datointerval.
+AucuneLigne=Der er ikke angivet nogen omkostningsrapport endnu
 
-ModePaiement=Payment mode
+ModePaiement=Betalingsmåde
 
-VALIDATOR=User responsible for approval
+VALIDATOR=Bruger ansvarlig for godkendelse
 VALIDOR=Godkendt af
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
+AUTHOR=Optaget af
+AUTHORPAIEMENT=Betalt af
+REFUSEUR=Nægtet af
+CANCEL_USER=Slettet af
 
 MOTIF_REFUS=Årsag
 MOTIF_CANCEL=Årsag
 
-DATE_REFUS=Deny date
+DATE_REFUS=Nægte dato
 DATE_SAVE=Validering dato
-DATE_CANCEL=Cancelation date
+DATE_CANCEL=Annulleringsdato
 DATE_PAIEMENT=Betalingsdato
-BROUILLONNER=Reopen
-ExpenseReportRef=Ref. expense report
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
-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?
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-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?
-NoTripsToExportCSV=No expense report to export for this period.
-ExpenseReportPayment=Expense report payment
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
-CloneExpenseReport=Clone expense report
-ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Expense report milles index
-ExpenseReportsRules=Expense report rules
-ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
-ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+BROUILLONNER=Åbn
+ExpenseReportRef=Ref. udgiftsrapport
+ValidateAndSubmit=Valider og indsend for godkendelse
+ValidatedWaitingApproval=Valideret (venter på godkendelse)
+NOT_AUTHOR=Du er ikke forfatteren af ​​denne udgiftsrapport. Drift aflyst.
+ConfirmRefuseTrip=Er du sikker på, at du vil nægte denne udgiftsrapport?
+ValideTrip=Godkendelse af udgiftsrapport
+ConfirmValideTrip=Er du sikker på, at du vil godkende denne udgiftsrapport?
+PaidTrip=Betal en udgiftsrapport
+ConfirmPaidTrip=Er du sikker på, at du vil ændre status for denne udgiftsrapport til "Betalt"?
+ConfirmCancelTrip=Er du sikker på, at du vil annullere denne udgiftsrapport?
+BrouillonnerTrip=Flyt tilbage bekostning rapport til status "Udkast"
+ConfirmBrouillonnerTrip=Er du sikker på, at du vil flytte denne udgiftsrapport til status "Udkast"?
+SaveTrip=Validere udgiftsrapport
+ConfirmSaveTrip=Er du sikker på, at du vil validere denne udgiftsrapport?
+NoTripsToExportCSV=Ingen udgiftsrapport til eksport for denne periode.
+ExpenseReportPayment=Udgift rapport betaling
+ExpenseReportsToApprove=Udgiftsrapporter til at godkende
+ExpenseReportsToPay=Udgifter rapporterer at betale
+CloneExpenseReport=Klonudgiftsrapport
+ConfirmCloneExpenseReport=Er du sikker på, at du vil klone denne omkostningsrapport?
+ExpenseReportsIk=Udgiftsrapport milles indeks
+ExpenseReportsRules=Regnskabsregnskabsregler
+ExpenseReportIkDesc=Du kan ændre beregningen af ​​kilometerudgifter efter kategori og rækkevidde, hvem de tidligere er defineret. <b> d </ b> er afstanden i kilometer
+ExpenseReportRulesDesc=Du kan oprette eller opdatere nogen beregningsregler. Denne del vil blive brugt, når brugeren opretter en ny udgiftsrapport
 expenseReportOffset=Offset
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Example with <u>d</u> = 5
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportCoef=Koefficient
+expenseReportTotalForFive=Eksempel med <u> d </ u> = 5
+expenseReportRangeFromTo=fra %d til %d
+expenseReportRangeMoreThan=mere end %d
+expenseReportCoefUndefined=(værdi ikke defineret)
+expenseReportCatDisabled=Kategori deaktiveret - se c_exp_tax_cat ordbogen
+expenseReportRangeDisabled=Område deaktiveret - se c_exp_tax_range dictionay
 expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
+ExpenseReportApplyTo=Ansøg til
+ExpenseReportDomain=Domæne at anvende
+ExpenseReportLimitOn=Begræns på
 ExpenseReportDateStart=Dato start
 ExpenseReportDateEnd=Dato udgangen
-ExpenseReportLimitAmount=Limite amount
-ExpenseReportRestrictive=Restrictive
-AllExpenseReport=All type of expense report
-OnExpense=Expense line
-ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
+ExpenseReportLimitAmount=Limite beløb
+ExpenseReportRestrictive=restriktiv
+AllExpenseReport=Alle typer udgiftsrapport
+OnExpense=Udgiftslinje
+ExpenseReportRuleSave=Regnskabsregnskabsreglen er gemt
+ExpenseReportRuleErrorOnSave=Fejl: %s
+RangeNum=Område %d
 
-ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
-byEX_DAY=by day (limitation to %s)
-byEX_MON=by month (limitation to %s)
-byEX_YEA=by year (limitation to %s)
-byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
-nolimitbyEX_DAY=by day (no limitation)
-nolimitbyEX_MON=by month (no limitation)
-nolimitbyEX_YEA=by year (no limitation)
-nolimitbyEX_EXP=by line (no limitation)
+ExpenseReportConstraintViolationError=Begrænsnings overtrædelses id [%s]: %s er bedre end %s %s
+byEX_DAY=om dagen (begrænsning til %s)
+byEX_MON=efter måned (begrænsning til %s)
+byEX_YEA=efter år (begrænsning til %s)
+byEX_EXP=for linje (begrænsning til %s)
+ExpenseReportConstraintViolationWarning=Begrænsnings overtrædelses id [%s]: %s er bedre end %s %s
+nolimitbyEX_DAY=om dagen (ingen begrænsning)
+nolimitbyEX_MON=efter måned (ingen begrænsning)
+nolimitbyEX_YEA=efter år (ingen begrænsning)
+nolimitbyEX_EXP=efter linie (ingen begrænsning)
 
-CarCategory=Category of car
-ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
+CarCategory=Kategori af bil
+ExpenseRangeOffset=Forskudsbeløb: %s
+RangeIk=Mileage rækkevidde
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 34e9fe6856c..6d59a2e9446 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=HRM område
 UserCard=Oversigt over bruger
 GroupCard=Oversigt over gruppe
 Permission=Tilladelse
 Permissions=Tilladelser
 EditPassword=Rediger adgangskode
 SendNewPassword=Send ny adgangskode
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Send link for at nulstille adgangskoden
 ReinitPassword=Generer ny adgangskode
 PasswordChangedTo=Adgangskode ændret til: %s
 SubjectNewPassword=Din nye adgangskode for %s
@@ -20,12 +20,12 @@ DeleteAUser=Slet en bruger
 EnableAUser=Aktiver en bruger
 DeleteGroup=Slet
 DeleteAGroup=Slet en gruppe
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+ConfirmDisableUser=Er du sikker på, at du vil deaktivere brugeren <b> %s </ b>?
+ConfirmDeleteUser=Er du sikker på, at du vil slette brugeren <b> %s </ b>?
+ConfirmDeleteGroup=Er du sikker på, at du vil slette gruppen <b> %s </ b>?
+ConfirmEnableUser=Er du sikker på, at du vil aktivere brugeren <b> %s </ b>?
+ConfirmReinitPassword=Er du sikker på, at du vil oprette en ny adgangskode til brugeren <b> %s </ b>?
+ConfirmSendNewPassword=Er du sikker på, at du vil generere og sende ny adgangskode til brugeren <b> %s </ b>?
 NewUser=Ny bruger
 CreateUser=Opret bruger
 LoginNotDefined=Login er ikke defineret.
@@ -44,12 +44,12 @@ NewGroup=Ny gruppe
 CreateGroup=Opret gruppe
 RemoveFromGroup=Fjern fra gruppe
 PasswordChangedAndSentTo=Password ændret og sendt <b>til %s.</b>
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=Anmod om at ændre adgangskode til <b> %s </ b>
 PasswordChangeRequestSent=Anmodning om at ændre password <b>for %s</b> sendt <b>til %s.</b>
-ConfirmPasswordReset=Confirm password reset
+ConfirmPasswordReset=Bekræft nulstilling af adgangskode
 MenuUsersAndGroups=Brugere og grupper
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Seneste %s oprettede grupper
+LastUsersCreated=Seneste brugere %s oprettet
 ShowGroup=Vis gruppe
 ShowUser=Vis bruger
 NonAffectedUsers=Ikke-tildelte brugere
@@ -69,8 +69,8 @@ InternalUser=Intern bruger
 ExportDataset_user_1=Dolibarr brugere og egenskaber
 DomainUser=Domænebruger %s
 Reactivate=Genaktiver
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Tilladelse gives, fordi arvet fra en af en brugers gruppe.
 Inherited=Arvelige
 UserWillBeInternalUser=Oprettet brugeren vil blive en intern bruger (fordi der ikke er knyttet til en bestemt tredjepart)
@@ -83,26 +83,27 @@ UserDisabled=Bruger %s handicappede
 UserEnabled=Bruger %s aktiveret
 UserDeleted=Bruger %s fjernes
 NewGroupCreated=Gruppe %s oprettet
-GroupModified=Group %s modified
+GroupModified=Gruppe %s ændret
 GroupDeleted=Gruppe %s fjernes
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+ConfirmCreateContact=Er du sikker på, at du vil oprette en Dolibarr-konto til denne kontaktperson?
+ConfirmCreateLogin=Er du sikker på, at du vil oprette en Dolibarr konto til dette medlem?
+ConfirmCreateThirdParty=Er du sikker på, at du vil oprette en tredjepart for dette medlem?
 LoginToCreate=Log ind for at oprette
 NameToCreate=Navn af tredjemand til at skabe
 YourRole=Din roller
 YourQuotaOfUsersIsReached=Din kvote af aktive brugere er nået!
 NbOfUsers=Nb af brugere
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Kun en superadmin kan nedgradere en superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
-OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
+HierarchicalResponsible=Tilsynsførende
+HierarchicView=Hierarkisk visning
+UseTypeFieldToChange=Brug feltet Type til at ændre
+OpenIDURL=OpenID-URL
+LoginUsingOpenID=Brug OpenID til at logge ind
+WeeklyHours=Timer arbejdede (pr. Uge)
+ExpectedWorkedHours=Forventede arbejdstimer pr. Uge
+ColorUser=Brugerens farve
+DisabledInMonoUserMode=Deaktiveret i vedligeholdelsestilstand
 UserAccountancyCode=Regnskabskode for bruger
 UserLogoff=Bruger logout
 UserLogged=Bruger logget
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index f8c6361b2cc..1e884785c4a 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -1,66 +1,84 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kode
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit Meta
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
+WebsiteSetupDesc=Opret her så meget adgang som antallet af forskellige hjemmesider, du har brug for. Gå derefter ind i menuen Websites for at redigere dem.
+DeleteWebsite=Slet websted
+ConfirmDeleteWebsite=Er du sikker på, at du vil slette dette websted. Alle dens sider og indhold vil også blive fjernet.
+WEBSITE_TYPE_CONTAINER=Type side / container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Sidens navn / alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_CSS_URL=URL for ekstern CSS-fil
+WEBSITE_CSS_INLINE=CSS-fil indhold (fælles for alle sider)
+WEBSITE_JS_INLINE=Javascript fil indhold (fælles for alle sider)
+WEBSITE_HTML_HEADER=Tilføjelse nederst på HTML-overskrift (fælles for alle sider)
+WEBSITE_ROBOT=Robotfil (robots.txt)
+WEBSITE_HTACCESS=Websted. Htaccess-fil
+HtmlHeaderPage=HTML-overskrift (kun for denne side)
+PageNameAliasHelp=Navnet eller aliaset på siden. <br> Dette alias bruges også til at oprette en SEO-URL, når webstedet er kørt fra en virtuel vært på en webserver (som Apacke, Nginx, ...). Brug knappen "<strong> %s </strong>" for at redigere dette alias.
+EditTheWebSiteForACommonHeader=Bemærk: Hvis du vil definere en personlig "Header" for alle sider, skal du redigere din "Header" på website niveau i stedet for på siden / containeren.
+MediaFiles=Mediebibliotek
+EditCss=Rediger Style / CSS eller HTML header
+EditMenu=Rediger menu
+EditMedias=Rediger medier
+EditPageMeta=Rediger Meta
+AddWebsite=Tilføj hjemmeside
+Webpage=Webside / container
+AddPage=Tilføj side / container
 HomePage=Hjemmeside
-PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
+PageContainer=Side / beholder
+PreviewOfSiteNotYetAvailable=Forhåndsvisning af dit websted <strong> %s </strong> endnu ikke tilgængeligt. Du skal først tilføje en side.
+RequestedPageHasNoContentYet=Den ønskede side med id %s har intet indhold endnu, eller cache-filen .tpl.php blev fjernet. Rediger indholdet på siden for at løse dette.
+PageContent=Side / Indhold
+PageDeleted=Side / Indenhold '%s' af hjemmesiden %s slettet
+PageAdded=Side / Indhold '%s' tilføjet
+ViewSiteInNewTab=Se websted i ny fane
+ViewPageInNewTab=Se side i ny fane
 SetAsHomePage=Angiv som hjemmeside
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Web site added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
+RealURL=Rigtig webadresse
+ViewWebsiteInProduction=Se websitet ved hjælp af hjemmesider
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Læs
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL til den virtuelle vært, der serveres af en ekstern webserver, der ikke er defineret
+NoPageYet=Ingen sider endnu
+SyntaxHelp=Hjælp til specifikke syntax tips
+YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+ClonePage=Klon side / container
+CloneSite=Klon website
+SiteAdded=Websted tilføjet
+ConfirmClonePage=Indtast venligst kode / alias for ny side, og hvis det er en oversættelse af den klonede side.
+PageIsANewTranslation=Den nye side er en oversættelse af den aktuelle side?
+LanguageMustNotBeSameThanClonedPage=Du klon en side som en oversættelse. Sproget på den nye side skal være anderledes end sproget på kildesiden.
+ParentPageId=Forældre side id
 WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
-FetchAndCreate=Fetch and Create
-ExportSite=Export site
-IDOfPage=Id of page
-Banner=Bandeau
-BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
-AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=Another container
+CreateByFetchingExternalPage=Opret side / container ved at hente side fra ekstern webadresse ...
+OrEnterPageInfoManually=Eller opret en tom side fra bunden ...
+FetchAndCreate=Hent og Opret
+ExportSite=Eksport sted
+IDOfPage=Side Id
+Banner=Banner
+BlogPost=Blogindlæg
+WebsiteAccount=Websted konto
+WebsiteAccounts=Webstedkonti
+AddWebsiteAccount=Opret websitet konto
+BackToListOfThirdParty=Tilbage til listen for tredjepart
+DisableSiteFirst=Deaktiver hjemmesiden først
+MyContainerTitle=Min hjemmeside titel
+AnotherContainer=En anden beholder
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index b437df352c9..c6588ad8186 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Direct debit payment orders area
-SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
-NewStandingOrder=New direct debit order
+CustomersStandingOrdersArea=Betalingsordre for direkte debitering
+SuppliersStandingOrdersArea=Direkte kredit betalingsordre område
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Betalingsordre med "Direkte debit"
+NewStandingOrder=Ny direkte debitering
 StandingOrderToProcess=For at kunne behandle
-WithdrawalsReceipts=Direct debit orders
+WithdrawalsReceipts=Direkte debitordre
 WithdrawalReceipt=Direct debit order
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLines=Direct debit order lines
-RequestStandingOrderToTreat=Request for direct debit payment order to process
-RequestStandingOrderTreated=Request for direct debit payment order processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of qualified invoice with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
+LastWithdrawalReceipts=Seneste %s direkte debit-filer
+WithdrawalsLines=Direkte debitordre
+RequestStandingOrderToTreat=Anmodning om betaling med direkte debitering for at behandle
+RequestStandingOrderTreated=Forespørgsel om betaling med direkte debitering behandlet
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Ikke muligt endnu. Uddragsstatus skal indstilles til 'krediteret', før de erklærer afvisning på bestemte linjer.
+NbOfInvoiceToWithdraw=Nb. af kvalificeret faktura med ventende direkte debitering
+NbOfInvoiceToWithdrawWithInfo=Nb. af kundefaktura med ordrer med direkte debitering med angivne bankkontooplysninger
+InvoiceWaitingWithdraw=Faktura venter på direkte debitering
 AmountToWithdraw=Beløb til at trække
-WithdrawsRefused=Direct debit refused
-NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+WithdrawsRefused=Direkte debitering afvist
+NoInvoiceToWithdraw=Ingen kundefaktura med åbne 'Debitforespørgsler' venter. Gå på fanen '%s' på faktura kort for at fremsætte en anmodning.
 ResponsibleUser=Ansvarlig bruger
-WithdrawalsSetup=Direct debit payment setup
-WithdrawStatistics=Direct debit payment statistics
-WithdrawRejectStatistics=Direct debit payment reject statistics
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-WithdrawRequestsDone=%s direct debit payment requests recorded
+WithdrawalsSetup=Indbetaling af direkte debitering
+WithdrawStatistics=Betalingsstatistik for direkte debitering
+WithdrawRejectStatistics=Direkte debitering betaling afviser statistikker
+LastWithdrawalReceipt=Seneste %s direkte debit kvitteringer
+MakeWithdrawRequest=Lav en anmodning om direkte debitering
+WithdrawRequestsDone=%s anmodninger om direkte debitering indbetalt
 ThirdPartyBankCode=Tredjepart bankkode
-NoInvoiceCouldBeWithdrawed=Ingen faktura tilbageført. Kontroller, at fakturaen er for et selskab med et gyldig IBAN.
+NoInvoiceCouldBeWithdrawed=Ingen faktura tilbagetrukket med succes. Kontroller, at fakturaer er på virksomheder med en gyldig standard BAN, og at BAN har en RUM-tilstand <strong> %s </ strong>.
 ClassCredited=Klassificere krediteres
 ClassCreditedConfirm=Er du sikker på at du vil klassificere denne tilbagetrækning modtagelse som krediteres på din bankkonto?
 TransData=Dato Transmission
@@ -40,8 +40,8 @@ RefusedData=Dato for afvisning
 RefusedReason=Årsag til afvisning
 RefusedInvoicing=Fakturering afvisningen
 NoInvoiceRefused=Oplad ikke afvisning
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
+InvoiceRefused=Faktura nægtet (Oplad afvisningen til kunden)
+StatusDebitCredit=Status debet / kredit
 StatusWaiting=Venter
 StatusTrans=Transmitteret
 StatusCredited=Krediteres
@@ -49,15 +49,15 @@ StatusRefused=Afviste
 StatusMotif0=Uspecificeret
 StatusMotif1=Levering insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=No direct debit payment order
+StatusMotif3=Ingen betaling med direkte debitering
 StatusMotif4=Kunde Bestil
 StatusMotif5=RIB inexploitable
 StatusMotif6=Konto uden balance
 StatusMotif7=Retslig afgørelse
 StatusMotif8=Andre grunde
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateForSepaFRST=Opret direkte debit fil (SEPA FRST)
+CreateForSepaRCUR=Opret direkte debitering fil (SEPA RCUR)
+CreateAll=Opret direkte debitfil (alle)
 CreateGuichet=Kun kontor
 CreateBanque=Kun bank
 OrderWaiting=Venter på behandling
@@ -66,45 +66,49 @@ NotifyCredit=Tilbagetrækning Credit
 NumeroNationalEmetter=National Transmitter Antal
 WithBankUsingRIB=For bankkonti ved hjælp af RIB
 WithBankUsingBANBIC=For bankkonti ved hjælp af IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Bankkonto for at modtage direkte debitering
 CreditDate=Kredit på
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Kan ikke generere tilbagekøbskvitteringsfil for dit land %s (Dit land understøttes ikke)
 ShowWithdraw=Vis Træk
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis faktura mindst en tilbagetrækning betaling endnu ikke behandlet, vil den ikke blive angivet som betales for at tillade at styre tilbagetrækning før.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment 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 record payments to invoices and will classify them as "Paid" if remain to pay is null
-StatisticsByLineStatus=Statistics by status of lines
+DoStandingOrdersBeforePayments=Denne fane giver dig mulighed for at anmode om en ordrebetalingsordre. Når du er færdig, skal du gå ind i menuen Bank-> Direkte debiteringsordrer for at administrere ordren med direkte debitering. Når betalingsordren er lukket, registreres betaling på faktura automatisk, og fakturaen lukkes, hvis resten skal betales, er null.
+WithdrawalFile=Udtagelsesfil
+SetToStatusSent=Sæt til status "Fil sendt"
+ThisWillAlsoAddPaymentOnInvoice=Dette registrerer også betalinger til fakturaer og klassificerer dem som "Betalt", hvis der fortsat skal betales, er null
+StatisticsByLineStatus=Statistikker efter status af linjer
 RUM=UMR
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor’s Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+RUMLong=Unik Mandat Reference
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+WithdrawMode=Direkte debiteringstilstand (FRST eller RECUR)
+WithdrawRequestAmount=Beløb for direkte debitering:
+WithdrawRequestErrorNilAmount=Kunne ikke oprette direkte debitering for tomt beløb.
+SepaMandate=SEPA Direkte Debit Mandat
+SepaMandateShort=SEPA-mandat
+PleaseReturnMandate=Ret venligst denne mandatformular via e-mail til %s eller pr. Mail til
+SEPALegalText=Ved at underskrive denne mandatformular bemyndiger du (A) %s at sende instruktioner til din bank for at debitere din konto og (B) din bank at debitere din konto i overensstemmelse med instruktionerne fra %s. Som en del af dine rettigheder har du ret til refusion fra din bank i henhold til vilkårene for din aftale med din bank. En refusion skal kræves inden for 8 uger fra den dato, hvor din konto blev debiteret. Dine rettigheder vedrørende ovennævnte mandat forklares i en erklæring, som du kan få fra din bank.
+CreditorIdentifier=Kreditoridentifikator
+CreditorName=Kreditorens navn
+SEPAFillForm=(B) Udfyld venligst alle felter markeret *
+SEPAFormYourName=Dit navn
+SEPAFormYourBAN=Dit bankkonto navn (IBAN)
+SEPAFormYourBIC=Din bankidentifikator kode (BIC)
+SEPAFrstOrRecur=Betalings type
+ModeRECUR=Recuurent betaling
+ModeFRST=Engangsbetaling
+PleaseCheckOne=Tjek venligst kun en
+DirectDebitOrderCreated=Direkte debitering %s oprettet
+AmountRequested=Beløb anmodet
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoCreditSubject=Betaling af betaling med direkte debitering %s af banken
+InfoCreditMessage=Betalingsordren %s er betalt af banken. Betalingsdata: %s
+InfoTransSubject=Overførsel af betaling med direkte debitering %s til bank
+InfoTransMessage=Betalingsordre %s er sendt til bank ved %s %s. <br> <br>
 InfoTransData=Beløb: %s <br> Methodology: %s <br> Dato: %s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectSubject=Betalingsordren afvises
+InfoRejectMessage=Hej, <br> <br> Betalingsordre for faktura %s relateret til firmaet %s, med et beløb på %s er blevet afvist af banken. <br> <br> <br> <br> %s
 ModeWarning=Mulighed for real mode ikke var indstillet, vi stopper efter denne simulation
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index bdccd4e6180..2d579a01bca 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -23,6 +23,7 @@ Module70Name=Eingriffe
 Module70Desc=Eingriffsverwaltung
 Module80Name=Sendungen
 Module310Desc=Mitgliederverwaltun
+Module330Name=Lesezeichen
 Module330Desc=Bookmarks-Verwaltung
 Module500Name=Steuern, Sozialbeiträge und Dividenden
 Module500Desc=Steuer-, Sozialbeitrags- und Dividendenverwaltung
diff --git a/htdocs/langs/de_AT/agenda.lang b/htdocs/langs/de_AT/agenda.lang
index d85b84bae06..54235c2b65e 100644
--- a/htdocs/langs/de_AT/agenda.lang
+++ b/htdocs/langs/de_AT/agenda.lang
@@ -35,7 +35,6 @@ DefaultWorkingHours=Arbeitszeit (Bsp.: 09-18)
 ExportCal=exportiere Kalender
 ExtSites=importiere externe Kalender
 ExtSitesEnableThisTool=zeige externe Kalender (in generellen Einsteillungen) in Agenda. Betrifft nicht die die externen Kalender, welche von Benutzern definiert wurden.
-AgendaExtNb=Kalendernummer %s
 ExtSiteUrlAgenda=URL für .lcal
 ExtSiteNoLabel=keine Beschreibung
 VisibleTimeRange=sichtbare Zeitspanne
diff --git a/htdocs/langs/de_AT/compta.lang b/htdocs/langs/de_AT/compta.lang
index 31ae06911a9..34d314ad1a8 100644
--- a/htdocs/langs/de_AT/compta.lang
+++ b/htdocs/langs/de_AT/compta.lang
@@ -8,9 +8,6 @@ MenuSpecialExpenses=Steuern, Sozialbeiträge und Dividenden
 AnnualSummaryDueDebtMode=Die Jahresbilanz der Einnahmen/Ausgaben im Modus<b>%sForderungen-Verbindlichkeiten%s</b> meldet <b>Kameralistik</b>.
 AnnualSummaryInputOutputMode=Die Jahresbilanz der Einnahmen/Ausgaben im Modus <b>%sEinkünfte-Ausgaben%s</b> meldet <b>Ist-Besteuerung</b>.
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden (Steuerbeleg)
-VATReportByCustomersInDueDebtMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden (Steuersatz)
-VATReportByQuartersInInputOutputMode=Quartalsbericht zur vereinnahmten und bezahlten MwSt. (Steuerbeleg)
-VATReportByQuartersInDueDebtMode=Quartalsbericht zur vereinnahmten und bezahlten MwSt.(Steuersatz)
 ProposalStats=Statistik über die Vorschläge
 OrderStats=Statistiken über Bestellungen
 InvoiceStats=Statistik auf Rechnungen
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index 3b9f0f64df5..b82edb31dba 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -89,3 +89,4 @@ ViewList=Liste anzeigen
 RelatedObjects=Ähnliche Dokumente
 Calendar=Kalender
 SearchIntoInterventions=Eingriffe
+AssignedTo=zugewisen an
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 735083435a1..f706a96d0dd 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
+Chartofaccounts=Kontenplan
 MenuBankAccounts=Kontenübersicht
 Vide=Id. Prof. 6
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index c83802037c0..a869d00e737 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -6,7 +6,10 @@ VersionLastUpgrade=Version der letzten Aktualisierung
 FileCheckDolibarr=Überprüfen Sie die Integrität der Anwendungsdateien
 AvailableOnlyOnPackagedVersions=Die lokale Datei für die Integritätsprüfung ist nur dann verfügbar, wenn die Anwendung von einem offiziellen Paket installiert wurde
 XmlNotFound=Xml Integritätsdatei der Anwendung ​​nicht gefunden
+SessionSaveHandler=Handler für Sitzungsspeicherung
 ConfirmPurgeSessions=Wollen Sie wirklich alle Sessions beenden ? Dadurch werden alle Benutzer getrennt (ausser Ihnen)
+NoSessionListWithThisHandler=Anzeige der aktiven Sitzungen mit Ihrer PHP-Konfiguration nicht möglich.
+ConfirmLockNewSessions=Möchten Sie wirklich alle Sitzungen bis auf Ihre eigene blocken? Nur Benutzer <b>%s</b> kann danach noch eine Verbindung aufbauen.
 ClientCharset=Benutzer-Zeichensatz
 FormToTestFileUploadForm=Formular für das Testen von Datei-Uplads (je nach Konfiguration)
 SecurityFilesDesc=Sicherheitseinstellungen für den Dateiupload definieren.
@@ -103,6 +106,7 @@ Module70Name=Arbeitseinsätze
 Module80Name=Auslieferungen
 Module240Desc=Werkzeug zum Datenexport (mit Assistent)
 Module250Desc=Werkzeug zum Dateninport (mit Assistent)
+Module330Name=Lesezeichen
 Module330Desc=Lesezeichenverwaltung
 Module1200Desc=Mantis-Integation
 Module2000Desc=Texte mit dem WYSIWYG Editor bearbeiten (Basierend auf CKEditor)
@@ -126,6 +130,8 @@ Permission187=Lieferantenbestellungen schliessen
 Permission188=Lieferantenbestellungen verwerfen
 Permission193=Leitungen abbrechen
 Permission203=Bestellungsverbindungen Bestellungen
+Permission331=Lesezeichen einsehen
+Permission332=Lesezeichen erstellen/bearbeiten
 Permission525=Darlehens-rechner
 Permission1188=Lieferantenbestellungen schliessen
 Permission2414=Aktionen und Aufgaben anderer exportieren
@@ -147,9 +153,6 @@ LocalTax1IsNotUsedDescES=Standardmässig werden die vorgeschlagenen RE 0 ist. En
 LocalTax2IsUsedDescES=Die RE Rate standardmässig beim Erstellen Aussichten, Rechnungen, Bestellungen etc. folgen die aktive Standard-Regel: <br> Ist der Verkäufer nicht zu IRPF ausgesetzt, dann durch IRPF default = 0. Ende der Regel. <br> Ist der Verkäufer zur IRPF dann der Einkommenssteuer unterworfen standardmässig. Ende der Regel. <br>
 LocalTax2IsNotUsedDescES=Standardmässig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel.
 LocalTax2IsNotUsedExampleES=In Spanien sind sie bussines nicht der Steuer unterliegen System von Modulen.
-MenuCompanySetup=Firma/Organisation
-CompanyInfo=Firmen-/Organisationsinformationen
-CompanyIds=Firmen-/Organisations-IDs
 Delays_MAIN_DELAY_ACTIONS_TODO=Verzögerungstoleranz (in Tagen) vor Warnung für nicht erledigte Ereignisse
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Verzögerungstoleranz (in Tagen) vor Warnung für nicht fristgerecht geschlossene Projekte
 Delays_MAIN_DELAY_TASKS_TODO=Verzögerungstoleranz (in Tagen) vor Warnung für nicht erledigte Projektaufgaben
@@ -167,7 +170,7 @@ SystemAreaForAdminOnly=Dieser Bereich steht ausschliesslich Administratoren zur
 TriggersDesc=Trigger sind Dateien, die nach einem Kopieren in das Verzeichnis <b>htdocs/core/triggers</b> das Workflow-Verhalten des Systems beeinflussen. Diese stellen neue, mit Systemereignissen verbundene, Ereignisse dar (Neuer Geschäftspartner angelegt, Rechnung freigegeben, ...).
 TriggerDisabledByName=Trigger in dieser Datei sind durch das <b>-NORUN</b>-Suffix in ihrem Namen deaktviert.
 DictionaryDesc=Definieren Sie hier alle Defaultwerte. Sie können die vordefinierten Werte mit ihren eigenen ergänzen.
-ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen, die auf den vorherigen Seiten nicht verfügbar sind. Dies sind meist reservierte Parameter für Entwickler oder für die erweiterte Fehlersuche. Für eine Liste von Optionen <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="externe Seite - öffnet sich in einem neuen Fenster" target="_blank"> hier überprüfen </ </a>.
+ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen, die auf den vorherigen Seiten nicht verfügbar sind. Dies sind meist reservierte Parameter für Entwickler oder für die erweiterte Fehlersuche. Für eine Liste von Optionen <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="externe Seite - öffnet sich in einem neuen Fenster" target="_blank"> hier überprüfen  </a>.
 MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier definiert.
 MAIN_ROUNDING_RULE_TOT=Rundungseinstellung (Für Länder in denen nicht auf 10er basis Gerundet wird. zB. 0.05 damit in 0.05 Schritten gerundet wirb)
 TotalPriceAfterRounding=Gesamtpreis (Netto/MwSt./Brutto) gerundet
@@ -228,7 +231,9 @@ SummaryOfVatExigibilityUsedByDefault=Standardmässiger Zeitpunkt der MwSt.-Fäll
 ClickToDialUseTelLinkDesc=Verwenden Sie diese Methode wenn ein Softphone oder eine andere Telefonielösung auf dem Computer ist. Es wird ein "tel:" Link generiert. Wenn Sie eine Serverbasierte Lösung benötigen, setzen Sie dieses Feld auf Nein und geben die notwendigen Daten im nächsten Feld ein.
 CashDeskThirdPartyForSell=Standardgeschäftspartner für Kassenverkäufe
 StockDecreaseForPointOfSaleDisabled=Lagerrückgang bei Verwendung von Point of Sale deaktivert
+BookmarkSetup=Lesezeichenmoduleinstellungen
 BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Ausserdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
+NbOfBoomarkToShow=Maximale Anzeigeanzahl Lesezeichen im linken Menü
 ApiSetup=API-Modul-Setup
 ChequeReceiptsNumberingModule=Checknumerierungsmodul
 MultiCompanySetup=Multi-Company-Moduleinstellungen
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index 7f1b7b8ce07..2aadfaf73d8 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -67,9 +67,6 @@ PaymentOnDifferentThirdBills=Erlaube Zahlungen an andere Partner, aber mit gleic
 FrequencyPer_d=Alle %s Tage
 NextDateToExecution=Datum der nächsten Rechnungsstellung
 DateLastGeneration=Datum der letzten Rechnungsstellung
-MaxPeriodNumber=Maximal Anzahl der generierten Rechnungen
-NbOfGenerationDone=Anzahl der schon erstellten Rechnungen
-MaxGenerationReached=Maximal Anzahl der Generierungen erreicht
 GeneratedFromRecurringInvoice=Aus wiederkehrender Rechnungsvorlage %s erstellt
 InvoiceGeneratedFromTemplate=Rechnung %s aus wiederkehrender Rechnungsvorlage %s erstellt
 PaymentConditionShort30DENDMONTH=30 Tage ab Ende des Monats
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index ae8eb5be5ba..765b9737c53 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -17,8 +17,6 @@ ThirdPartyType=Typ des Geschäftspartners
 PostOrFunction=Position
 PhoneShort=Telefon
 No_Email=Keine E-Mail-Kampagnen
-VATIsUsed=MwSt.-pflichtig
-VATIsNotUsed=Nicht MwSt-pflichtig
 ThirdpartyNotCustomerNotSupplierSoNoRef=Adresse ist weder Kunde noch Lieferant, keine Objekte zum Verknüpfen verfügbar
 OverAllSupplierProposals=Generelle Preisanfragen
 LocalTax1IsUsed=Zweite Steuer verwenden
@@ -68,8 +66,6 @@ ProfId4US=Id. Prof. 6
 ProfId5US=Id. Prof. 6
 ProfId6US=Id. Prof. 6
 ProfId1RU=Prof ID 1 (OGRN)
-VATIntra=Umsatzsteuer-Identifikationsnummer
-VATIntraShort=MwSt.-Nr.
 CustomerCard=Kundenkarte
 CustomerRelativeDiscountShort=Rabatt rel.
 CustomerAbsoluteDiscountShort=Rabatt abs.
@@ -98,7 +94,6 @@ OthersNotLinkedToThirdParty=Andere, nicht mit einem Geschäftspartner verknüpft
 TE_GROUP=Grossunternehmen
 ContactNotLinkedToCompany=Kontakt keinem Geschäftspartner zugeordnet
 DolibarrLogin=Dolibarr Benutzername
-ImportDataset_company_4=Geschäftspartner / Aussendienstmitarbeiter (Auswirkung Aussendienstmitarbeiter  an Unternehmen)
 ConfirmDeleteFile=Sind Sie sicher dass Sie diese Datei löschen möchten?
 AllocateCommercial=Vertriebsmitarbeiter zuweisen
 Organization=Organisation
@@ -111,6 +106,4 @@ InActivity=Offen
 OutstandingBillReached=Kreditlimit erreicht
 MergeOriginThirdparty=Geschäftspartner duplizieren (Geschäftspartner, den Sie löschen möchten)
 MergeThirdparties=Zusammenführen von Geschäftspartnern
-ThirdpartiesMergeSuccess=Geschäftspartner wurden zusammengelegt
 SaleRepresentativeLogin=Login des Verkaufsmitarbeiters
-ErrorThirdpartiesMerge=Es gab einen Fehler beim Löschen des Geschäftspartners. Bitte überprüfen Sie das Protokoll. Änderungen wurden rückgängig gemacht.
diff --git a/htdocs/langs/de_CH/compta.lang b/htdocs/langs/de_CH/compta.lang
index 9335f85f947..a7d3db84884 100644
--- a/htdocs/langs/de_CH/compta.lang
+++ b/htdocs/langs/de_CH/compta.lang
@@ -20,12 +20,8 @@ CalcModeVATDebt=Modus <b>%s Mwst. auf Engagement Rechnungslegung %s</b>.
 CalcModeLT2Rec=Modus <b>%sIRPF aufLieferantenrechnungen%s</b>
 SeeReportInInputOutputMode=Der <b>%sEinkünfte-Ausgaben%s</b>-Bericht medlet <b>Istbesteuerung</b> für eine Berechnung der tatsächlich erfolgten Zahlungsströme.
 RulesResultDue=- Dies beinhaltet ausstehende Rechnungen, Aufwendungen, Mehrwertsteuern, Abgaben, ob sie bezahlt wurden oder nicht. Auch die gezahlten Gehälter. <br> - Es gilt das Freigabedatum von den Rechnungen und MwSt., sowie das Fälligkeitsdatum für Aufwendungen. Für Gehälter definiert mit dem Modul Löhne, wird das Valutadatum der Zahlung verwendet.
-LT2ReportByCustomersInInputOutputModeES=Bericht von Geschäftspartner EKSt.
-VATReport=MWsT Bericht
+LT2ReportByCustomersES=Bericht von Geschäftspartner EKSt.
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden
-VATReportByCustomersInDueDebtMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden
-VATReportByQuartersInInputOutputMode=Quartalsbericht zur vereinnahmten und bezahlten MwSt.
-VATReportByQuartersInDueDebtMode=Quartalsbericht zur vereinnahmten und bezahlten MwSt.
 SeeVATReportInInputOutputMode=Siehe <b>%sMwSt.-Einnahmen%s</b>-Bericht für eine standardmässige Berechnung
 SeeVATReportInDueDebtMode=Siehe <b>%sdynamischen MwSt.%s</b>-Bericht für eine Berechnung mit dynamischer Option
 ThirdPartyMustBeEditAsCustomer=Geschäftspartner muss als Kunde definiert werden
diff --git a/htdocs/langs/de_CH/cron.lang b/htdocs/langs/de_CH/cron.lang
index 97e84256b49..cc4ff19f7eb 100644
--- a/htdocs/langs/de_CH/cron.lang
+++ b/htdocs/langs/de_CH/cron.lang
@@ -3,7 +3,6 @@ CronMethodDoesNotExists=Klasse %s hat keine %s Methode
 EnabledAndDisabled=Aktiviert und deaktiviert
 CronDtStart=Nicht vor
 CronDtEnd=Nicht nach
-CronMaxRun=Max. Anzahl Starts
 JobFinished=Job gestarted und beendet
 UseMenuModuleToolsToAddCronJobs=Öffnen Sie das Menü "Start - Module Werkzeuge - Cronjob Liste" um geplante Skript-Aufgaben zu sehen und zu verändern.
 JobDisabled=Job deaktiviert
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index 42f80ed12a7..c9a1034fad6 100644
--- a/htdocs/langs/de_CH/errors.lang
+++ b/htdocs/langs/de_CH/errors.lang
@@ -18,6 +18,7 @@ ErrorWarehouseRequiredIntoShipmentLine=Warenlager ist auf der Lieferzeile erford
 ErrorFileMustHaveFormat=Datei muss das Format %s haben
 ErrorSupplierCountryIsNotDefined=Zu diesem Lieferant ist kein Land definiert. Bitte korrigieren Sie dies zuerst.
 ErrorsThirdpartyMerge=Die zwei Einträge können nicht zusammengeführt werden. Aktion abgebrochen.
+WarningBookmarkAlreadyExists=Ein Lesezeichen mit diesem Titel oder Ziel (URL) existiert bereits.
 WarningPassIsEmpty=Warnung: Derzeit ist kein Datenbankpasswort gesetzt. Dies ist eine Sicherheitslücke. Konfigurieren Sie ehestmöglich ein Passwort für den Datenbankzugriff und passen Sie Ihre conf.php entsprechend an.
 WarningNoDocumentModelActivated=Für das Erstellen von Dokumenten ist keine Vorlage gewählt. Eine Vorlage wird standardmässig ausgewählt, bis Sie die Moduleinstellungen angepasst haben.
 WarningSomeLinesWithNullHourlyRate=Einige Zeiten wurden durch Benutzer erfasst bei denen der Stundenansatz nicht definiert war. Ein Stundenansatz von 0 %s pro Stunde wird verwendet, was aber Fehlerhafte Zeitauswertungen zur Folge haben kann.
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index f235b6a7e1a..4f8e320d1c1 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -69,11 +69,11 @@ RefPayment=Zahlungs-Nr.
 ActionsToDo=unvollständige Ereignisse
 ActionsToDoShort=Zu erledigen
 ActionRunningNotStarted=Nicht begonnen
-CompanyFoundation=Firma/Organisation
 ContactsForCompany=Ansprechpartner/Adressen dieses Geschäftspartners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Geschäftspartner
 AddressesForCompany=Adressen für den Geschäftspartner
 ActionsOnCompany=Ereignisse zu diesem Geschäftspartner
+ToDo=Zu erledigen
 Generate=Erstelle
 Refused=zurückgewiesen
 Validated=Freigegeben
@@ -112,7 +112,7 @@ ShortTuesday=D
 ShortWednesday=M
 ShortThursday=D
 Select2Enter=Eingabe
-SearchIntoThirdparties=Drittparteien
+SearchIntoThirdparties=Geschäftspartner
 SearchIntoCustomerProposals=Angebote Kunde
 SearchIntoInterventions=Arbeitseinsätze
 SearchIntoCustomerShipments=Kundenlieferungen
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 0709b29c82b..06f8e227a90 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -7,7 +7,6 @@ ThirdpartyNotLinkedToMember=Partner nicht mit einem Mitglied verknüpft
 FundationMembers=Gründungsmitglieder
 ListOfValidatedPublicMembers=Liste der verifizierten öffentlichen Mitglieder
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Ein anderes Mitglied (Name: <b>%s</b>, login: <b>%s</b>) ist schon mit Partner <b>%s</b> verknüpft. Entfernen Sie zuerst die Verknüpfung, da immer nur ein Mitglied zugewiesen sein kann (und umgekehrt).
-CardContent=Inhalt Ihrer Mitgliederkarte
 SetLinkToUser=Verknüpfung zu Dolibarr Benutzer
 SetLinkToThirdParty=Verknüpfung zu Dolibarr Partner
 MembersList=Mitgliederliste
@@ -30,6 +29,7 @@ WelcomeEMail=Begrüssungsemail
 SubscriptionRequired=Abonnement notwendig
 VoteAllowed=Abstimmen erlaubt
 ShowSubscription=Abonnement anzeigen
+CardContent=Inhalt Ihrer Mitgliederkarte
 HTPasswordExport=htpassword Datei generieren
 MembersAndSubscriptions=Mitglieder und Abonnemente
 SubscriptionPayment=Zahlung des Mitgliedsbeitrags
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index 108767ba85f..66d6eeb8879 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -20,6 +20,7 @@ SellingPrices=Verkaufspreise
 BuyingPrices=Einkaufspreise
 CustomerPrices=Kunden Preise
 SuppliersPrices=Lieferanten Preise
+unitS=Zweitens
 ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
 FillBarCodeTypeAndValueFromProduct=Barcode-Typ und -Wert von einem Produkt wählen.
 PriceByCustomer=Unterschiedliche Preise je nach Kunde
diff --git a/htdocs/langs/de_CH/trips.lang b/htdocs/langs/de_CH/trips.lang
index a2725b67289..ec0e134315d 100644
--- a/htdocs/langs/de_CH/trips.lang
+++ b/htdocs/langs/de_CH/trips.lang
@@ -1,6 +1,8 @@
 # Dolibarr language file - Source file is en_US - trips
 ShowExpenseReport=Spesenreport anzeigen
+TripsAndExpenses=Reise- und Fahrtspesen
 TripCard=Reisekosten Karte
+AddTrip=Reisekostenabrechnung erstellen
 ListOfTrips=Liste Reise- und Spesenabrechnungen
 TypeFees=Spesen- und Kostenarten
 ShowTrip=Spesenreport anzeigen
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
index b76caf46b57..707c89ca841 100644
--- a/htdocs/langs/de_CH/withdrawals.lang
+++ b/htdocs/langs/de_CH/withdrawals.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 ThirdPartyBankCode=BLZ Geschäftspartner
-NoInvoiceCouldBeWithdrawed=Keine Rechnung erfolgreich abgebucht. Überprüfen Sie die Kontonummern der den Rechnungen zugewiesenen Geschäftspartnern.
 WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Geschäftspartner erstellen?
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 31e544ccb44..1a08317710a 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -21,7 +21,7 @@ Journalization=Journalisieren
 Journaux=Journale
 JournalFinancial=Finanzjournale
 BackToChartofaccounts=Zurück zum  Kontenplan
-Chartofaccounts=Kontenplan
+Chartofaccounts=Konten
 CurrentDedicatedAccountingAccount=Aktuelles dediziertes Konto
 AssignDedicatedAccountingAccount=Neues Konto zuweisen
 InvoiceLabel=Rechnungsanschrift
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften L
 Doctype=Dokumententyp
 Docdate=Datum
 Docref=Referenz
-Code_tiers=Partner
 LabelAccount=Konto-Beschriftung
 LabelOperation=Bezeichnung der Operation
 Sens=Zweck
@@ -169,7 +168,6 @@ DelYear=Jahr zu entfernen
 DelJournal=Journal zu entfernen
 ConfirmDeleteMvt=Es werden alle Zeilen des Hauptbuchs für Jahr und/oder eines bestimmten Journals gelöscht. Mindestens ein Kriterium ist erforderlich.
 ConfirmDeleteMvtPartial=Die Buchung wird aus dem Hauptbuch gelöscht (Alle Einträge aus dieser Buchung werden gelöscht)
-DelBookKeeping=Eintrag im Hauptbuch löschen
 FinanceJournal=Finanzjournal
 ExpenseReportsJournal=Spesenabrechnungsjournal
 DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto
@@ -180,7 +178,7 @@ ProductAccountNotDefined=Konto für Produkt nicht definiert
 FeeAccountNotDefined=Konto für Gebühr nicht definiert
 BankAccountNotDefined=Konto für Bank nicht definiert
 CustomerInvoicePayment=Rechnungszahlung (Kunde)
-ThirdPartyAccount=Partner Konto
+ThirdPartyAccount=Konto des Partners
 NewAccountingMvt=Erstelle Transaktion
 NumMvts=Transaktionsnummer
 ListeMvts=Liste der Bewegungen
@@ -220,7 +218,7 @@ ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchhaltungskonto ni
 MvtNotCorrectlyBalanced=Der Saldo der Buchung ist nicht ausgeglichen. Haben = %s. Soll = %s
 FicheVentilation=Zuordnungs Karte
 GeneralLedgerIsWritten=Operationen werden ins Hauptbuch geschrieben
-GeneralLedgerSomeRecordWasNotRecorded=Einige der Buchungen konnten nicht übernommen werden. Es gab keine Fehler, vermutlich wurden diese Buchungen schon früher übernommen.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=Keine weiteren Einträge zum Übernehmen
 ListOfProductsWithoutAccountingAccount=Liste der Produkte, die nicht an ein Buchhaltungskonto gebunden sind
 ChangeBinding=Ändern der Zuordnung
@@ -236,13 +234,15 @@ AccountingJournal=Buchhaltungsjournal
 NewAccountingJournal=Neues Buchhaltungsjournal
 ShowAccoutingJournal=Buchhaltungsjournal anzeigen
 Nature=Art
-AccountingJournalType1=Verschiedene Aktionen
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Verkauf
 AccountingJournalType3=Einkauf
 AccountingJournalType4=Bank
 AccountingJournalType5=Spesenabrechnungen
+AccountingJournalType8=Inventur
 AccountingJournalType9=Hat neue
 ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird bereits verwendet
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Entwurfsjournal exportieren
@@ -284,6 +284,8 @@ Formula=Formel
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Einige zwingende Einstellungen wurden nicht gemacht, bitte vervollständigen sie die Einrichtung
 ErrorNoAccountingCategoryForThisCountry=Keine Buchhaltung Kategorie für das Land %s verfügbar (siehe Startseite - Einstellungen - Stammdaten)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Das eingestellte Exportformat wird von deiser Seite nicht unterstützt
 BookeppingLineAlreayExists=Datensätze existieren bereits in der Buchhaltung
 NoJournalDefined=Kein Journal definiert
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index c6b101c0a32..2acd876d91c 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -26,13 +26,13 @@ FileCheckDolibarr=Überprüfen Sie die Integrität von Anwendungsdateien
 AvailableOnlyOnPackagedVersions=Die lokale Datei für die Integritätsprüfung ist nur dann verfügbar, wenn die Anwendung von einem offiziellen Paket installiert ist
 XmlNotFound=Xml Integrität Datei der Anwendung ​​nicht gefunden
 SessionId=ID Session
-SessionSaveHandler=Handler für Sitzungsspeicherung
+SessionSaveHandler=Session Handler
 SessionSavePath=Pfad für Sitzungsdatenspeicherung
 PurgeSessions=Bereinigung von Sessions
-ConfirmPurgeSessions=Wollen Sie wirklich alle Sessions beenden ? Dadurch werden alle Benutzer getrennt (ausser diesem)
-NoSessionListWithThisHandler=Anzeige der aktiven Sitzungen mit Ihrer PHP-Konfiguration nicht möglich.
+ConfirmPurgeSessions=Wollen Sie wirklich alle Sitzungen beenden ? Dadurch werden alle Benutzer getrennt (ausser Ihnen)
+NoSessionListWithThisHandler=Anzeige aller aktiven Sitzungen mit Ihrer PHP-Konfiguration nicht möglich.
 LockNewSessions=Keine neuen Sitzungen zulassen
-ConfirmLockNewSessions=Möchten Sie wirklich alle Sitzungen bis auf Ihre eigene blocken? Nur Benutzer <b>%s</b> kann danach noch eine Verbindung aufbauen.
+ConfirmLockNewSessions=Möchten Sie wirklich alle Sitzungen bis auf Ihre eigene blockieren? Nur Benutzer <b>%s</b> kann danach noch eine Verbindung aufbauen.
 UnlockNewSessions=Sperrung neuer Sitzungen aufheben
 YourSession=Ihre Sitzung
 Sessions=Benutzer-Sessions
@@ -126,7 +126,7 @@ PHPTZ=Zeitzone der PHP-Version
 DaylingSavingTime=Sommerzeit (Benutzer)
 CurrentHour=PHP-Zeit (Server)
 CurrentSessionTimeOut=Aktuelle Session timeout
-YouCanEditPHPTZ=Um eine andere PHP-Zeitzone zu setzen (nicht erforderlich), können Sie eine .htaccess-Datei mit einer Zeile wie  "SetEnv TZ Europe / Paris" erstellen. 
+YouCanEditPHPTZ=Um eine andere PHP-Zeitzone zu setzen (nicht erforderlich), können Sie eine .htaccess-Datei mit einer Zeile wie  "SetEnv TZ Europe / Paris" erstellen.
 HoursOnThisPageAreOnServerTZ=Warnung: Im Gegensatz zu anderen Darstellungen, sind Stunden auf dieser Seite nicht in Ihrer lokalen Zeitzone, sondern in der Zeitzone des Servers.
 Box=Box
 Boxes=Boxen
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
 BoxesDesc=Boxen sind auf einigen Seiten angezeigte Informationsbereiche. Sie können die Anzeige einer Box einstellen, indem Sie auf die Zielseite klicken und 'Aktivieren' wählen. Zum Ausblenden einer Box klicken Sie einfach auf den Papierkorb.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
-ModulesDesc=Die Module bestimmen, welche Funktionalität in Dolibarr verfügbar ist. Manche Module erfordern zusätzlich Berechtigungen die Benutzern zugewiesen werden muss, nachdem das Modul aktiviert wurde. \nKlicken Sie auf die Schaltfläche on/off, um ein Modul/Anwendung zu aktivieren. 
+ModulesDesc=Die Module bestimmen, welche Funktionalität in Dolibarr verfügbar ist. Manche Module erfordern zusätzlich Berechtigungen die Benutzern zugewiesen werden muss, nachdem das Modul aktiviert wurde. \nKlicken Sie auf die Schaltfläche on/off, um ein Modul/Anwendung zu aktivieren.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
 ModulesDeployDesc=Wenn die Rechte Ihres Dateisystems es zulassen, können Sie mit diesem Werkzeug ein externes Modul installieren. Es wird dann im Reiter <strong>%s</strong> erscheinen.
 ModulesMarketPlaces=Suche externe Module
@@ -205,7 +205,7 @@ FreeModule=Frei
 CompatibleUpTo=Kompatibel mit Version %s
 NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=Siehe Marktplatz 
+SeeInMarkerPlace=Siehe Marktplatz
 Updated=Aktualisiert
 Nouveauté=Neuheit
 AchatTelechargement=Kaufen / Herunterladen
@@ -269,7 +269,7 @@ MAIN_MAIL_SMTP_SERVER=SMTP-Host (standardmäßig in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-Port (nicht in PHP definiert in Unix-Umgebungen)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-Host (nicht in PHP definiert auf Unix-Umgebungen)
 MAIN_MAIL_EMAIL_FROM=E-Mail-Absender für automatisch erzeugte Mails (standardmäßig in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=E-Mailadresse, die in E-Mails als Feld "Fehler an" verwendet wird
 MAIN_MAIL_AUTOCOPY_TO= Senden Sie automatisch eine Blindkopie aller gesendeten Mails an
 MAIN_DISABLE_ALL_MAILS=Alle E-Mail-Funktionen deaktivieren (für Test- oder Demozwecke)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
 MassConvert=Starte Massenkonvertierung
 String=Zeichenkette
 TextLong=Langer Text
+HtmlText=HTML-Text
 Int=Ganzzahl
 Float=Fließkommazahl
 DateAndTime=Datum und Uhrzeit
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Kontrollkästchen aus Tabelle
 ExtrafieldLink=Verknüpftes Objekt
 ComputedFormula=Berechnetes Feld
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Die Liste muss im Format: Schlüssel, Wert sein (wobei der Schlüssel nicht '0' sein kann) <br> <br> zum Beispiel: <br> 1, Wert1 <br> 2, Wert2 <br> 3, Wert3 <br> ...
 ExtrafieldParamHelpradio=Die Liste muss im Format: Schlüssel, Wert sein (wobei der Schlüssel nicht '0' sein kann) <br> <br> zum Beispiel: <br> 1, Wert1 <br> 2, Wert2 <br> 3, Wert3 <br> ...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Bibliothek zum erstellen von PDF
-WarningUsingFPDF=Achtung: Ihre <b>conf.php</b> enthält <b>$dolibarr_pdf_force_fpdf=1</b> Dies bedeutet, dass Sie die FPDF-Bibliothek verwenden, um PDF-Dateien zu erzeugen. Diese Bibliothek ist alt und unterstützt viele Funktionen nicht (Unicode-, Bild-Transparenz, kyrillische, arabische und asiatische Sprachen, ...), so dass es zu Fehlern bei der PDF-Erstellung kommen kann. <br> Um dieses Problem zu beheben und volle Unterstützung der PDF-Erzeugung zu erhalten, laden Sie bitte die <a href="http://www.tcpdf.org/" target="_blank">TCPDF Bibliothek</a> , dann kommentieren Sie die Zeile <b>$dolibarr_pdf_force_fpdf=1</b> aus oder entfernen diese und fügen statt dessen <b>$dolibarr_lib_TCPDF_PATH='Pfad_zum_TCPDF_Verzeichnisr'</b> ein
 LocalTaxDesc=In einigen Ländern gelten zwei oder drei Steuern auf jeder Rechnungszeile. Wenn dies der Fall ist, wählen Sie den Typ für die zweite und dritte Steuer und den Steuersatz. Mögliche Arten sind: <br> 1: Ortsteuer gelten für Produkte und Dienstleistungen, ohne Mehrwertsteuer (Ortssteuer wird ohne Berücksichtigung der MwSt berechnet) <br> 2: Ortssteuer gilt für Produkte und Dienstleistungen mit Mehrwertsteuer (Ortssteuer wird mit Berücksichtigung det MwSt berechnet) <br> 3: Ortstaxe gilt für Produkte ohne Mehrwertsteuer (Ortssteuer wird ohne Berücksichtigung der MwSt berechnet) <br> 4: Ortssteuer gilt für Produkte, mit Mehrwertsteuer (Ortssteuer wird mit Berücksichtigung der MwSt berechnet) <br> 5: Ortssteuer gilt für Dienstleistungen, ohne Mehrwertsteuer (Ortssteuer wird ohne Berücksichtigung der MwSt berechnet) <br> 6: Ortssteuer gilt für Dienstleistungen mit Mehrwertsteuer (Ortssteuer wird mit Berücksichtigung der MwSt berechnet)
 SMS=SMS
 LinkToTestClickToDial=Geben Sie die anzurufende Telefonnr ein, um einen Link zu zeigen, mit dem die ClickToDial-URL für den Benutzer <strong>%s</strong> getestet werden kann
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=Standardmäßig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zu erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie wenn ein Benutzer beide Rechte hat - zum erstellen und freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie ein zusätzlicher Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag übersteigt wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie den Feld leer wenn eine Freigabe (2 Schritte) ausreicht; Tragen Sie einen sehr niedrigen Wert (0.1) wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-Fach Verarbeitungsschritte verwenden wenn der Betrag (ohne Steuer) höher ist als ...
-WarningPHPMail=Achtung: Einige Mail-Server (Yahoo) erlaubt keine E-Mails von einem anderen Server als ihre Postadresse zu senden, wenn verwendet wird, ist eine Yahoo-Adresse (myemail@yahoo.fr, myemail@yahoo.com. Ihre aktuelle Konfiguration com ...) verwendet den Anwendungsserver für die E-Mails zu senden. Der Server von einigen Empfängern (kompatibel mit dem restriktiven Protokoll DMARC) fragt Yahoo-Servern Erlaubnis E-Mails und Yahoo erhalten zu verweigern, da der Server nicht ein Server von Yahoo gehört, als Teil Ihrer e- werden nicht gesendet Mails reçus.<br>\nWenn Ihr E-Mail-Provider (wie Yahoo) Diese Einschränkung auferlegt, müssen Sie Ihre Konfiguration ändern und ein anderes Verfahren zum Senden von „SMTP-Server“ wählen, indem das SMTP-Kennwort von Ihrer ISP eingeben (fragen Ihre Mail-Flex Gehäuse)
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Klicke um die Beschreibung zu sehen
 DependsOn=Diese Modul benötigt die folgenden Module
 RequiredBy=Diese Modul wird durch folgende Module verwendet
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Wasserzeichen auf Entwurf von Ausgabenbelegen
 AttachMainDocByDefault=Setzen Sie diesen Wert auf 1, wenn Sie das Hauptdokument standardmäßig per E-Mail anhängen möchten (falls zutreffend).
 FilesAttachedToEmail=Datei hinzufügen
 SendEmailsReminders=Erinnerung per E-Mail versenden
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Benutzer und Gruppen
 Module0Desc=Benutzer / Mitarbeiter und Gruppen Administration
@@ -507,7 +510,7 @@ Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Telefonie
 Module56Desc=Telefonie-Integration
-Module57Name=Bestellung mit Zahlart Lastschrift 
+Module57Name=Bestellung mit Zahlart Lastschrift
 Module57Desc=Verwaltung von Lastschrift-Bestellungen. Inklusive SEPA Erzeugung für EU Länder.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
@@ -537,8 +540,8 @@ Module310Name=Mitglieder
 Module310Desc=Management von Mitglieder einer Stiftung/Vereins
 Module320Name=RSS Feed
 Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen
-Module330Name=Lesezeichen
-Module330Desc=Verwalten von Lesezeichen
+Module330Name=Favoriten
+Module330Desc=Verwalten von Favoriten
 Module400Name=Projekte / Chancen / Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webkalender
@@ -563,7 +566,7 @@ Module1120Desc=Anfordern von Lieferanten-Angeboten und Preise
 Module1200Name=Mantis
 Module1200Desc=Mantis-Integration
 Module1520Name=Dokumente erstellen
-Module1520Desc= Mailings Dokumente erstellen
+Module1520Desc=Mailings Dokumente erstellen
 Module1780Name=Kategorien/#tags
 Module1780Desc=Kategorien erstellen (Produkte, Kunden, Lieferanten, Kontakte oder Mitglieder)
 Module2000Name=FCKeditor
@@ -574,7 +577,7 @@ Module2300Name=Geplante Aufträge
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
 Module2400Name=Ereignisse/Termine
 Module2400Desc=Folgeereignisse oder Termine. Ereignisse manuell in der Agenda erfassen oder Applikationen erlauben Termine zur Nachverfolgung zu erstellen.
-Module2500Name=DMS / ECM
+Module2500Name=DMS / CMS
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Webservice (SOAP Server)
 Module2600Desc=Aktivieren Sie Dolibarr SOAP Server,  unterstütztes API-Service.
@@ -610,7 +613,7 @@ Module50100Desc=Modul Point of Sale (POS)\n
 Module50200Name=Paypal
 Module50200Desc=Modul um Online Zahlungen via PayPal entgegenzunehmen. Ihre Kunden können damit freie Zahlungen machen, oder Dolibarr Objekte (Rechnungen, Bestelltungen...) bezahlen
 Module50400Name=Buchhaltung (erweitert)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Buchhaltung (doppelte Buchungen, Unterstützung von Haupt- und Nebenbüchern)
 Module54000Name=PrintIPP
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein)
 Module55000Name=Befragung, Umfrage oder Abstimmung
@@ -619,6 +622,8 @@ Module59000Name=Gewinnspannen
 Module59000Desc=Modul zur Verwaltung von Gewinnspannen
 Module60000Name=Kommissionen
 Module60000Desc=Modul zur Verwaltung von Kommissionen
+Module62000Name=Incoterm
+Module62000Desc=Funktion hinzufügen um Incoterms zu verwalten
 Module63000Name=Ressourcen
 Module63000Desc=Verwalte Ressourcen (Drucker, Fahrzeuge, Räume, etc.) für Ereignisse.
 Permission11=Rechnungen einsehen
@@ -688,7 +693,7 @@ Permission142=Projekte und Aufgaben erstellen und ändern (Auch private Projekte
 Permission144=Löschen Sie alle Projekte und Aufgaben (einschließlich privater Projekte in denen ich kein Kontakt bin)
 Permission146=Lieferanten einsehen
 Permission147=Statistiken einsehen
-Permission151=Bestellung mit Zahlart Lastschrift 
+Permission151=Bestellung mit Zahlart Lastschrift
 Permission152=Lastschriftaufträge erstellen/bearbeiten
 Permission153=Bestellungen mit Zahlart Lastschrift übertragen
 Permission154=Lastschriftaufträge genehmigen/ablehnen
@@ -760,8 +765,8 @@ Permission301=Barcodes erstellen/bearbeiten
 Permission302=Barcodes löschen
 Permission311=Leistungen einsehen
 Permission312=Leistung/Abonnement einem Vertrag zuordnen
-Permission331=Lesezeichen einsehen
-Permission332=Lesezeichen erstellen/bearbeiten
+Permission331=Favoriten einsehen
+Permission332=Favoriten erstellen/bearbeiten
 Permission333=Lesezeichen löschen
 Permission341=Eigene Berechtigungen einsehen
 Permission342=Eigene Benutzerinformationen erstellen/bearbeiten
@@ -833,11 +838,11 @@ Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1322=Eine bezahlte Rechnung wieder öffnen
 Permission1421=Exportieren von Kundenaufträge und Attribute
-Permission20001=Urlaubsanträge einsehen (eigene und die der Untergebenen)
-Permission20002=Ihre eigenen Urlaubsanträge erstellen/bearbeiten
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Urlaubsanträge löschen
-Permission20004=Spesenabrechnungen einsehen  (Alle Benutzer)
-Permission20005=Urlaubsanträge für Jeden erstellen/bearbeiten
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Urlaubstage Administrieren (Setup- und Aktualisierung)
 Permission23001=anzeigen cronjobs
 Permission23002=erstellen/ändern cronjobs
@@ -884,10 +889,11 @@ DictionaryRevenueStamp=Steuermarken Beträge
 DictionaryPaymentConditions=Zahlungsbedingungen
 DictionaryPaymentModes=Zahlungsarten
 DictionaryTypeContact=Kontaktarten
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ökosteuern (WEEE)
 DictionaryPaperFormat=Papierformate
 DictionaryFormatCards=Karten Formate
-DictionaryFees=Expense report - Types of expense report lines
+DictionaryFees=Spesenabrechnung - Arten von Spesenabrechnungszeilen
 DictionarySendingMethods=Versandarten
 DictionaryStaff=Mitarbeiter
 DictionaryAvailability=Lieferverzug
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=USt-Verwaltung
 VATIsUsedDesc=Beim Erstellen von Leads, Rechnungen, Bestellungen, etc. wird folgende Regel zum Berechnen des USt.-Satz verwendet:<br>Wenn der Verkäufer nicht der MwSt. unterliegt, wird ein MwSt. Satz von 0 verwendet. Ende der Regel.<br>Wenn Verkäufer- und Käufer-Land identisch sind, wird der MwSt. Satz des Produktes verwendet. Ende der Regel.<br>Wenn Verkäufer und Käufer beide in der EU sind und es sich um Transportprodukte (Autos, Schiffe, Flugzeuge) handelt, wird ein MwSt. Satz von 0 verwendet. (Die MwSt. muss durch den Käufer in seinem Land abgerechnet werden). Ende der Regel.<br>Wenn Verkäufer und Käufer beide in der EU sind und der Käufer kein Unternehmen ist, dann wird der MwSt. Satz des Produktes verwendet.<br>Wenn Verkäufer und Käufer beide in der EU sind, und der Käufer ein Unternehen ist, dann wird ein MwSt. Satz von 0 verwendet. Ende der Regel.<br>In allen andere Fällen wird ein MwSt. Satz von 0 vorgeschlagen. Ende der Regel.
 VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen.
-VATIsUsedExampleFR=-
-VATIsNotUsedExampleFR=-
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Zweite Steuer nicht nutzen
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Treiber Typ
 SummarySystem=Zusammenfassung der Systeminformationen
 SummaryConst=Liste aller Systemeinstellungen von Dolibarr
-MenuCompanySetup=Firma/Stiftung
+MenuCompanySetup=Firma oder Institution
 DefaultMenuManager= Standard Menü-Verwaltung
 DefaultMenuSmartphoneManager=Smartphone Menü-Verwaltung
 Skin=grafische Oberfläche
@@ -993,7 +999,7 @@ PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite
 DefaultLanguage=Standardsprache der Anwendung (Sprachcode)
 EnableMultilangInterface=Mehrsprachigkeit aktivieren
 EnableShowLogo=Logo über dem linken Menü anzeigen
-CompanyInfo=Firmen-/Stiftungsinformationen
+CompanyInfo=Information über die Firma/Institution
 CompanyIds=Firmen-/Stiftungs-IDs
 CompanyName=Firmenname
 CompanyAddress=Firmenadresse
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Einstellungen können nur durch </b>Administratoren</b> veränd
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=Dieser Bereich steht ausschließlich Administratoren zur Verfügung. Keine der Benutzerberechtigungen kann dies ändern.
 CompanyFundationDesc=Tragen Sie hier alle Informationen zum Unternehmen ein, das Sie verwalten möchten (Zum Bearbeiten auf den Button "Bearbeiten" oder "Speichern" am Schluss der Seite klicken)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Hier können Sie die Oberfläche, sowie das allgemeine 'Look and Feel' des Systems anpassen
 AvailableModules=Verfügbare Module
 ToActivateModule=Zum Aktivieren von Modulen gehen Sie zu Start->Einstellungen->Module
@@ -1062,7 +1069,7 @@ TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfigurat
 TriggerActiveAsModuleActive=Trigger in dieser Datei sind durch das übergeordnete Modul <b>%s</b> aktiviert.
 GeneratedPasswordDesc=Definieren Sie hier das Schema nach dem automatisch generierte Passwörter erstellt werden sollen.
 DictionaryDesc=Alle Standardwerte einfügen. Sie können eigene Werte zu den Standartwerten hinzufügen.
-ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen, die auf den vorherigen Seiten nicht verfügbar sind. Dies sind meist reservierte Parameter für Entwickler oder für die erweiterte Fehlersuche. Für eine Liste von Optionen <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site-öffnet sich in einem neuen Fenster" target="_blank"> hier überprüfen </ </a>.
+ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen, die auf den vorherigen Seiten nicht verfügbar sind. Dies sind meist reservierte Parameter für Entwickler oder für die erweiterte Fehlersuche. Für eine Liste von Optionen <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site-öffnet sich in einem neuen Fenster" target="_blank"> hier überprüfen </a>.
 MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier eingestellt.
 LimitsSetup=Limits und Genauigkeit Einstellungen
 LimitsDesc=Hier können Sie Grenzwerte, Genauigkeitseinstellungen und das Rundungsverhalten einstellen.
@@ -1140,7 +1147,7 @@ TranslationDesc=How to set displayed application language :<br>* Systemwide: men
 TranslationOverwriteDesc=Sie können Zeichenketten durch Füllen der folgenden Tabelle überschreiben. Wählen Sie Ihre Sprache aus dem "%s" Drop-Down und tragen Sie den Schlüssel in "%s" und Ihre neue Übersetzung in "%s" ein.
 TranslationOverwriteDesc2=Sie können die andere Registerkarte verwenden, um Ihnen zu helfen, den Übersetzungsschlüssel zu verwenden
 TranslationString=Übersetzung Zeichenkette
-CurrentTranslationString=Aktuelle Übersetzung 
+CurrentTranslationString=Aktuelle Übersetzung
 WarningAtLeastKeyOrTranslationRequired=Es sind mindestens ein Suchkriterium erforderlich für eine Schlüssel- oder Übersetzungszeichenfolge
 NewTranslationStringToShow=Neue Übersetzungen anzeigen
 OriginalValueWas=Original-Übersetzung überschrieben. Der frühere Wert war:<br><br>%s
@@ -1441,6 +1448,9 @@ SyslogFilename=Dateiname und-pfad
 YouCanUseDOL_DATA_ROOT=Sie können DOL_DATA_ROOT/dolibarr.log als Protokolldatei in Ihrem Dokumentenverzeichnis verwenden. Bei Bedarf können Sie auch den Pfad der Datei anpassen.
 ErrorUnknownSyslogConstant=Konstante %s ist nicht als Protokoll-Konstante definiert
 OnlyWindowsLOG_USER=Windows unterstützt nur LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Spendenmoduleinstellungen
 DonationsReceiptModel=Vorlage für Spendenquittungen
@@ -1495,7 +1505,7 @@ AdvancedEditor=Erweiterter Editor
 ActivateFCKeditor=FCKEditor aktivieren für:
 FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Partnerinformationen und Notizen
 FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung von Produkt-/Serviceinformationen und Notizen
-FCKeditorForProductDetails=WYSIWG Erstellung/Bearbeitung der Produktdetails für alle Dokumente( Angebote, Bestellungen, Rechnungen etc...) Achtung: Die Option führt potentiell zu Problemen mit Umlauten und Sonderzeichen und wird daher nicht empfohlen. 
+FCKeditorForProductDetails=WYSIWG Erstellung/Bearbeitung der Produktdetails für alle Dokumente( Angebote, Bestellungen, Rechnungen etc...) Achtung: Die Option führt potentiell zu Problemen mit Umlauten und Sonderzeichen und wird daher nicht empfohlen.
 FCKeditorForMailing= WYSIWIG Erstellung/Bearbeitung von E-Mails
 FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen
 FCKeditorForMail=WYSIWYG-Erstellung/Bearbeitung für alle E-Mails (außer Werkzeuge->eMailing)
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Menü konnte nicht erstellt werden
 ##### Tax #####
 TaxSetup=Steuer-, Sozialabgaben- und Dividendenmodul-Einstellungen
 OptionVatMode=USt. fällig
-OptionVATDefault=Barbestandsbasis
+OptionVATDefault=Standardbasis
 OptionVATDebitOption=Rückstellungsbasis
 OptionVatDefaultDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Zahlung für Leistungen
 OptionVatDebitOptionDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Rechnungslegung (Lastschrift) für Dienstleistungen
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Standardmäßiger Zeitpunkt der USt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option:
 OnDelivery=Bei Lieferung
 OnPayment=Bei Zahlung
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Rechnungsdatum verwendet
 Buy=Kaufen
 Sell=Verkaufen
 InvoiceDateUsed=Rechnungsdatum verwendet
-YourCompanyDoesNotUseVAT=Für Ihr Unternehmen wurde keine USt.-Verwendung definiert (Start->Einstellungen->Unternehmen/Stiftung), entsprechend stehen in der Konfiguration keine USt.-Optionen zur Verfügung.
+YourCompanyDoesNotUseVAT=Ihr Unternehmen wurde so definiert, dass keine Mehrwertsteuer (Home - Setup - Unternehmen / Organisation) verwendet wird. Daher gibt es keine Mehrwertsteueroptionen zum Einrichten.
 AccountancyCode=Kontierungs-Code
 AccountancyCodeSell=Verkaufskonto-Code
 AccountancyCodeBuy=Einkaufskonto-Code
@@ -1576,7 +1588,7 @@ ClickToDialUseTelLinkDesc=Benutzen Sie diese Methode, wenn Ihre Benutzer ein Sof
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of Sales
 CashDeskSetup=Kassenmoduleinstellungen
-CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe 
+CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe
 CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
 CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen
 CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
@@ -1586,9 +1598,9 @@ StockDecreaseForPointOfSaleDisabled=Lagerrückgang bei Verwendung von Point of S
 StockDecreaseForPointOfSaleDisabledbyBatch=Lagerrückgang in POS-Modul ist noch nicht mit dem Chargen- /Seriennummern Management kompatibel.
 CashDeskYouDidNotDisableStockDecease=Sie haben die Reduzierung der Lagerbestände nicht deaktiviert, wenn Sie einen Verkauf auf dem  POS durchführen.\nAuch ist ein Lager/Standort notwendig.
 ##### Bookmark #####
-BookmarkSetup=Lesezeichenmoduleinstellungen
-BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
-NbOfBoomarkToShow=Maximale Anzeigeanzahl Lesezeichen im linken Menü
+BookmarkSetup=Favoriten-Moduleinstellungen
+BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Favoriten. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
+NbOfBoomarkToShow=Maximale Anzeigeanzahl Favoriten im linken Menü
 ##### WebServices #####
 WebServicesSetup=Webservices-Moduleinstellungen
 WebServicesDesc=Über Aktivierung dieses Moduls können Sie dolibarr zur Anbindung an externe Webservices konfigurieren
@@ -1650,7 +1662,7 @@ NbNumMin=Mindestanzahl Ziffern
 NbSpeMin=Mindestanzahl Sonderzeichen
 NbIteConsecutive=Maximale Anzahl sich wiederholender Zeichen
 NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|", "0", "O") für die automatische Generierung
-SalariesSetup=Einstellungen des Gehaltsmodul 
+SalariesSetup=Einstellungen des Gehaltsmodul
 SortOrder=Sortierreihenfolge
 Format=Format
 TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ
@@ -1668,7 +1680,7 @@ ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen
 GoOntoUserCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" eines Benutzers, um Benachrichtigungen für Benutzer zu erstellen/entfernen
 GoOntoContactCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" des Partners, um Hinweise für Kontakte/Adressen zu erstellen oder zu entfernen
 Threshold=Schwellenwert
-BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei 
+BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
 SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann.
 InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
@@ -1681,7 +1693,7 @@ PressF5AfterChangingThis=Drücken Sie CTRL+F5 auf der Tastatur oder löschen Sie
 NotSupportedByAllThemes=Funktioniert mit dem Standard-Designvorlagen: wird möglicherweise nicht von externen Designvorlagen unterstützt
 BackgroundColor=Hintergrundfarbe
 TopMenuBackgroundColor=Hintergrundfarbe für Hauptmenü
-TopMenuDisableImages=Symbole im oberen Menü ausblenden. 
+TopMenuDisableImages=Symbole im oberen Menü ausblenden.
 LeftMenuBackgroundColor=Hintergrundfarbe für Menü Links
 BackgroundTableTitleColor=Hintergrundfarbe für Titelzeilen in Tabellen
 BackgroundTableLineOddColor=Hintergrundfarbe für ungerade Tabellenzeilen
@@ -1718,6 +1730,7 @@ MailToSendContract=um den Vertrag zu senden
 MailToThirdparty=Um E-Mail von Partner zu schicken
 MailToMember=Email senden von Mitgliederseite
 MailToUser=E-Mail von Benutzerseite aus senden
+MailToProject= To send email from project page
 ByDefaultInList=Standardanzeige als Listenansicht
 YouUseLastStableVersion=Sie verwenden die letzte stabile Version
 TitleExampleForMajorRelease=Beispielnachricht, die Sie nutzen können, um eine Hauptversion anzukündigen. Sie können diese auf Ihrer Website verwenden.
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Linker Rand im PDF
 MAIN_PDF_MARGIN_RIGHT=Rechter Rand im PDF
 MAIN_PDF_MARGIN_TOP=Oberer Rand im PDF
 MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Konfiguration des Modul Ressourcen
 UseSearchToSelectResource=Verwende ein Suchformular um eine Ressource zu wählen (eher als eine Dropdown-Liste) zu wählen.
-DisabledResourceLinkUser=Deaktivierter Ressource Link zu Benutzer
-DisabledResourceLinkContact=Deaktivierter Ressource Link zu Kontakt
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Modul zurücksetzen bestätigen
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index a306be21f74..81deede96ec 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Mitglied %s freigegeben
 MemberModifiedInDolibarr=Mitglied %s geändert
 MemberResiliatedInDolibarr=Mitglied %s aufgehoben
 MemberDeletedInDolibarr=Mitglied %s gelöscht
-MemberSubscriptionAddedInDolibarr=Abonnement für Mitglied %s hinzugefügt
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Lieferung %s freigegeben
 ShipmentClassifyClosedInDolibarr=Lieferung %s als verrechnet markiert
 ShipmentUnClassifyCloseddInDolibarr=Lieferung %s als wiedereröffnet markiert
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern:
 AgendaUrlOptions3=<b>logina=%s</b> begrenzt die Ausgabe auf den Benutzer <b>%s</b> erstellte Ereignissen.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> begrenzt die Ausgabe auf dem Benutzer <b>%s</b> nicht als Eigentümer zugewiesene Aktionen.
 AgendaUrlOptions4=<b>logint=%s</b> begrenzt die Ausgabe auf den Benutzer <b>%s</b> (Eigentümer und andere) zugewiesene Aktionen.
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> begrenzt die Ausgabe auf die dem Projekte <b>PROJECT_ID</b> zugewiesene Ereignissen.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Geburtstage von Kontakten anzeigen
 AgendaHideBirthdayEvents=Geburtstage von Kontakten nicht anzeigen
 Busy=Besetzt
@@ -109,7 +112,7 @@ ExportCal=Export Kalender
 ExtSites=Importieren von externen Kalendern
 ExtSitesEnableThisTool=Zeige externe Kalender (im globalen Setup definiert) in der Agenda. Betrifft nicht benutzerdefinierte externe Kalender.
 ExtSitesNbOfAgenda=Anzahl der Kalender
-AgendaExtNb=Kalender Anzahl %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL Adresse um .ical Datei zu erreichen
 ExtSiteNoLabel=Keine Beschreibung
 VisibleTimeRange=Sichtbare Stunden Bereich
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 26d778748bd..399b3792c22 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Zurück bezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
 ConfirmConvertToReduc=Möchten Sie dieses %s in einen absoluten Rabatt konvertieren? <br> Der Betrag wird so unter allen Rabatten gespeichert und kann als Rabatt für ein aktuelle oder zukünftige Rechnung für diese Kunden verwendet werden.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Lieferantenzahlungen
 ReceivedPayments=Erhaltene Zahlungen
 ReceivedCustomersPayments=Erhaltene Anzahlungen von Kunden
@@ -91,7 +92,7 @@ PaymentAmount=Zahlungsbetrag
 ValidatePayment=Zahlung freigeben
 PaymentHigherThanReminderToPay=Zahlungsbetrag übersteigt Zahlungserinnerung
 HelpPaymentHigherThanReminderToPay=Achtung, der Zahlungsbetrag einer oder mehrerer Rechnungen ist höher als der offene Restbetrag.<br>Bearbeiten Sie Ihre Eingabe oder bestätigen Sie die Überzahlung und erstellen Sie ggf eine Gutschrift für jede überzahlte Rechnung.
-HelpPaymentHigherThanReminderToPaySupplier=Achtung, der Zahlungsbetrag einer oder mehrerer Rechnungen ist höher als der offene Restbetrag.<br>Bearbeiten Sie Ihre Eingabe oder bestätigen Sie die Überzahlung.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Als 'bezahlt' markieren
 ClassifyPaidPartially=Als 'teilweise bezahlt' markieren
 ClassifyCanceled=Rechnung 'aufgegeben'
@@ -110,6 +111,7 @@ DoPayment=Zahlung eingeben
 DoPaymentBack=Rückerstattung eingeben
 ConvertToReduc=In Rabatt umwandeln
 ConvertExcessReceivedToReduc=Konvertieren des Überschuss in einen Rabatt
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Geben Sie die vom Kunden erhaltene Zahlung ein
 EnterPaymentDueToCustomer=Kundenzahlung fällig stellen
 DisabledBecauseRemainderToPayIsZero=Deaktiviert, da Zahlungserinnerung auf null steht
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status der erstellten Rechnungen
 BillStatusDraft=Entwurf (freizugeben)
 BillStatusPaid=Bezahlt
 BillStatusPaidBackOrConverted=In Gutschrift oder Rabatt umgewandelt
-BillStatusConverted=Umgerechnet auf Rabatt
+BillStatusConverted=Bezahlt (in der Schlussrechnung zu verarbeiten)
 BillStatusCanceled=Aufgegeben
 BillStatusValidated=Freigegeben (zu bezahlen)
 BillStatusStarted=Begonnen
@@ -148,7 +150,7 @@ ErrorDiscountAlreadyUsed=Fehler: Dieser Rabatt ist bereits verbraucht.
 ErrorInvoiceAvoirMustBeNegative=Fehler: Gutschriften verlangen nach einem negativen Rechnungsbetrag
 ErrorInvoiceOfThisTypeMustBePositive=Fehler: Rechnungen dieses Typs verlangen nach einem positiven Rechnungsbetrag
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fehler: Sie können keine Rechnung stornieren, deren Ersatzrechnung sich noch im Status 'Entwurf' befindet
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Dieser Artikel oder ein anderer wird bereits verwendet, so dass die Rabattstaffel nicht entfernt werden kann.
 BillFrom=Von
 BillTo=An
 ActionsOnBill=Ereignisse zu dieser Rechnung
@@ -220,6 +222,7 @@ RemainderToPayBack=Restschulden zum zurückzahlen
 Rest=Ausstehend
 AmountExpected=Höhe der Forderung
 ExcessReceived=Erhaltener Überschuss
+ExcessPaid=Überzahlung
 EscompteOffered=Rabatt angeboten (Skonto)
 EscompteOfferedShort=Rabatt
 SendBillRef=Im Anhang Ihre Rechnung %s
@@ -283,16 +286,20 @@ Deposit=Anzahlung
 Deposits=Anzahlungen
 DiscountFromCreditNote=Rabatt aus Gutschrift %s
 DiscountFromDeposit=Anzahlung für Rechnung %s
-DiscountFromExcessReceived=Überzahlungen von der Rechnung %s empfangen
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Diese Art von Guthaben kann verwendet werden auf der Rechnung vor der Validierung
 CreditNoteDepositUse=Die Rechnung muss bestätigt werden, um Gutschriften zu erstellen
 NewGlobalDiscount=Neue Rabattregel
 NewRelativeDiscount=Neuer relativer Rabatt
+DiscountType=Rabatt Typ
 NoteReason=Anmerkung/Begründung
 ReasonDiscount=Rabattgrund
 DiscountOfferedBy=Rabatt angeboten von
 DiscountStillRemaining=Rabatte verfügbar
 DiscountAlreadyCounted=Rabatte bereits berücksichtigt
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Lieferantenrabatte
 BillAddress=Rechnungsanschrift
 HelpEscompte=Bei diesem Rabatt handelt es sich um einen Skonto.
 HelpAbandonBadCustomer=Dieser Betrag wurde aufgegeben (Kundenverschulden) ist als uneinbringlich zu werten.
@@ -341,10 +348,10 @@ NextDateToExecution=Datum der nächsten Rechnungserstellung
 NextDateToExecutionShort=Datum nächste Generierung
 DateLastGeneration=Datum der letzten Generierung
 DateLastGenerationShort=Datum letzte Generierung
-MaxPeriodNumber=max. Anzahl an Rechnungen
-NbOfGenerationDone=Anzahl bisher erstellter Rechnungen
-NbOfGenerationDoneShort=Anzahl Generierungen erledigt
-MaxGenerationReached=Max. Anzahl Rechnungsgenerierungen erreicht
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Rechnungen automatisch freigeben
 GeneratedFromRecurringInvoice=Erstelle wiederkehrende Rechnung %s aus Vorlage
 DateIsNotEnough=Datum noch nicht erreicht
@@ -521,3 +528,7 @@ BillCreated=%s Rechnung(en) erstellt
 StatusOfGeneratedDocuments=Status der Dokumentenerstellung
 DoNotGenerateDoc=Dokumentdatei nicht erstellen
 AutogenerateDoc=Dokumentdatei automatisch erstellen
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Legen Sie das Startdatum fest
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 5daef4466ad..220ffbfac10 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -43,7 +43,8 @@ Individual=Privatperson
 ToCreateContactWithSameName=Erzeugt automatisch einen Kontakt/Adresse mit der gleichen Information wie der Partner unter dem Partner. In den meisten Fällen, auch wenn Ihr Prtner eine natürliche Person ist, reicht nur die Anlage eines Partners
 ParentCompany=Muttergesellschaft
 Subsidiaries=Tochtergesellschaften
-ReportByCustomers=Bericht von den Kunden
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Bericht Quartal
 CivilityCode=Anrede
 RegisteredOffice=Firmensitz
@@ -56,7 +57,7 @@ Address=Adresse
 State=Bundesland
 StateShort=Staat
 Region=Region
-Region-State=Region - State
+Region-State=Bundesland
 Country=Land
 CountryCode=Ländercode
 CountryId=Länder-ID
@@ -75,10 +76,12 @@ Town=Stadt
 Web=Web
 Poste= Posten
 DefaultLang=Standard-Sprache
-VATIsUsed=USt-pflichtig
-VATIsNotUsed=Nicht USt-pflichtig
+VATIsUsed=inkl. MwSt.
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=exkl. MwSt.
 CopyAddressFromSoc=Anschriften zu diesem Partner
 ThirdpartyNotCustomerNotSupplierSoNoRef=Partner ist weder Kunde noch Lieferant, keine verbundenen Objekte
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Bankkonto für Zahlungen
 OverAllProposals=Angebote
 OverAllOrders=Bestellungen
@@ -239,7 +242,7 @@ ProfId3TN=Douane-Code
 ProfId4TN=BAN
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=DVR-Nummer
 ProfId3US=DVR-Nummer
 ProfId4US=DVR-Nummer
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Artikel
 ProfId3DZ=Lieferantenidentifikationsnummer
 ProfId4DZ=Kundenidentifikationsnummer
-VATIntra=Umsatzsteuer-ID
-VATIntraShort=USt-IdNr.
+VATIntra=Umsatzsteuer ID
+VATIntraShort=Steuer ID
 VATIntraSyntaxIsValid=Die Syntax ist gültig
+VATReturn=VAT return
 ProspectCustomer=Lead / Kunde
 Prospect=Lead
 CustomerCard=Kunden - Karte
 Customer=Kunde
 CustomerRelativeDiscount=Kundenrabatt relativ
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Rabatt relativ
 CustomerAbsoluteDiscountShort=Rabatt absolut
 CompanyHasRelativeDiscount=Dieser Kunde hat einen Rabatt <b>von %s%%</b>
 CompanyHasNoRelativeDiscount=Dieser Kunde hat standardmäßig keinen relativen Rabatt
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=Dieser Kunde hat noch ein Guthaben (Gutschrift oder Überzahlung) über <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Für diesen Kunden existieren Rabatte (Anzahlungen) für <b>%s</b>%s
 CompanyHasCreditNote=Dieser Kunde hat noch Gutschriften <b>über %s %s</b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Dieser Kunde hat keine Rabattgutschriften zur Verfügung
-CustomerAbsoluteDiscountAllUsers=Absolute Rabatte (von allen Nutzern gewährte)
-CustomerAbsoluteDiscountMy=Absolute Rabatte (persönlich gewährt)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Keine
 Supplier=Lieferant
 AddContact=Kontakt erstellen
@@ -377,9 +390,9 @@ NoDolibarrAccess=Kein Zugang
 ExportDataset_company_1=Partner und Eigenschaften
 ExportDataset_company_2=Kontakte und Eigenschaften
 ImportDataset_company_1=Partner und Eigenschaften
-ImportDataset_company_2=Kontakte/Adressen (von Dritten oder auch nicht) und Attribute
-ImportDataset_company_3=Bankverbindung
-ImportDataset_company_4=Partner/Außendienstmitarbeiter (Auswirkung Außendienstmitarbeiter an Unternehmen)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Dritte / Außendienstmitarbeiter (Zuweisen von Außendienstmitarbeitern zu Unternehmen)
 PriceLevel=Preisstufe
 DeliveryAddress=Lieferadresse
 AddAddress=Adresse hinzufügen
@@ -406,15 +419,16 @@ ProductsIntoElements=Liste von Produkten/Leistungen in %s
 CurrentOutstandingBill=Aktuell ausstehende Rechnung
 OutstandingBill=Max. für ausstehende Rechnung
 OutstandingBillReached=Kreditlimite erreicht
+OrderMinAmount=Mindestbestellwert
 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, ...)
 MergeOriginThirdparty=Partner duplizieren (Partner den Sie löschen möchten)
 MergeThirdparties=Partner zusammenlegen
 ConfirmMergeThirdparties=Möchten Sie wirklich diesen Partner mit dem Aktuellen zusammenführen? Alle verbundenen Objekte (Rechnungen, Aufträge, ...) werden mit dem Aktuellen zusammengeführt, dann wird der Partner gelöscht werden.
-ThirdpartiesMergeSuccess=Partner wurden zusammengelegt
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login des Vertriebsmitarbeiters
 SaleRepresentativeFirstname=Vorname des Vertreter
 SaleRepresentativeLastname=Nachname des Vertreter
-ErrorThirdpartiesMerge=Es gab einen Fehler beim Löschen des Partners. Bitte überprüfen Sie im Protokoll. Änderungen wurden rückgängig gemacht.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Neuer Kunde oder Lieferanten Code bei doppeltem Code empfohlen
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index d0a876aa4a4..e08987ffe0a 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Rechnung / Zahlung
 TaxModuleSetupToModifyRules=Im <a href="%s">Steuer-Modul</a> können Sie die Einstellungen für die Berechnungen vornehmen
 TaxModuleSetupToModifyRulesLT=Hier können Sie die <a href="%s">Einstellungen</a> für die Berechnungen vornehmen
 OptionMode=Buchhaltungsoptionen
@@ -31,7 +31,7 @@ Credit=Haben
 Piece=Beleg
 AmountHTVATRealReceived=Einnahmen (netto)
 AmountHTVATRealPaid=Ausgaben (netto)
-VATToPay=MwSt. Verkäufe - USt.
+VATToPay=Tax sales
 VATReceived=USt. Verkäufe
 VATToCollect=USt. Einkäufe
 VATSummary=USt. Saldo
@@ -103,6 +103,7 @@ LT2PaymentsES=EKSt. Zahlungen
 VATPayment=USt. Zahlung
 VATPayments=USt Zahlungen
 VATRefund=Umsatzsteuer Rückerstattung
+NewVATPayment=New sales tax payment
 Refund=Rückerstattung
 SocialContributionsPayments=Sozialabgaben-/Steuer Zahlungen
 ShowVatPayment=Zeige USt. Zahlung
@@ -157,30 +158,34 @@ RulesResultDue=- Dies beinhaltet ausstehende Rechnungen, Aufwendungen, Umsatzste
 RulesResultInOut=- Es sind nur tatsächliche Zahlungen für Rechnungen, Kostenabrechnungen, USt und Gehälter enthalten. <br>- Bei Rechnungen, Kostenabrechnungen, USt und Gehälter gilt das Zahlugnsdatum. Bei Spenden gilt das Spendendatum.
 RulesCADue=- es beinhaltet alle fälligen Kundenrechnungen, unabhängig von ihrem Zahlungsstatus. <br>- Es gilt das Freigabedatum der Rechnungen. <br>
 RulesCAIn=- Beinhaltet alle tatsächlich erfolgten Zahlungen von Kunden.<br>- Es gilt das Zahlungsdatum der Rechnungen.<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag"
 RulesResultBookkeepingPredefined=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag"
 RulesResultBookkeepingPersonalized=Zeigt die Buchungen im Hauptbuch mit Konten <b>gruppiert nach Kontengruppen</b>
 SeePageForSetup=Siehe Menü <a href="%s"> %s </a> für die Einrichtung
 DepositsAreNotIncluded=- Ohne Anzahlungsrechnungen
 DepositsAreIncluded=- Inklusive Anzahlungsrechnungen
-LT2ReportByCustomersInInputOutputModeES=Bericht von Partner EKSt.
-LT1ReportByCustomersInInputOutputModeES=Bericht von Kunden RE
-VATReport=USt-Bericht
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Bericht von Kunden RE
+LT2ReportByCustomersES=Bericht von Partner EKSt.
+VATReport=Umsatzsteuer Report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden 
-VATReportByCustomersInDueDebtMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden
-VATReportByQuartersInInputOutputMode=Quartalsbericht zur vereinnahmten und bezahlten USt.
-LT1ReportByQuartersInInputOutputMode=Bericht von RE Rate
-LT2ReportByQuartersInInputOutputMode=Quartal-Bericht EKSt. Rate
-VATReportByQuartersInDueDebtMode=Quartalsbericht zur vereinnahmten und bezahlten USt.
-LT1ReportByQuartersInDueDebtMode=Bericht von RE Ratex
-LT2ReportByQuartersInDueDebtMode=Quartal-Bericht EKSt. Rate
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Bericht von RE Ratex
+LT2ReportByQuartersES=Quartal-Bericht EKSt. Rate
 SeeVATReportInInputOutputMode=Siehe <b>%s USt.-Einnahmen%s</b>-Bericht für eine standardmäßige Berechnung
 SeeVATReportInDueDebtMode=Siehe <b>%s dynamischen USt.%s</b>-Bericht für eine Berechnung mit dynamischer Option
 RulesVATInServices=- Für Services beinhaltet der Bericht alle vereinnahmten oder bezahlten Steuern nach Zahlungsdatum. 
-RulesVATInProducts=- Für Sachanlagen beinhaltet der Bericht alle Mehrwertsteuerrechnungen auf Basis des Rechnungsdatums.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Für Services beinhaltet der Steuerbericht alle fälligen Rechnungen, bezahlt oder nicht, in Abhängigkeit des Leistungsdatums. Für Warenlieferungen gilt das Rechnungsdatum.
-RulesVATDueProducts=- Für Sachanlagen beinhaltet der Bericht alle fälligen Rechnungen, bezahlt oder nicht, in Abhängigkeit des Leistungsdatums. Für Warenlieferungen gilt das Rechnungsdatum.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Achtung: Für Vermögenswerte sollte hier das Zustelldatum eingegeben werden.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/Rechnung
 NotUsedForGoods=Nicht für Waren
 ProposalStats=Angebote Statistik
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=Gemäß Ihrem Lieferanten, wählen Sie die  geeignet
 TurnoverPerProductInCommitmentAccountingNotRelevant=Umsatz Bericht pro Produkt, bei der Verwendung einer <b>Kassabuch Buchhaltung</b>  ist der Modus nicht relevant. Dieser Bericht ist nur bei Verwendung <b>Buchführungsmodus Periodenrechnung</b> (siehe Setup das Modul  Buchhaltung).
 CalculationMode=Berechnungsmodus
 AccountancyJournal=Kontierungscode-Journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Standard Buchhaltungs-Konto für die Erhebung der MwSt. - Mehrwertsteuer auf den Umsatz (wird verwendet, wenn nicht bei der Konfiguration des MwSt-Wörterbuch definiert)
-ACCOUNTING_VAT_BUY_ACCOUNT=Standard Buchhaltungs-Konto für Vorsteuer  - Ust bei Einkäufen (wird verwendet, wenn nicht unter Einstellungen->Stammdaten USt.-Sätze definiert)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
 ACCOUNTING_ACCOUNT_CUSTOMER=Standard Buchhaltungskonto für Kunden/Debitoren (wenn nicht beim Partner definiert)
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Buchhaltungskonten die auf der Partnerkarte definiert wurden werden für die Nebenbücher verwendet, für das Hauptbuch oder als Vorgabewert für Nebenbücher falls kein Buchhaltungskonto auf der Kunden-Partnerkarte definiert wurde
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Fehler: Bankkonto nicht gefunden
 FiscalPeriod=Buchhaltungs Periode
 ListSocialContributionAssociatedProject=Liste der Sozialabgaben für dieses Projekt
 DeleteFromCat=Aus Kontengruppe entfernen
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 79103b6c846..0a2afb0847d 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Keine Jobs eingetragen
 CronPriority=Rang
 CronLabel=Bezeichnung
 CronNbRun=Anzahl Starts
-CronMaxRun=max. Anzahl Starts
+CronMaxRun=Max number launch
 CronEach=Jede
 JobFinished=Job gestartet und beendet
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Von
 CronType=Job Typ
 CronType_method=Aufruf-Methode einer PHP-Klasse
 CronType_command=Shell-Befehl
-CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden
+CronCannotLoadClass=Die Klassendatei %s kann nicht geladen werden (um die Klasse %s zu verwenden)
+CronCannotLoadObject=Die Klassendatei %s wurde geladen, aber das Objekt %s wurde nicht gefunden
 UseMenuModuleToolsToAddCronJobs=Gehen Sie in Menü "Start - Module Hilfsprogramme - Geplante Aufträge" um geplante Aufträge zu sehen/bearbeiten.
 JobDisabled=Aufgabe deaktiviert
 MakeLocalDatabaseDumpShort=lokales Datenbankbackup
-MakeLocalDatabaseDump=Erstelle einen lokalen Datenbankdump. Parameter sind: compression ('gz' or 'bz' or 'none'), Backupart ('mysql' oder 'pgsql'), 1, 'auto' oder Dateiname, Anzahl der Datensicherungen zum Aufbewahren
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Bitte beachten: Aus Leistungsgründen können Ihre Jobs um bis zu %s Stunden verzögert werden, unabhängig vom nächsten Ausführungstermin.
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index d2d22edaca8..39573906054 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Fehler beim Hinzufügen von %s zur Mailman Liste %
 ErrorFailedToRemoveToMailmanList=Fehler beim Löschen von %s von der Mailman Liste %s oder SPIP basis
 ErrorNewValueCantMatchOldValue=Neuer Wert darf nicht altem Wert entsprechen
 ErrorFailedToValidatePasswordReset=Kennwort konnte nicht zurückgesetzt werden. Möglicherweise wurde dies bereits getan (dieser Link kann nur einmal verwendet werden). Wenn nicht, versuchen Sie den Rücksetz-Prozess neu zu starten.
-ErrorToConnectToMysqlCheckInstance=Verbindung zur Datenbank fehlgeschlagen. Prüfen Sie, ob der Mysql-Server läuft (in den meisten Fällen können Sie ihn von der Kommandozeile mit 'sudo /etc/init.d/mysql start' starten).
+ErrorToConnectToMysqlCheckInstance=Verbindung zur Datenbank fehlgeschlagen. Prüfen Sie, ob der Mysql-Server läuft (in den meisten Fällen können Sie ihn von der Kommandozeile mit 'sudo service mysql start' starten).
 ErrorFailedToAddContact=Fehler beim Hinzufügen des Kontakts
 ErrorDateMustBeBeforeToday=Das Datum kann nicht in der Zukunft sein
 ErrorPaymentModeDefinedToWithoutSetup=Eine Zahlungsart wurde auf Typ %s gesetzt, aber das Rechnungsmodul wurde noch nicht konfiguriert dies anzuzeigen.
@@ -207,12 +207,13 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=Der Rabatt den Sie anwenden woll
 ErrorFileNotFoundWithSharedLink=Datei nicht gefunden. Eventuell wurde der Sharekey verändert oder die Datei wurde gelöscht.
 ErrorProductBarCodeAlreadyExists=Der Produktbarcode %sexistiert schon bei einer anderen Produktreferenz
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Das verwenden von virtuellen Produkten welche den Lagerbestand von Unterprodukten verändern ist nicht möglich, wenn ein Unterprodukt (Oder Unter-Unterprodukt) eine Seriennummer oder Chargennummer benötigt.
+ErrorDescRequiredForFreeProductLines=Beschreibung ist erforderlich für freie Produkte
 
 # Warnings
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
 WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
 WarningSafeModeOnCheckExecDir=Achtung: Der PHP-Option <b>safe_mode</b> ist aktiviert, entsprechend müssen Befehle in einem mit <b>safe_mode_exec_dir</b> gekennzeichneten Verzeichnis ausgeführt werden.
-WarningBookmarkAlreadyExists=Ein Lesezeichen mit diesem Titel oder Ziel (URL) existiert bereits.
+WarningBookmarkAlreadyExists=Ein Favorit mit diesem Titel oder dieser Adresse existiert bereits.
 WarningPassIsEmpty=Warnung: Derzeit ist kein Datenbankpasswort gesetzt. Dies ist eine Sicherheitslücke. Konfigurieren Sie schnellstmöglich ein Passwort für den Datenbankzugriff und passen Sie Ihre conf.php entsprechend an.
 WarningConfFileMustBeReadOnly=Achtung: Die Konfigurationsdatei (<b>htdocs/conf/conf.php</b>) kann von Ihrem Webserver überschrieben werden. Dies ist eine ernstzunehmende Sicherheitslücke. Ändern Sie den Zugriff schnellstmöglich auf reinen Lesezugriff. Wenn Sie Windows und das FAT-Format für Ihre Festplatte nutzen, seien Sie sich bitte bewusst dass dieses Format keine individuellen Dateiberechtigungen unterstützt und so auch nicht völlig sicher ist,
 WarningsOnXLines=Warnhinweise in <b>%s</b> Quellzeilen
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Einige erfasste Zeiten wurden von Benutzern e
 WarningYourLoginWasModifiedPleaseLogin=Ihr Login wurde verändert. Aus Sicherheitsgründen müssen Sie sich vor der nächsten Aktion mit Ihrem neuen Login anmelden.
 WarningAnEntryAlreadyExistForTransKey=Eine Übersetzung für diesen Übersetzungsschlüssel existiert schon für diese Sprache
 WarningNumberOfRecipientIsRestrictedInMassAction=Achtung, die Anzahl unterschiedlicher Empfänger ist auf <b>%s</b> begrenzt, wenn sie Massenaktionen auf dieser Liste verwenden
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index cae372df349..0714b729c3f 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -16,7 +16,12 @@ CancelCP=Storniert
 RefuseCP=abgelehnt
 ValidatorCP=Genehmiger
 ListeCP=Urlaubsliste
+LeaveId=Urlaubs ID
 ReviewedByCP=Wird geprüft von
+UserForApprovalID=Benutzer für die Genehmigungs-ID
+UserForApprovalFirstname=Vorname des Genehmigers
+UserForApprovalLastname=Nachname des Genehmigers
+UserForApprovalLogin=Login des Genehmigers
 DescCP=Beschreibung
 SendRequestCP=Erstelle Urlaubs-Antrag
 DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Sie sind nicht berechtigt diesen Urlaubsantrag zu lesen.
 InfosWorkflowCP=Workflow-Informationen
 RequestByCP=Beantragt von
 TitreRequestCP=Urlaubsantrag
+TypeOfLeaveId=Art der Urlaubs-ID
+TypeOfLeaveCode=Art des Urlaubscodes
+TypeOfLeaveLabel=Art des Urlaubslabels
 NbUseDaysCP=Anzahl von konsumierten Tagen des Urlaubs
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Bearbeiten
 DeleteCP=Lösche Gruppe
 ActionRefuseCP=Ablehnen
@@ -59,6 +71,7 @@ DateRefusCP=Datum der Ablehnung
 DateCancelCP=Datum der Stornierung
 DefineEventUserCP=Sonderurlaub für einen Anwender zuweisen
 addEventToUserCP=Urlaub zuweisen
+NotTheAssignedApprover=Sie sind nicht der zugeordnete Genehmiger
 MotifCP=Grund
 UserCP=Benutzer
 ErrorAddEventToUserCP=Ein Fehler ist beim Erstellen des Sonderurlaubs aufgetreten.
@@ -81,7 +94,12 @@ EmployeeFirstname=Vorname des Mitarbeiters
 TypeWasDisabledOrRemoved=Abreise-Art (Nr %s) war deaktiviert oder entfernt
 LastHolidays=%sneuste Ferienanträge
 AllHolidays=Allen Ferienanträge
-
+HalfDay=Halber Tag
+NotTheAssignedApprover=Sie sind nicht der zugeordnete Genehmiger
+LEAVE_PAID=bezahlter Urlaub
+LEAVE_SICK=Krankheitstag
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=bezahlter Urlaub
 ## Configuration du Module ##
 LastUpdateCP=Letzte automatische Aktualisierung der Urlaubstage
 MonthOfLastMonthlyUpdate=Monat der letzten Aktualisierung der Urlaubstage
diff --git a/htdocs/langs/de_DE/loan.lang b/htdocs/langs/de_DE/loan.lang
index dc5d779447e..439571de65b 100644
--- a/htdocs/langs/de_DE/loan.lang
+++ b/htdocs/langs/de_DE/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Konfiguration des Modul Kredite
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard-Buchhaltungskonto Kapital
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard-Buchhaltungskonto Zinsen
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard-Buchhaltungskonto Versicherung
-CreateCalcSchedule=Fälligkeit des Darlehens erstellen/bearbeiten
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index e4546f49d0a..99097645903 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Sende-Ergebnis der E-Mail-Kampagne
 NbSelected=Anz. gewählte
 NbIgnored=Anz. ignoriert
 NbSent=Anz. gesendet
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Möchten Sie die eMail-Kampange <b>%s</b> in den Entwurf Status wechseln?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt mit Kunden Filter
 MailingModuleDescContactsByCompanyCategory=Kontakte mit Partner Kategorie
@@ -87,7 +88,7 @@ MailingModuleDescEmailsFromFile=E-Mailadressen aus Datei
 MailingModuleDescEmailsFromUser=E-Mailadressen Eingabe durch Benutzer
 MailingModuleDescDolibarrUsers=Benutzer mit E-Mailadresse
 MailingModuleDescThirdPartiesByCategories=Partner (nach Kategorien)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+SendingFromWebInterfaceIsNotAllowed=Versand vom Webinterface ist nicht erlaubt
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Zeile %s in der Datei
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Aktuelle Anzahl der E-Mails-Kontakte
 UseFormatFileEmailToTarget=Importierte Datei muss das Format\n<strong>email;name;firstname;other</strong> haben
 UseFormatInputEmailToTarget=Geben Sie eine Zeichenkette in dem Format <strong>email, name, firstname, other</strong> ein
 MailAdvTargetRecipients=Empfänger (Erweitere Selektion)
-AdvTgtTitle=Füllen Sie die Eingabefelder zur Vorauswahl der Partner- oder  Kontakt- / Adressen - Empänger
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Tipps für die Suche:  <br>- x<b>%%</b> , um alle Wörter zu suchen, mit x beginnen, Frankreich  <b>-</b> als Trennzeichen  von Werten gesucht, Frankreich <b>-</b> ausschließen würdig <br> Beispiel: <b> jean;joe;jim%%;!jimo;!jima% </b>  werden alle Ergebnisse angezeigt werden <i> jean </i> und  <i> joe </i>,, die mit  <i> jim </i> beginnen mit Ausnahme von <i> jimo </i>  und  <i> jima </i>.
 AdvTgtSearchIntHelp=Intervall verwenden um eine Integer oder Fliesskommazahl auszuwählen
 AdvTgtMinVal=Mindestwert
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index a5052ae9e4d..466ab9e1759 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Fehler, keine MwSt.-Sätze für Land  '%s'
 ErrorNoSocialContributionForSellerCountry=Fehler, Sozialabgaben/Steuerwerte für Land '%s' nicht definiert.
 ErrorFailedToSaveFile=Fehler, konnte Datei nicht speichern.
 ErrorCannotAddThisParentWarehouse=Sie versuchen ein HauptLager hinzuzufügen, das bereits ein Unterlager von dem aktuellen Lagerort ist 
-MaxNbOfRecordPerPage=Max. Zeilenanzahl pro Seite
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Sie haben keine Berechtigung dazu.
 SetDate=Datum
 SelectDate=Wählen Sie ein Datum
 SeeAlso=Siehe auch %s
 SeeHere=Sehen Sie hier
+ClickHere=Hier klicken
+Here=Here
 Apply=Übernehmen
 BackgroundColorByDefault=Standard-Hintergrundfarbe
 FileRenamed=Datei wurde erfolgreich unbenannt
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Wählen Sie
 Choose=Wählen
 Resize=Skalieren
+ResizeOrCrop=Resize or Crop
 Recenter=Zentrieren
 Author=Autor
 User=Benutzer
@@ -325,8 +328,10 @@ Default=Standard
 DefaultValue=Standardwert
 DefaultValues=Standardwert
 Price=Preis
+PriceCurrency=Price (currency)
 UnitPrice=Stückpreis
 UnitPriceHT=Stückpreis (netto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Stückpreis (brutto)
 PriceU=VP
 PriceUHT=VP (netto)
@@ -334,6 +339,7 @@ PriceUHTCurrency=Nettopreis (Währung)
 PriceUTTC=St.-Pr. (inkl. Steuern)
 Amount=Betrag
 AmountInvoice=Rechnungsbetrag
+AmountInvoiced=berechneter Betrag
 AmountPayment=Zahlungsbetrag
 AmountHTShort=Nettobetrag
 AmountTTCShort=Bruttobetrag
@@ -353,6 +359,7 @@ AmountLT2ES=Betrag IRPF
 AmountTotal=Gesamtbetrag
 AmountAverage=Durchschnittsbetrag
 PriceQtyMinHT=Mindestmengenpreis (netto)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Prozentsatz
 Total=Gesamt
 SubTotal=Zwischensumme
@@ -389,6 +396,8 @@ LT2ES=EKSt.
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Steuersatz
+VATCode=Steuersatz
+VATNPR=Steuersatz
 DefaultTaxRate=Standardsteuersatz
 Average=Durchschnitt
 Sum=Summe
@@ -419,7 +428,8 @@ ActionRunningShort=in Bearbeitung
 ActionDoneShort=Abgeschlossen
 ActionUncomplete=unvollständig
 LatestLinkedEvents=Neueste %s verknüpfte Ereignisse
-CompanyFoundation=Firma/Stiftung
+CompanyFoundation=Firma oder Institution
+Accountant=Accountant
 ContactsForCompany=Ansprechpartner/Adressen dieses Partners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner
 AddressesForCompany=Anschriften zu diesem Partner
@@ -427,6 +437,9 @@ ActionsOnCompany=Ereignisse zu diesem Partner
 ActionsOnMember=Aktionen zu diesem Mitglied
 ActionsOnProduct=Ereignisse zu diesem Produkt
 NActionsLate=%s verspätet
+ToDo=zu erledigen
+Completed=Completed
+Running=in Bearbeitung
 RequestAlreadyDone=Anfrage bereits bekannt
 Filter=Filter
 FilterOnInto=Suchkriterium '<strong>%s</strong>'  ist in den Feldern %s
@@ -498,8 +511,8 @@ AddPhoto=Bild hinzufügen
 DeletePicture=Bild löschen
 ConfirmDeletePicture=Bild wirklich löschen?
 Login=Anmeldung
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginEmail=Benutzer (Email)
+LoginOrEmail=Benutzername oder Emailadresse
 CurrentLogin=Aktuelle Anmeldung
 EnterLoginDetail=Geben Sie die Login-Daten ein
 January=Januar
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Achtung: Die Anwendung befindet sich im Wartungsm
 CoreErrorTitle=Systemfehler
 CoreErrorMessage=Leider ist ein Fehler aufgetreten. Wenden Sie sich an Ihren Systemadministrator, um die Logs zu überprüfen oder deaktivieren Sie die Option $dolibarr_main_prod=1 für weitere Informationen.
 CreditCard=Kredit - Karte
+ValidatePayment=Zahlung freigeben
+CreditOrDebitCard=Kreditkarte
 FieldsWithAreMandatory=Felder mit <b>%s</b> sind Pflichtfelder
 FieldsWithIsForPublic=Felder mit <b>%s</b> werden auf die öffentlich sichtbare Mitgliederliste angezeigt. Deaktivieren Sie bitte den "Öffentlich"-Kontrollkästchen wenn das nicht möchten.\n
 AccordingToGeoIPDatabase=(nach GeoIP-Auflösung)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=MassenLöschbestätigung
 ConfirmMassDeletionQuestion=Möchten Sie den/die %s ausgewählten Datensatz wirklich löschen?
 RelatedObjects=Verknüpfte Objekte
 ClassifyBilled=Als verrechnet markieren
+ClassifyUnbilled=als "nicht berechnet" markieren
 Progress=Entwicklung
-ClickHere=Hier klicken
 FrontOffice=Frontoffice
 BackOffice=Backoffice
 View=Ansicht
@@ -851,6 +866,8 @@ FileNotShared=Datei nicht öffentlich zugänglich
 Project=Projekt
 Projects=Projekte
 Rights=Berechtigungen
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Montag
 Tuesday=Dienstag
@@ -916,3 +933,11 @@ CommentDeleted=Kommentar gelöscht
 Everybody=Jeder
 PayedBy=Bezahlt durch
 PayedTo=Bezahlt an
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Zugewiesen an
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index 85a66f5914e..676e833e1b8 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Die Rate muss ein numerischer Wert sein
 markRateShouldBeLesserThan100=Die markierte Rate sollte kleiner sein als 100
 ShowMarginInfos=Zeige Rand-Informationen
 CheckMargins=Detail zu Gewinnspanne
-MarginPerSaleRepresentativeWarning=Manche Partner sind mit keinem Handelsvertreter verknüpft, andere können mit mehreren Benutzer verknüpft sein, weswegen manche Gewinnspannen nicht in diesem Bericht erscheinen können oder aber mehrmals vorkommen.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index b3caf8578a3..a987eb6e759 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Liste der freigegebenen, öffentlichen Mitglieder
 ErrorThisMemberIsNotPublic=Dieses Mitglied ist nicht öffentlich
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Ein anderes Mitglied (Name: <b>%s</b>, Benutzername: <b>%s</b>) ist bereits mit dem Partner <b>%s</b> verbunden. Bitte entfernen Sie diese Verknüpfung zuerst, da ein Partner nur einem Mitglied zugewiesen sein kann (und umgekehrt).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Aus Sicherheitsgründen müssen Sie die Berechtigungen zur Mitgliederbearbeitung besitzen, um ein Mitglied mit einem fremden Benutzerkonto (einem anderen als Ihrem eigenen) zu verknüpfen.
-ThisIsContentOfYourCard=Hallo.<br><br>Dies sind die Informationen die wir über dich haben. Kotaktiere uns, wenn etwas nicht stimmen sollte.<br><br>
-CardContent=Inhalt der Mitgliedskarte
 SetLinkToUser=Mit Benutzer verknüpft
 SetLinkToThirdParty=Mit Partner verknüpft
 MembersCards=Visitenkarten der Mitglieder
@@ -47,7 +45,7 @@ MemberStatusActive=Freigegebene (Abonnement ausstehend)
 MemberStatusActiveShort=Bestätigt
 MemberStatusActiveLate=Abonnement abgelaufen
 MemberStatusActiveLateShort=Abgelaufen
-MemberStatusPaid=Aktuelle Abonnements
+MemberStatusPaid=Mitgliedschaft aktuell
 MemberStatusPaidShort=Aktuelle
 MemberStatusResiliated=Deaktivierte Mitglieder
 MemberStatusResiliatedShort=Deaktiviert
@@ -55,7 +53,7 @@ MembersStatusToValid=Freizugebende
 MembersStatusResiliated=Deaktivierte Mitglieder
 NewCotisation=Neuer Beitrag
 PaymentSubscription=Neue Beitragszahlung
-SubscriptionEndDate=Abonnement Ablaufdatum
+SubscriptionEndDate=Ablaufdatum der Mitgliedschaft
 MembersTypeSetup=Mitgliedsarten einrichten
 MemberTypeModified=Mitgliedstyp geändert
 DeleteAMemberType=Löschen Sie einen Mitgliedstyp
@@ -108,17 +106,33 @@ PublicMemberCard=Öffentliche Mitgliedskarte
 SubscriptionNotRecorded=Mitgliedschaft nicht erfasst
 AddSubscription=Abonnement erstellen
 ShowSubscription=Zeige Abonnement
-SendAnEMailToMember=Informations-E-Mail an Mitglied senden
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Inhalt der Mitgliedskarte
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Betreff der E-Mail im Falle der automatischen Registrierung eines Gastes 
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Empfangene E-Mail im Falle der automatischen Registrierung eines Gastes 
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-Mail-Betreff für automatische Mitgliederabonnements
-DescADHERENT_AUTOREGISTER_MAIL=E-Mail-Text für automatische Mitgliederabonnements
-DescADHERENT_MAIL_VALID_SUBJECT=E-Mail-Betreff bei Mitgliederfreigabe
-DescADHERENT_MAIL_VALID=E-Mail-Text für Mitgliederfreigabe
-DescADHERENT_MAIL_COTIS_SUBJECT=E-Mail-Betreff für (Mitglieds-)Beiträge
-DescADHERENT_MAIL_COTIS=E-Mail-Text für (Mitglieds-)Beiträge
-DescADHERENT_MAIL_RESIL_SUBJECT=E-Mail-Betreff beim Zurückstellen eines Mitglieds
-DescADHERENT_MAIL_RESIL=E-Mail-Text beim Zurückstellen eines Mitglieds
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Absender E-Mail-Adresse für automatische Mails
 DescADHERENT_ETIQUETTE_TYPE=Format der Etikettenseite
 DescADHERENT_ETIQUETTE_TEXT=Text für den Druck auf der Mitglieds-Adresskarte
@@ -165,7 +179,7 @@ SubscriptionsStatistics=Statistik über Abonnements
 NbOfSubscriptions=Anzahl der Beiträge
 AmountOfSubscriptions=Beiträge der Abonnements
 TurnoverOrBudget=Umsatz (für eine Firma) oder Budget (für eine Stiftung)
-DefaultAmount=Standardbetrag für ein Abonnement
+DefaultAmount=Standardbetrag für ein Mitgliedsbeitrag
 CanEditAmount=Besucher können die Höhe auswählen oder ändern für den Beitrag
 MEMBER_NEWFORM_PAYONLINE=Gehen Sie zu integrierten Bezahlseite
 ByProperties=Natürlich
@@ -177,3 +191,8 @@ NoVatOnSubscription=Kein USt. auf Mitgliedschaft.
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail-Adresse, die E-Mail-Benachrichtungen verwendet werden soll, wenn Dolibarr die Bestätigung einer freigegebenen Zahlung für eine Mitgliedschaft erhält (Beispiel: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt/Leistung verwendet für den Beitrag in der Rechnungszeile: %s
 NameOrCompany=Name oder Firma
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index a1aa59fad20..56fba5977bf 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Abgemeldet. Zur Anmeldeseite...
 MessageForm=Mitteilung im Onlinezahlungsformular
 MessageOK=Nachrichtenseite für bestätigte Zahlung
 MessageKO=Nachrichtenseite für stornierte Zahlung
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Jahr der Rechnung
 PreviousYearOfInvoice=Vorangehendes Jahr des Rechnungsdatums
@@ -78,8 +80,8 @@ LinkedObject=Verknüpftes Objekt
 NbOfActiveNotifications= Anzahl Benachrichtigungen ( Anz.  E-Mail Empfänger)
 PredefinedMailTest=__(Hello)__\nDas ist ein Test-Mail gesendet an __EMAIL__.\nDie beiden Zeilen sind durch einem Zeilenumbruch getrennt.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=Dies ist ein <b>Test</b> Mail (das Wort Test muss in Fettschrift erscheinen). <br> Die beiden Zeilen sollten durch einen Zeilenumbruch getrennt sein.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nAnbei erhalten Sie die Rechnung __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nBedauerlicherweise ist die Rechnung __REF__ bislang unbeglichen. Zur Erinnerung übersenden wir Ihnen diese nochmals als Anhang.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nBitte entnehmen Sie dem Anhang unser Angebot __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nHier die gewünschte Preisauskunft __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nBitte entnehmen Sie dem Anhang die Bestellung __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Hochladen starten
 CancelUpload=Hochladen abbrechen
 FileIsTooBig=Dateien sind zu groß
 PleaseBePatient=Bitte haben Sie ein wenig Geduld ...
+NewPassword=New password
 ResetPassword=Kennwort zurücksetzen
 RequestToResetPasswordReceived=Eine Anfrage zur Änderung Ihres Dolibarr Passworts traf ein.
 NewKeyIs=Dies sind Ihre neuen Anmeldedaten
@@ -227,8 +230,8 @@ Chart=Grafik
 PassEncoding=Kennwort Encoding
 PermissionsAdd=Berechtigungen hinzugefügt
 PermissionsDelete=Berechtigungen entfernt
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
+YourPasswordMustHaveAtLeastXChars=Ihr Passwort muss mindestens <strong> %s </strong> Zeichen enthalten
+YourPasswordHasBeenReset=Ihr Passwort wurde zurückgesetzt
 ApplicantIpAddress=IP address of applicant
 ##### Export #####
 ExportsArea=Exportübersicht
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL der Seite
 WEBSITE_TITLE=TItel
 WEBSITE_DESCRIPTION=Beschreibung
 WEBSITE_KEYWORDS=Schlüsselwörter
+LinesToImport=Lines to import
diff --git a/htdocs/langs/de_DE/paypal.lang b/htdocs/langs/de_DE/paypal.lang
index e333d1ab033..92dc94b9dfe 100644
--- a/htdocs/langs/de_DE/paypal.lang
+++ b/htdocs/langs/de_DE/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Nur PayPal
 ONLINE_PAYMENT_CSS_URL=Optionale Adresse der CSS-Datei für die Onlinebezahlseite
 ThisIsTransactionId=Die Transaktions ID lautet: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Fügen Sie die Webadresse für Paypal Zahlungen hinzu, wenn Sie ein Dokument per E-Mail versenden.
-PredefinedMailContentLink=Sie können unten auf den sicheren Link klicken, um Ihre Zahlung mit PayPal \n\n %s \n\n zu tätigen
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=Sie befinden sich derzeit im %s "Sandbox" -Modus
 NewOnlinePaymentReceived=Neue Onlinezahlung erhalten
 NewOnlinePaymentFailed=Neue Onlinezahlung versucht, aber fehlgeschlagen
@@ -30,3 +30,6 @@ ErrorCode=Fehlercode
 ErrorSeverityCode=Fehlercode Schwierigkeitsgrad
 OnlinePaymentSystem=Online Zahlungssystem
 PaypalLiveEnabled=Paypal live aktiviert (Nicht im Test/Sandbox Modus)
+PaypalImportPayment=Paypal-Zahlungen importieren
+PostActionAfterPayment=Aktionen nach Zahlungseingang
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index bfaaa218ebf..3d984abec31 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Kontierungscode (Verkauf Export)
 ProductOrService=Produkt oder Leistung
 ProductsAndServices=Produkte und Leistungen
 ProductsOrServices=Produkte oder Leistungen
+ProductsPipeServices=Produkte | Dienstleistungen
 ProductsOnSaleOnly=Produkte nur für den Verkauf
 ProductsOnPurchaseOnly=Produkte nur für den Einkauf
 ProductsNotOnSell=Produkte weder für Einkauf, noch für Verkauf
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Möchten Sie diese Position wirklich löschen?
 ProductSpecial=Spezial
 QtyMin=Mindestmenge
 PriceQtyMin=Preis für diese Mindestmenge (mit/ohne Rabatt)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Umsatzsteuersatz (für diesen Lieferanten/diesesProdukt)
 DiscountQtyMin=Standardrabatt für die Menge
 NoPriceDefinedForThisSupplier=Einkaufskonditionen für diesen Hersteller noch nicht definiert
@@ -168,25 +170,25 @@ h=h
 day=Tag
 d=d
 kilogram=Kilo
-kg=Kg
+kg=kg
 gram=Gramm
 g=g
 meter=Meter
 m=m
-lm=lm
+lm=lfm
 m2=m²
 m3=m³
 liter=Liter
 l=L
 unitP=Stück
 unitSET=Set
-unitS=Zweitens
+unitS=Sekunden
 unitH=Stunden
 unitD=Tag
-unitKG=Kilo
+unitKG=Kilogramm
 unitG=Gramm
 unitM=Meter
-unitLM=Laufmeter
+unitLM=Laufende Meter
 unitM2=Quadratmeter
 unitM3=Kubikmeter
 unitL=Liter
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index fd42b819cf9..2af31a6953e 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Projektkontakte
 ProjectsImContactFor=Projekte bei denen ich ein direkter Kontakt bin
 AllAllowedProjects=Alle Projekte die ich sehen kann (Eigene + Öffentliche)
 AllProjects=Alle Projekte
-MyProjectsDesc=Diese Ansicht ist beschränkt auf Projekte bei welchen Sie als Ansprechpartner eingetragen sind.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Diese Ansicht zeigt alle Projekte, für die Sie zum Lesen berechtigt sind.
 TasksOnProjectsPublicDesc=Diese Ansicht zeigt alle Aufgaben der Projekte, für die Sie zum Lesen berechtigt sind.
 ProjectsPublicTaskDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
 ProjectsDesc=Es werden alle Projekte angezeigt (Ihre Berechtigungen berechtigt Sie alle Projekte zu sehen).
 TasksOnProjectsDesc=Es werden alle Aufgaben angezeigt (Ihre Berechtigungen berechtigt Sie alles zu sehen).
-MyTasksDesc=Diese Ansicht ist beschränkt auf Projekte oder Aufgaben bei welchen Sie als Ansprechpartner eingetragen sind.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Nur offene Projekte sind sichtbar. (Projekte im Status Entwurf oder Geschlossen sind nicht sichtbar)
 ClosedProjectsAreHidden=Abgeschlossene Projekte werden nicht angezeigt.
 TasksPublicDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Aufgaben in offenen Projekten
 WorkloadNotDefined=Arbeitsaufwand nicht definiert
 NewTimeSpent=Zeitaufwände
 MyTimeSpent=Mein Zeitaufwand
+BillTime=Bill the time spent
 Tasks=Aufgaben
 Task=Aufgabe
 TaskDateStart=Startdatum der Aufgabe
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Liste Spenden, die mit diesem Projekt verknüpft
 ListVariousPaymentsAssociatedProject=Liste der sonstigen mit dem Projekt verbundenen Zahlungen
 ListActionsAssociatedProject=Liste Ereignisse, die mit diesem Projekt verknüpft sind
 ListTaskTimeUserProject=Liste mit Zeitaufwand der Projektaufgaben
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Projektaktivitäten von heute
 ActivityOnProjectYesterday=Projektaktivitäten von gestern
 ActivityOnProjectThisWeek=Projektaktivitäten dieser Woche
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Projektaktivitäten dieses Monats
 ActivityOnProjectThisYear=Projektaktivitäten dieses Jahres
 ChildOfProjectTask=Subelemente des Projekts/Aufgabe
 ChildOfTask=Kindelement der Aufgabe
+TaskHasChild=Task has child
 NotOwnerOfProject=Nicht Eigner des privaten Projekts
 AffectedTo=Zugewiesen an
 CantRemoveProject=Löschen des Projekts auf Grund verbundener Elemente (Rechnungen, Bestellungen oder andere) nicht möglich. Näheres finden Sie unter dem Reiter Bezugnahmen.
@@ -137,6 +140,7 @@ ProjectReportDate=Passe Aufgaben-Datum dem neuen Projekt-Startdatum an
 ErrorShiftTaskDate=Es ist nicht möglich, das Aufgabendatum dem neuen Projektdatum anzupassen
 ProjectsAndTasksLines=Projekte und Aufgaben
 ProjectCreatedInDolibarr=Projekt %s erstellt
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Projekt %s geändert
 TaskCreatedInDolibarr=Aufgabe %s erstellt
 TaskModifiedInDolibarr=Aufgabe %s geändert
@@ -211,12 +215,15 @@ OppStatusPENDING=Anstehend
 OppStatusWON=Gewonnen
 OppStatusLOST=Verloren
 Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values :</u><br>- Keep empty: Can link any project of the company (default)<br>- "all" : Can link any projects, even project of other companies<br>- A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Projekt von anderem Unternehmen verknüpfen lassen <br> <br> <u> Unterstützte Werte: </u> <br> - Leer halten: Kann beliebiges Projekt des Unternehmens verlinken (Standard) <br> - "all": Verbindet beliebige Projekte, auch Projekte anderer Firmen <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>
 LatestProjects=%s neueste Projekte
 LatestModifiedProjects=Neueste %s modifizierte Projekte
 OtherFilteredTasks=Andere gefilterte Aufgaben
-NoAssignedTasks=Keine zugewiesenen Aufgaben (ordnen Sie sich das Projekt / Aufgaben aus dem oberen Auswahlfeld zu, um Zeiten einzugeben)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Alle Benutzerkommentare zur Aufgabe
 AllowCommentOnProject=Benutzer dürfen Projekte kommentieren
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index 905d33ad30a..53f731e538f 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Unterzeichnet (ist zu verrechnen)
 PropalStatusNotSigned=Nicht unterzeichnet (geschlossen)
 PropalStatusBilled=Verrechnet
 PropalStatusDraftShort=Entwurf
+PropalStatusValidatedShort=Bestätigt
 PropalStatusClosedShort=Geschlossen
 PropalStatusSignedShort=Unterzeichnet
 PropalStatusNotSignedShort=Nicht unterzeichnet
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 50440203924..534c47aa871 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Standard Buchhaltungskonto für Benutzer Partner
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Das in der Benutzerkarte hinterlegte Konto wird nur für die Nebenbücher verwendet. Dieses Konto wird für das Hauptbuch und als Vorgabewert für die Nebnbücher verwendet, wenn beim Benutzer kein Konto hinterlegt ist.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Buchhaltungs-Konto für Löhne
 Salary=Lohn
 Salaries=Löhne
 NewSalaryPayment=Neue Lohnzahlung
@@ -15,3 +15,4 @@ THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verbrau
 TJMDescription=Dieser Wert ist aktuell nur zu Informationszwecken und wird nicht für eine Berechnung verwendet
 LastSalaries=Letzte %sLohnzahlungen
 AllSalaries=Alle Lohnzahlungen
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index e6b9dcf8327..339f3e65edd 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Warenlager bearbeiten
 MenuNewWarehouse=Neues Warenlager
 WarehouseSource=Ursprungslager
 WarehouseSourceNotDefined=Keine Lager definiert,
+AddWarehouse=Create warehouse
 AddOne=Hinzufügen
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Ziellager
 ValidateSending=Lieferung freigeben
 CancelSending=Lieferung stornieren
@@ -22,6 +24,7 @@ Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
 ListOfWarehouses=Liste der Warenlager
 ListOfStockMovements=Liste der Lagerbewegungen
+ListOfInventories=List of inventories
 MovementId=Bewegungs ID
 StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Lagerbewegungen für Projekt
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index 1f238c537b4..3d2eadeb1a2 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=Neue Stripezahlung erhalten
 NewStripePaymentFailed=Neue Stripezahlung versucht, aber fehlgeschlagen
 STRIPE_TEST_SECRET_KEY=Geheimer Testschlüssel
 STRIPE_TEST_PUBLISHABLE_KEY=Öffentlicher Testschlüssel
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Geheimer Produktivschlüssel
 STRIPE_LIVE_PUBLISHABLE_KEY=Öffentlicher Produktivschlüssel
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live aktiviert (Nicht im Test/Sandbox Modus)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index e3b4b5f1d54..545d8724399 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Spesenabrechnung anzeigen
 NewTrip=neue Spesenabrechnung
 LastExpenseReports=Letzte %s Spesenabrechnungen
 AllExpenseReports=Alle Spesenabrechnungen
-CompanyVisited=Besuchter Partner
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Spesenbetrag bzw. Kilometergeld
 DeleteTrip=Spesenabrechnung löschen
 ConfirmDeleteTrip=Sind Sie sicher, dass diese Spesenabrechnung löschen wollen?
@@ -21,17 +21,17 @@ ListToApprove=Warten auf Bestätigung
 ExpensesArea=Spesenabrechnungen
 ClassifyRefunded=Als 'erstattet' markieren
 ExpenseReportWaitingForApproval=Eine neue Spesenabrechnung ist zur Genehmigung vorgelegt worden
-ExpenseReportWaitingForApprovalMessage=Ein neuer Spesenbericht wurde vorgelegt und wartet auf die Genehmigung.\n - Benutzer: %s\n - Zeitraum: %s\nKlicken Sie hier, um diesen freizugeben: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=Eine Spesenabrechnung ist zur erneuten Genehmigung vorgelegt worden
-ExpenseReportWaitingForReApprovalMessage=Eine Spesenabrechnung wurde eingereicht und wartet darauf, un wartet auf erneute Freigabe.\nDie %s, Sie verweigerte die Freigabe der Spesenabrechnung aus folgenden Grunde: %s.\nEine neue Version wurde für Ihre Freigabe vorgeschlagen und wartet.\n - Benutzer: %s\n - Zeitraum: %s\nKlicken Sie hier, um diesen hier freizugeben: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=Eine Spesenabrechnung wurde genehmigt
-ExpenseReportApprovedMessage=Der Spesenbericht %s wurde genehmigt.\n - Benutzer: %s\n - Genehmigt von: %s\nKlicken Sie hier, um die Spesenabrechnung zu zeigen: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=Eine Spesenabrechnung wurde abgelehnt
-ExpenseReportRefusedMessage=Der Spesenbericht %s wurde abgelehnt.\n - Benutzer: %s\n - Refused von: %s\n - Motive für die Ablehnung: %s\nKlicken Sie hier, um die Spesenabrechnung zeigen: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=Eine Spesenabrechnung wurde storniert
-ExpenseReportCanceledMessage=Der Spesenbericht %s wurde abgebrochen.\n - Benutzer: %s\n - Storniert von: %s\n - Motive für die Stornierung: %s\nKlicken Sie hier, um die Spesenabrechnung zu zeigen: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=Eine Spesenabrechnung wurde ausbezahlt
-ExpenseReportPaidMessage=Der Spesenbericht %s wurde bezahlt.\n - Benutzer: %s\n - Paid von: %s\nKlicken Sie hier, um die Spesenabrechnung anzuzeigen: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Spesenabrechnung ID
 AnyOtherInThisListCanValidate=Person für die Validierung zu informieren .
 TripSociete=Partner
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Standardmäßiges Verkehrsmittel
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Sie haben bereits eine andere Spesenabrechnung in einem ähnlichen Datumsbereich erstellt.
 AucuneLigne=Es wurde noch keine Spesenabrechnung erstellt.
 
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index e81ecdacd1b..1a410486ddb 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -6,7 +6,7 @@ Permission=Berechtigung
 Permissions=Berechtigungen
 EditPassword=Passwort bearbeiten
 SendNewPassword=Neues Passwort zusenden
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Link zum Zurücksetzen des Passworts senden
 ReinitPassword=Passwort zurücksetzen
 PasswordChangedTo=Neues Passwort: %s
 SubjectNewPassword=Ihr neues Passwort für %s
@@ -44,9 +44,9 @@ NewGroup=Neue Gruppe
 CreateGroup=Gruppe erstellen
 RemoveFromGroup=Gruppenzuweisung entfernen
 PasswordChangedAndSentTo=Passwort geändert und an <b>%s</b> gesendet.
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=Aufforderung, das Passwort für <b> %s </b> zu ändern
 PasswordChangeRequestSent=Kennwort-Änderungsanforderung für <b>%s</b> gesendet an <b>%s</b>.
-ConfirmPasswordReset=Confirm password reset
+ConfirmPasswordReset=Passwort zurücksetzen
 MenuUsersAndGroups=Benutzer & Gruppen
 LastGroupsCreated=Letzte %s erstellte Gruppen
 LastUsersCreated=%s neueste ertellte Benutzer
@@ -69,7 +69,7 @@ InternalUser=Interne Benutzer
 ExportDataset_user_1=Benutzer und -eigenschaften
 DomainUser=Domain-Benutzer %s
 Reactivate=Reaktivieren
-CreateInternalUserDesc=Dieses Formular erlaubt Ihnen das Anlegen eines Internen Benutzers. Zum Anlegen eines externen Benutzers (Kunden, Lieferanten, ...), verwenden Sie bitte die 'Benutzer erstellen'-Schaltfläche in der Kontaktkarte des jeweiligen Partnerkontakts.
+CreateInternalUserDesc=Dieses Formular erlaubt Ihnen das Anlegen eines unternehmensinternen Benutzers. Zum Anlegen eines externen Benutzers (Kunden, Lieferanten, ...), verwenden Sie bitte die 'Benutzer erstellen'-Schaltfläche in der Kontaktkarte des jeweiligen Partnerkontakts.
 InternalExternalDesc=Ein <b>interner</b> Benutzer ist Teil Ihres Unternehmens/Stiftung. <br> Ein <b>externer</b> Benutzer ist ein Kunde, Lieferant oder Anderes.<br><br>In beiden Fällen können Berechtigungen in Dolibarr definiert werden. Ein externer Benutzer kann auch ein anderes Menüsystem als interne Benutzer verwenden. (Home->Setup->Anzeige)
 PermissionInheritedFromAGroup=Berechtigung durch eine Gruppenzugehörigkeit geerbt.
 Inherited=Geerbt
@@ -93,6 +93,7 @@ NameToCreate=Name des neuen Partners
 YourRole=Ihre Rolle
 YourQuotaOfUsersIsReached=Ihr Kontingent aktiver Benutzer ist erreicht
 NbOfUsers=Anzahl der Benutzer
+NbOfPermissions=Anzahl der Berechtigungen
 DontDowngradeSuperAdmin=Nur ein SuperAdmin kann einen SuperAdmin downgraden
 HierarchicalResponsible=Vorgesetzter
 HierarchicView=Hierarchische Ansicht
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 8689c22eab6..405d6f9a643 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Erstellen Sie hier für jede benötigte Website einen Eintrag.
 DeleteWebsite=Website löschen
 ConfirmDeleteWebsite=Möchten Sie diese Website wirklich löschen? Alle Seiten inkl. Inhalt werden auch gelöscht.
 WEBSITE_TYPE_CONTAINER=Art der Seite/Containers
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Seitenname/Alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL der externen CSS-Datei
 WEBSITE_CSS_INLINE=CSS-Dateiinhalt (für alle Seiten gleich)
 WEBSITE_JS_INLINE=Javascript-Dateiinhalt (für alle Seiten gleich)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Seite in neuem Tab anzeigen
 SetAsHomePage=Als Startseite festlegen
 RealURL=Echte URL
 ViewWebsiteInProduction=Anzeige der Webseite über die Startseite\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nüber die URL der Homepage
-SetHereVirtualHost=Wenn Sie auf Ihrem Webserver einen dedizierten virtuellen Host mit dem Hauptverzeichnis <strong>%s</strong> und aktiviertem PHP einrichten können, geben Sie hier den virtuellen Host-Namen ein, so dass die Vorschau dann über den direkten Web-Server Zugriff funktioniert und nicht nur der Dolibarr Server benutzt werden kann.
-PreviewSiteServedByWebServer=Vorschau %s in neuem Tab.<br><br>%s wird durch einen externen Webserver (Wie Apache, Nginx, IIS) ausgeliefert. Dieser Server muss installiert sein. Verzeichnis <br><strong>%s</strong><br> als URL <br><strong>%s</strong> durch den externen Webserver freigeben
-PreviewSiteServedByDolibarr=Vorschau %sin neuem Tab. <br><br>%swird durch den Dolibarr Server ausgeliefert, so dass kein zusätzlicher Webserver (Wie Apache, Nginx, IIS) notwendig ist. <br>Dadurch erhalten die Seiten URL's die nicht so Benutzerfreundlich sind und der Pfad beginnt mit ihrer Dolibarr Installation.<br> URL durch Dolibarr ausgeliefert: <br><strong>%s</strong><br><br> Um einen externen Webserver zu verwenden, muss ein Virtualhost auf Ihrem Webserver eingerichtet werden, welchers das Verzeichnis <br><strong>%s</strong><br> auf dem neuen virtuellen Server freigibt. Vorschau durch klick auf den anderen Vorschaubutton.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Lesen
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL des virtuellen Hosts, der von einem externen Webserver bedient wird, ist nicht definiert
 NoPageYet=Noch keine Seiten
 SyntaxHelp=Hilfe zu bestimmten Syntaxtipps
 YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltfläche "Quelle" im Editor bearbeiten.
-YouCanEditHtmlSource=<br> <span class="fa fa-bug"></span>Sie können hier PHP-Code einfügen, indem Sie die Tags <strong> &lt;?php? &gt;</strong> verwenden. Die folgenden globalen Variablen sind verfügbar: $conf, $langs, $db, $mysoc, $user, $website. <br> <br><span class="fa fa-bug"></span> Sie können auch Inhalt einer anderen Seite / Container mit folgender Syntax einbinden: <br> <strong> &lt;?php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br> <br><span class="fa fa-download"></span>Um einen <strong> Link zum Herunterladen</strong> eines <strong> im Dokumentenverzeichnis</strong>, verwenden Sie den <strong> document.php</strong> -Wrapper: <br> Beispiel, für eine Datei in Dokumente / ecm (muss protokolliert werden) lautet die Syntax: <br> <strong> &lt;a href = "/document.php?modulefct=ecm&file=[relative_dir/]filename.ext" &gt; </ strong> <br> Für eine Datei in Dokumente / Medien (offenes Verzeichnis für den öffentlichen Zugriff) lautet die Syntax: <br> <strong> &lt;a href = "/ document.php? modulepart = medias & file = [relative_dir /] filename.ext" &gt; </strong><br> Für eine Datei, die mit einem Share-Link geteilt wird (offener Zugriff mit dem Sharing-Hash-Schlüssel der Datei), ist die Syntax: <br> <strong> &lt;a href = "/ dokument.php? hashp = publicsharekeyoffile" &gt; </ strong> <br> <br> <span class="fa fa-picture-o"></span> Für ein <strong> Bild </strong> gespeichert im Verzeichnis <strong> Dokumente </strong>, verwenden Sie den Wrapper <strong> viewimage.php </strong>. <br>Beispiel für ein Bild in Dokumente / Medien (Open Access), Syntax: <br> <strong> &lt;a href = "/ viewimage.php? modulpart = medias&amp;file = [relative_verz /] filename.ext" &gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Seite klonen
 CloneSite=Seite klonen
 SiteAdded=Website hinzugefügt
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Zurück zur Liste für Drittanbieter
 DisableSiteFirst=Webseite zuerst deaktivieren
 MyContainerTitle=Titel der Webseite
 AnotherContainer=Ein weiterer Container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index f1affec1997..b18c106e555 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Bestellung mit Zahlart Lastschrift 
 SuppliersStandingOrdersArea=Bereich Bankeinzug
-StandingOrders=Bestellungen mit Zahlart Lastschrift 
-StandingOrder=Bestellung mit Zahlart Lastschrift 
+StandingOrdersPayment=Bestellungen mit Zahlart Lastschrift 
+StandingOrderPayment=Lastschrift
 NewStandingOrder=Neue Bestellung mit Zahlart Lastschrift 
 StandingOrderToProcess=Zu bearbeiten
 WithdrawalsReceipts=Lastschriften
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistiken nach Statuszeilen
 RUM=UMR
 RUMLong=Eindeutige Mandatsreferenz
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Lastschriftmodus (FRST oder RECUR)
 WithdrawRequestAmount=Lastschrifteinzug Einzugs Betrag:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=Einmalzahlung
 PleaseCheckOne=Bitte prüfen sie nur eine
 DirectDebitOrderCreated=Lastschrift %s erstellt
 AmountRequested=angeforderter Betrag
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Zahlung des Lastschrifteinzug %s an die Bank
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index ba7d192701b..2fa0016006a 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -2,11 +2,11 @@
 ACCOUNTING_EXPORT_SEPARATORCSV=Διαχωριστής στηλών για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_DATE=Μορφή ημερομηνίας για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Εξαγωγή με καθολικό λογαριασμό
 ACCOUNTING_EXPORT_LABEL=Εξαγωγή ετικέτας
 ACCOUNTING_EXPORT_AMOUNT=Εξαγωγή ποσού
 ACCOUNTING_EXPORT_DEVISE=Εξαγωγή νομίσματος
-Selectformat=Select the format for the file
+Selectformat=Επιλέξτε το φορμάτ του αρχείου
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
 ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
@@ -23,10 +23,10 @@ JournalFinancial=Οικονομικά ημερολόγια
 BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
 Chartofaccounts=Διάγραμμα λογαριασμών
 CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
+AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -79,14 +79,14 @@ SubledgerAccount=Subledger Account
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
+MenuDefaultAccounts=Προεπιλεγμένοι λογαριασμοί
 MenuBankAccounts=Τραπεζικοί Λογαριασμοί
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
+MenuVatAccounts=Λογαριασμοί ΦΠΑ
+MenuTaxAccounts=Λογαριασμοί Φόρων
 MenuExpenseReportAccounts=Expense report accounts
 MenuLoanAccounts=Loan accounts
 MenuProductsAccounts=Λογαρισμοί προϊόντων
-ProductsBinding=Products accounts
+ProductsBinding=Λογαριασμοί προϊόντων
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
 SuppliersVentilation=Supplier invoice binding
@@ -149,52 +149,50 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Τύπος εγγράφου
 Docdate=Ημερομηνία
 Docref=Παραπομπή
-Code_tiers=Πελ./Προμ.
 LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Label operation
 Sens=Σημασία
 Codejournal=Ημερολόγιο
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Προσωποποιημένες ομάδες
 GroupByAccountAccounting=Group by accounting account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Με χρόνια
-NotMatch=Not Set
+NotMatch=Δεν έχει οριστεί
 DeleteMvt=Delete Ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
+DelYear=Έτος προς διαγραφή
+DelJournal=Ημερολόγιο προς διαγραφή
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Ημερολόγιο οικονομικών
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
-VATAccountNotDefined=Account for VAT not defined
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Δεν έχει οριστεί λογαριασμός για ΦΠΑ
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Πληρωμή τιμολογίου προμηθευτή
-ThirdPartyAccount=Λογαριασμός Πελ./Προμ.
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Νέα συναλλαγή
 NumMvts=Αριθμός συναλλαγής
-ListeMvts=List of movements
+ListeMvts=Λίστα κινήσεων
 ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
 AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third party account
+ReportThirdParty=Λίστα λογαριασμού τρίτων
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
 
-Pcgtype=Group of account
-Pcgsubtype=Subgroup of account
+Pcgtype=Ομάδα του λογαριασμού
+Pcgsubtype=Υποομάδα του λογαριασμού
 PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
 TotalVente=Total turnover before tax
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να δι
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Πληρώθηκε σε
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Πωλήσεις
 AccountingJournalType3=Αγορές
 AccountingJournalType4=Τράπεζα
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 9f22b81fb36..59600b93f9c 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρη
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ αν η ακολουθία {yy}{mm} ή {yyyy}{mm} δεν είναι στην μάσκα.
 UMask=Παράμετρος UMask για νέα αρχεία σε συστήματα αρχείων συστημάτων Unix/Linux/BSD/Mac.
 UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να ορίσετε προεπιλεγμένα δικαιώματα αρχείων για αρχεία που δημιουργεί το Dolibarr στον διακομιστή (κατά την διάρκεια μεταφόρτωσης π.χ.).<br>Πρέπει να είναι οκταδικής μορφής (για παράδειγμα, 0666 σημαίνει εγγραφή και ανάγνωση για όλους).<br>Αυτή η παράμετρος είναι άχρηστη σε διακομιστές Windows.
-SeeWikiForAllTeam=Ρίξτε μια ματιά στην σελίδα wiki για μια πλήρη λίστα όλων των actors και της οργάνωσής τους
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Καθυστέρηση για την τοποθέτηση απόκρισης εξαγωγής στην προσωρινή μνήμη σε δευτερόλεπτα (0 ή άδεια για μη χρήση προσωρινής μνήμης)
 DisableLinkToHelpCenter=Αποκρύψτε τον σύνδεσμο "<b>Αναζητήστε βοήθεια ή υποστήριξη</b>" στην σελίδα σύνδεσης
 DisableLinkToHelp=Απόκρυψη του συνδέσμου online βοήθεια "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τ
 MassConvert=Έναρξη μαζικής μεταβολής
 String=String
 TextLong=Μεγάλο κείμενο
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Ημερομηνία και ώρα
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Βιβλιοθήκη δημιουργίας PDF
-WarningUsingFPDF=Προειδοποίηση: Το αρχείο <b>conf.php</b> περιλαμβάνει την επιλογή <b>dolibarr_pdf_force_fpdf=1</b>. Αυτό σημαίνει πως χρησιμοποιείτε η βιβλιοθήκη FPDF για να δημιουργούνται τα αρχεία PDF. Αυτή η βιβλιοθήκη είναι παλιά και δεν υποστηρίζει πολλές λειτουργίες (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), οπότε μπορεί να παρουσιαστούν λάθη κατά την δημιουργία των PDF.<br>Για να λυθεί αυτό και να μπορέσετε να έχετε πλήρη υποστήριξη δημιουργίας αρχείων PDF, παρακαλώ κατεβάστε την <a href="http://www.tcpdf.org/" target="_blank">βιβλιοθήκη TCPDF</a>,  και μετά απενεργοποιήστε ή διαγράψτε την γραμμή <b>$dolibarr_pdf_force_fpdf=1</b>, και εισάγετε αντί αυτής την <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε κλήση με το ClickToDial για τον χρήστη <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Χρήστες & Ομάδες
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Περιθώρια
 Module59000Desc=Πρόσθετο για την διαχείριση των περιθωρίων
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Διεθνείς Εμπορικός Όρος
+Module62000Desc=Προσθέστε δυνατότητες για τη διαχείριση του Διεθνή Εμπορικού Όρου
 Module63000Name=Πόροι
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Δημιουργία/τροποποίηση των αιτήσεων αδειών σας
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Διαγραφή των αιτήσεων άδειας
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Δημιουργία/τροποποίηση των αιτήσεων αδειών για όλους
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Λεπτομέρειες προγραμματισμένης εργασίας
 Permission23002=Δημιουργήστε/ενημερώστε μια προγραμματισμένη εργασία
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Ποσό των ενσήμων
 DictionaryPaymentConditions=Όροι πληρωμής
 DictionaryPaymentModes=Τρόποι πληρωμής
 DictionaryTypeContact=Τύποι Επικοινωνίας/Διεύθυνση
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Οικολογικός φόρος (ΑΗΗΕ)
 DictionaryPaperFormat=Μορφές χαρτιού
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Διαχείριση Φ.Π.Α.
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Τιμή
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Διακομιστής
 DriverType=Driver type
 SummarySystem=Σύνοψη πληροφοριών συστήματος
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Εταιρία/Οργανισμός
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Τυπικός διαχειριστής μενού
 DefaultMenuSmartphoneManager=Διαχειριστής μενού Smartphone
 Skin=Θέμα
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Προκαθορισμένη Γλώσσα (κωδ. γλώσσας)
 EnableMultilangInterface=Ενεργοποίησ πολυγλωσσικού περιβάλλοντος
 EnableShowLogo=Εμφάνιση λογότυπου στο αριστερό μενού
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Όνομα
 CompanyAddress=Διεύθυνση
 CompanyZip=Τ.Κ.
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Αποτυχία προετοιμασίας μενού
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Βάσει μετρητών
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Βάσει δεδουλευμένων
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Χρόνος της καταλληλότητας του ΦΠΑ εξ ορισμού ανάλογα την επιλογή:
 OnDelivery=Κατά την αποστολή
 OnPayment=Κατά την πληρωμή
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Αγορά
 Sell=Πώληση
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index bdf0f29697e..4ac495505cc 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Μέλος %s επικυρωθεί
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Μέλος %s διαγράφηκε
-MemberSubscriptionAddedInDolibarr=Συνδρομή για το μέλος %s προστέθηκε
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Η αποστολή %s επικυρώθηκε
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Μπορείτε ακόμη να προσθέσετε τις 
 AgendaUrlOptions3=<b>logina=%s</b> να περιορίσει την παραγωγή ενεργειών που ανήκουν στον χρήστη <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> να περιορίσει την παραγωγή της σε ενέργειες που σχετίζονται με το έργο <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των επαφών
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των επαφών
 Busy=Απασχολ.
@@ -109,7 +112,7 @@ ExportCal=Εξαγωγή ημερολογίου
 ExtSites=Εισαγωγή εξωτερικών ημερολογίων
 ExtSitesEnableThisTool=Εμφάνιση εξωτερικών ημερολογίων (ορίζεται από τις γενικές ρυθμίσεις) στην ημερήσια διάταξη. Δεν επηρεάζει τα εξωτερικά ημερολόγια που ορίζονται από τους χρήστες.
 ExtSitesNbOfAgenda=Αριθμός ημερολογίων
-AgendaExtNb=Ημερολόγιο nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .ical αρχείο
 ExtSiteNoLabel=Χωρίς Περιγραφή
 VisibleTimeRange=Ορατό χρονικό εύρος
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index b49c8e942a7..5d08d610f6a 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Διαγραφή Πληρωμής
 ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε την πληρωμή;
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Πληρωμές Προμηθευτών
 ReceivedPayments=Ληφθείσες Πληρωμές
 ReceivedCustomersPayments=Ληφθείσες Πληρωμές από πελάτες
@@ -91,7 +92,7 @@ PaymentAmount=Σύνολο πληρωμής
 ValidatePayment=Επικύρωση πληρωμής
 PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη από το υπόλοιπο
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Προσοχή, το ποσό πληρωμής ενός ή περισσοτέρων λογαριασμών είναι υψηλότερο από την υπόλοιπη να πληρωμή. <br> Επεξεργαστείτε την εγγραφή σας, αλλιώς κάντε επιβεβαίωση.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Χαρακτηρισμός ως 'Πληρωμένο''
 ClassifyPaidPartially=Χαρακτηρισμός ως 'Μη Εξοφλημένο'
 ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμένο'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Μετατροπή σε μελλοντική έκπτωση
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
 EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
 DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Κατάσταση δημιουργηθέντων τι
 BillStatusDraft=Πρόχειρο (απαιτείται επικύρωση)
 BillStatusPaid=Πληρωμένο
 BillStatusPaidBackOrConverted=Refund or converted into discount
-BillStatusConverted=Μετατράπηκε σε έκπτωση
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Εγκαταλελειμμένο
 BillStatusValidated=Επικυρωμένο (χρήζει πληρωμής)
 BillStatusStarted=Ξεκίνησε
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
 ExcessReceived=Περίσσεια που λήφθηκε
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Έκπτωση
 SendBillRef=Υποβολή των τιμολογίων %s
@@ -283,16 +286,20 @@ Deposit=Κατάθεση
 Deposits=Καταθέσεις
 DiscountFromCreditNote=Έκπτωση από το πιστωτικό τιμολόγιο %s
 DiscountFromDeposit=Πληρωμές από το τιμολόγιο κατάθεσης %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Νέα απόλυτη έκπτωση
 NewRelativeDiscount=Νέα σχετική έκπτωση
+DiscountType=Discount type
 NoteReason=Σημείωση/Αιτία
 ReasonDiscount=Αιτία
 DiscountOfferedBy=Παραχωρούνται από
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Διεύθυνση χρέωσης
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Ημερομηνία δημιουργίας του επόμ
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Ημερομηνία τελευταίας δημιουργίας
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Μέγιστος αρ δημιουργηθλεντων τιμολογίων
-NbOfGenerationDone=Αρ. δημιουργηθέντων ολοκληρωμένων τιμολογίων
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index fba23751912..289d7f925dd 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -43,7 +43,8 @@ Individual=Ιδιώτης
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Γονική εταιρία
 Subsidiaries=Θυγατρικές
-ReportByCustomers=Αναφορά ανά πελάτες
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Αναφορά ανά τιμή
 CivilityCode=Προσφωνήσεις
 RegisteredOffice=Έδρα της εταιρείας
@@ -75,10 +76,12 @@ Town=Πόλη
 Web=Ιστοσελίδα
 Poste= Θέση
 DefaultLang=Γλώσσα
-VATIsUsed=Χρήση ΦΠΑ
-VATIsNotUsed=Χωρίς ΦΠΑ
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Α.Φ.Μ
-VATIntraShort=Α.Φ.Μ.
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Το συντακτικό είναι έγκυρο
+VATReturn=VAT return
 ProspectCustomer=Προοπτική / Πελάτης
 Prospect=Προοπτική
 CustomerCard=Καρτέλα Πελάτη
 Customer=Πελάτης
 CustomerRelativeDiscount=Σχετική έκπτωση πελάτη
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Σχετική έκπτωση
 CustomerAbsoluteDiscountShort=Απόλυτη έκπτωση
 CompanyHasRelativeDiscount=This customer has a discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer still has discount credits for <b>%s %s</b>
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Ο πελάτης εξακολουθεί να έχει πιστωτικά τιμολόγια για <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Απόλυτες εκπτώσεις (Επικυρωμένες απ' όλους τους χρήστες)
-CustomerAbsoluteDiscountMy=Απόλυτες εκπτώσεις (Επικυρωμένες από εσάς)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Καμία
 Supplier=Προμηθευτής
 AddContact=Δημιουργία επαφής
@@ -377,9 +390,9 @@ NoDolibarrAccess=Χωρίς πρόσβαση στο Dolibarr
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Αντιπρόσωποι και ιδιότητες
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Επαφές / Διευθύνσεις (από Πελ./Προμ. ή όχι) και χαρακτηριστικά
-ImportDataset_company_3=Στοιχεία τραπεζικού λογαριασμού
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Επίπεδο τιμής
 DeliveryAddress=Διεύθυνση αποστολής
 AddAddress=Δημιουργία διεύθυνσης
@@ -406,15 +419,16 @@ ProductsIntoElements=Κατάλογος των προϊόντων/υπηρεσι
 CurrentOutstandingBill=Τρέχον εκκρεμείς λογαριασμός
 OutstandingBill=Μέγιστο. για εκκρεμείς λογαριασμό
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time.
 ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...)
 MergeOriginThirdparty=Διπλότυπο Πελ./Προμ. ( Πελ./Προμ. θέλετε να διαγραφεί)
 MergeThirdparties=Συγχώνευση  Πελ./Προμ.
 ConfirmMergeThirdparties=Είστε σίγουροι ότι θέλετε να εισάγεται τα στοιχεία αυτού του Πελ./Προμ. στον υπάρχον; Όλα τα συνδεδεμένα πεδία (Τιμολόγια, Παραγγελίες, ....) θα μετακινηθούν στον υπάρχον Πελ./Προμ., και έπειτα αυτός ο Πελ./Προμ. θα διαγραφεί.
-ThirdpartiesMergeSuccess=Πελ./Προμ. έχουν συγχωνευθεί
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=Υπήρξε ένα σφάλμα κατά τη διαγραφή των Πελ./Προμ.. Παρακαλώ ελέγξτε το αρχείο καταγραφής. Αλλαγές έχουν επανέλθει.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 0feeec6e88f..895a5e0a9c3 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -31,7 +31,7 @@ Credit=Πίστωση
 Piece=Λογιστικό Εγγρ.
 AmountHTVATRealReceived=Σύνολο καθαρών εισπράξεων
 AmountHTVATRealPaid=Σύνολο καθαρών πληρωμένων
-VATToPay=Φ.Π.Α. Πωλήσεων
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=Πληρωμές IRPF
 VATPayment=Πληρωμή ΦΠΑ πωλήσεων
 VATPayments=Πληρωμές ΦΠΑ πωλήσεων
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Πληρωμές Κοινωνικών/Φορολογικών εισφορών
 ShowVatPayment=Εμφάνιση πληρωμής φόρου
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Έκθεση του τρίτου IRPF
-LT1ReportByCustomersInInputOutputModeES=Αναφορά Πελ./Προμ. RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Αναφορά Πελ./Προμ. RE
+LT2ReportByCustomersES=Έκθεση του τρίτου IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Αναφορά από τον ΦΠΑ των πελατών εισπράττεται και καταβάλλεται
-VATReportByCustomersInDueDebtMode=Αναφορά από τον ΦΠΑ των πελατών εισπράττεται και καταβάλλεται
-VATReportByQuartersInInputOutputMode=Αναφορά συντελεστή του ΦΠΑ που εισπράττεται και καταβάλλεται
-LT1ReportByQuartersInInputOutputMode=Αναφορά με ποσοστό RE
-LT2ReportByQuartersInInputOutputMode=Αναφορά IRPF επιτόκιο
-VATReportByQuartersInDueDebtMode=Αναφορά συντελεστή του ΦΠΑ που εισπράττεται και καταβάλλεται
-LT1ReportByQuartersInDueDebtMode=Αναφορά με ποσοστό RE
-LT2ReportByQuartersInDueDebtMode=Αναφορά IRPF επιτόκιο
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Αναφορά με ποσοστό RE
+LT2ReportByQuartersES=Αναφορά IRPF επιτόκιο
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- Για τις υπηρεσίες, η αναφορά περιλαμβάνει τους κανονισμούς ΦΠΑ που πράγματι εισπράχθηκαν ή εκδίδονται με βάση την ημερομηνία πληρωμής.
-RulesVATInProducts=- Για τα υλικά περιουσιακά στοιχεία, περιλαμβάνει τα τιμολόγια ΦΠΑ, με βάση την ημερομηνία έκδοσης του τιμολογίου.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Για τις υπηρεσίες, η έκθεση περιλαμβάνει τα τιμολόγια ΦΠΑ που οφείλεται, αμειβόμενη ή μη, με βάση την ημερομηνία έκδοσης του τιμολογίου.
-RulesVATDueProducts=- Για τα υλικά περιουσιακά στοιχεία, περιλαμβάνει τα τιμολόγια ΦΠΑ, με βάση την ημερομηνία έκδοσης του τιμολογίου.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/τιμολόγιο
 NotUsedForGoods=Δεν γίνεται χρήση σε υλικά αγαθά
 ProposalStats=Στατιστικά στοιχεία σχετικά με τις προτάσεις
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακή λογιστική</b> η λειτουργία δεν είναι σχετική. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστική δέσμευση</b> τρόπος (ανατρέξτε τη Ρύθμιση του module λογιστικής).
 CalculationMode=Τρόπος υπολογισμού
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 329268a4313..c2fe5100a6a 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Δεν έχουν καταχωρηθεί εργασίες
 CronPriority=Προτεραιότητα
 CronLabel=Ετικέτα
 CronNbRun=Nb. έναρξης
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Κάθε
 JobFinished=Ξεκίνησε και τελείωσε
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Από
 CronType=Είδος εργασίας
 CronType_method=Call method of a PHP Class
 CronType_command=Εντολή Shell
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Αντίγραφο ασφαλείας τοπικής βάσης δεδομένων
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 9bf1c660882..38f36b1aee7 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Η αντιστοίχιση Dolibarr-LDAP δεν εί
 ErrorLDAPMakeManualTest=Ένα αρχείο. Ldif έχει δημιουργηθεί στον φάκελο %s. Προσπαθήστε να το φορτώσετε χειροκίνητα από την γραμμή εντολών για να έχετε περισσότερες πληροφορίες σχετικά με τα σφάλματα.
 ErrorCantSaveADoneUserWithZeroPercentage=Δεν μπορεί να σώσει μια ενέργεια με &quot;δεν statut ξεκίνησε&quot; αν πεδίο &quot;γίνεται από&quot; είναι επίσης γεμάτη.
 ErrorRefAlreadyExists=Κωδικός που χρησιμοποιείται για τη δημιουργία ήδη υπάρχει.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Δεν είναι δυνατή η διαγραφή της εγγραφής.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/el_GR/loan.lang b/htdocs/langs/el_GR/loan.lang
index c25a6583076..67e7614706e 100644
--- a/htdocs/langs/el_GR/loan.lang
+++ b/htdocs/langs/el_GR/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 45951a967ec..1ddf71aeb5d 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Αρ. επιλεγμένων
 NbIgnored=Nb ignored
 NbSent=Αρ. απεσταλμένων
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Τρέχων αριθμός των στοχευμένων 
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Ελάχιστη τιμή
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index f6090a6db7b..f24d4c4a3dd 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Η παράμετρος %s δεν είναι καθορ
 ErrorUnknown=Άγνωστο σφάλμα
 ErrorSQL=Σφάλμα SQL
 ErrorLogoFileNotFound=Το λογότυπο  '%s' δεν βρέθηκε
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Πηγαίνετε στις ρυθμίσεις του αρθρώματος για να το διορθώσετε.
 ErrorFailedToSendMail=Αποτυχία αποστολής mail (αποστολέας=%s, παραλήπτης=%s)
 ErrorFileNotUploaded=Το αρχείο δεν φορτώθηκε. Βεβαιωθείτε ότι το μέγεθος δεν υπερβαίνει το μέγιστο επιτρεπόμενο όριο, ότι υπάρχει διαθέσιμος χώρος στο δίσκο και ότι δεν υπάρχει ήδη ένα αρχείο με το ίδιο όνομα σε αυτόν τον κατάλογο.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Σφάλμα, δεν ορίστηκαν π
 ErrorNoSocialContributionForSellerCountry=Σφάλμα, καμία κοινωνική εισφορά / φόροι ορίζονται για τη χώρα '%s'.
 ErrorFailedToSaveFile=Σφάλμα, αποτυχία αποθήκευσης αρχείου
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Δεν έχετε εξουσιοδότηση για να το πραγματοποιήσετε
 SetDate=Ορισμός ημερομηνίας
 SelectDate=Επιλέξτε μια ημερομηνία
 SeeAlso=Δείτε επίσης %s
 SeeHere=Δείτε εδώ
+ClickHere=Κάντε κλικ εδώ
+Here=Here
 Apply=Εφαρμογή
 BackgroundColorByDefault=Προκαθορισμένο χρώμα φόντου
 FileRenamed=Το αρχείο μετονομάστηκε με επιτυχία
@@ -185,6 +187,7 @@ ToLink=Σύνδεσμος
 Select=Επιλογή
 Choose=Επιλογή
 Resize=Αλλαγή διαστάσεων
+ResizeOrCrop=Resize or Crop
 Recenter=Επαναφορά στο κέντρο
 Author=Συντάκτης
 User=Χρήστης
@@ -325,8 +328,10 @@ Default=Προκαθορ.
 DefaultValue=Προκαθορισμένη Τιμή
 DefaultValues=Default values
 Price=Τιμή
+PriceCurrency=Price (currency)
 UnitPrice=Τιμή Μονάδος
 UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Τιμή Μονάδος
 PriceU=Τιμή μον.
 PriceUHT=Τιμή μον.
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P. (νόμισμα)
 PriceUTTC=Τιμή μον. (συμπ. Φ.Π.Α.)
 Amount=Ποσό
 AmountInvoice=Ποσό Τιμολογίου
+AmountInvoiced=Amount invoiced
 AmountPayment=Ποσό Πληρωμής
 AmountHTShort=Ποσό (χ. Φ.Π.Α.)
 AmountTTCShort=Ποσό (με Φ.Π.Α.)
@@ -353,6 +359,7 @@ AmountLT2ES=Ποσό IRPF
 AmountTotal=Συνολικό Ποσό
 AmountAverage=Μέσο Ποσό
 PriceQtyMinHT=Τιμή ελάχιστης ποσότητας (χ. ΦΠΑ)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Ποσοστό
 Total=Σύνολο
 SubTotal=Υποσύνολο
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Συντελεστής Φ.Π.Α.
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Μ.Ο.
 Sum=Σύνολο
@@ -419,7 +428,8 @@ ActionRunningShort=Σε εξέλιξη
 ActionDoneShort=Ολοκληρωμένες
 ActionUncomplete=Μη ολοκληρωμένη
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Εταιρία/Οργανισμός
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Επαφές για αυτό το στοιχείο
 ContactsAddressesForCompany=Επαφές/Διευθύνσεις για αυτό το στοιχείο.
 AddressesForCompany=Διευθύνσεις για αυτό τον Πελ./Προμ.
@@ -427,6 +437,9 @@ ActionsOnCompany=Ενέργειες για αυτό το στοιχείο
 ActionsOnMember=Εκδηλώσεις σχετικά με αυτό το μέλος
 ActionsOnProduct=Events about this product
 NActionsLate=%s καθυστερ.
+ToDo=Να γίνουν
+Completed=Completed
+Running=Σε εξέλιξη
 RequestAlreadyDone=Η αίτηση έχει ήδη καταγραφεί
 Filter=Φίλτρο
 FilterOnInto=Κριτήρια αναζήτησης '<strong>%s</strong>' σε πεδίο
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=Σφάλμα συστήματος
 CoreErrorMessage=Λυπούμαστε, παρουσιάστηκε ένα σφάλμα. Επικοινωνήστε με το διαχειριστή του συστήματος σας για να ελέγξετε τα αρχεία καταγραφής ή να απενεργοποιήστε το $ dolibarr_main_prod = 1 για να πάρετε περισσότερες πληροφορίες.
 CreditCard=Πιστωτική Κάρτα
+ValidatePayment=Επικύρωση πληρωμής
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Τα πεδία <b>%s</b> είναι υποχρεωτικά
 FieldsWithIsForPublic=Τα πεδία με <b>%s</b> εμφανίζονται στην δημόσια λίστα των μελών. Αν δεν επιθυμείτε κάτι τέτοιο αποεπιλέξτε την επιλογή "Δημόσιο".
 AccordingToGeoIPDatabase=(σύμφωνα με το GeoIP)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Σχετικά Αντικείμενα
 ClassifyBilled=Χαρακτηρισμός ως τιμολογημένο
+ClassifyUnbilled=Classify unbilled
 Progress=Πρόοδος
-ClickHere=Κάντε κλικ εδώ
 FrontOffice=Front office
 BackOffice=Back office
 View=Προβολή
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Έργο
 Projects=Έργα
 Rights=Άδειες
+LineNb=Line no.
+IncotermLabel=Διεθνείς Εμπορικοί Όροι
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
@@ -890,7 +907,7 @@ Select2MoreCharacters=ή περισσότερους χαρακτήρες
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Φόρτωση περισσότερων αποτελεσμάτων
 Select2SearchInProgress=Αναζήτηση σε εξέλιξη
-SearchIntoThirdparties=Συναλλασσόμενοι
+SearchIntoThirdparties=Πελ./Προμ.
 SearchIntoContacts=Επαφές
 SearchIntoMembers=Μέλη
 SearchIntoUsers=Χρήστες
@@ -914,5 +931,13 @@ CommentPage=Comments space
 CommentAdded=Comment added
 CommentDeleted=Comment deleted
 Everybody=Όλοι
-PayedBy=Payed by
+PayedBy=Πληρώθηκε από
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Ανάθεση σε
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index cb5a80a0c49..cbcb0f54ef5 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Βαθμολογήστε πρέπει να είναι μια 
 markRateShouldBeLesserThan100=Το ποσοστό πρέπει να είναι χαμηλότερη από 100
 ShowMarginInfos=Δείτε πληροφορίες για τα περιθώρια
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index bd2daee5e45..5bc0184514a 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Λίστα πιστοποιημένων δημοσ
 ErrorThisMemberIsNotPublic=Το μέλος δεν είναι δημόσιο
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Περιεχόμενα καρτέλας
 SetLinkToUser=Σύνδεση σε ένα χρήστη του Dolibarr
 SetLinkToThirdParty=Σύνδεση σε ένα στοιχείο του Dolibarr
 MembersCards=Επιχειρηματικές κάρτες μελών
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Η συνδρομή δεν καταγράφηκε
 AddSubscription=Δημιουργία εγγραφής
 ShowSubscription=Δείτε τη Συνδρομή
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Περιεχόμενα καρτέλας
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail για επικύρωση μέλους
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Χρήση email για χρήση ενημέρωσης όταν το Dolibarr λαμβάνει επιβεβαίωση για πιστοποιημένη πληρωμή συνδρομής (Παράδειγμα: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Το προϊόν χρησιμοποιείται για τη γραμμή από συνδρομές στο τιμολόγιο: %s
 NameOrCompany=Όνομα ή Επωνυμία
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index cfc055da75e..a830400fb26 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -50,7 +52,7 @@ NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
+FileAlreadyExists=Το αρχείο%s ήδη υπάρχει 
 TriggersFile=File for triggers code
 HooksFile=File for hooks code
 ArrayOfKeyValues=Array of key-val
@@ -59,7 +61,7 @@ WidgetFile=Widget file
 ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
+SqlFile=Αρχείο sql
 PageForLib=File for PHP libraries
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 63b40405ac9..f7a2ef805fa 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Μήνυμα για την επικυρωμένη σελίδα επιστροφή πληρωμής
 MessageKO=Μήνυμα για την ακύρωση σελίδα επιστροφή πληρωμής
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Συνδεδεμένα αντικείμενα
 NbOfActiveNotifications=Αριθμός κοινοποιήσεων (Αριθμός emails παραλήπτη)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Έναρξη μεταφόρτωσης
 CancelUpload=Ακύρωση ανεβάσετε
 FileIsTooBig=Τα αρχεία είναι πολύ μεγάλο
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Η αίτηση για την αλλαγή του κωδικού σας στο Dolibarr  έχει παραληφθεί
 NewKeyIs=Αυτό είναι το νέο σας κλειδί για να συνδεθείτε
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=Σύνδεσμος URL της σελίδας
 WEBSITE_TITLE=Τίτλος
 WEBSITE_DESCRIPTION=Περιγραφή
 WEBSITE_KEYWORDS=Λέξεις κλειδιά
+LinesToImport=Lines to import
diff --git a/htdocs/langs/el_GR/paypal.lang b/htdocs/langs/el_GR/paypal.lang
index 54d17064922..78ed0e37c97 100644
--- a/htdocs/langs/el_GR/paypal.lang
+++ b/htdocs/langs/el_GR/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal μόνο
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Αυτό είναι id της συναλλαγής: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Προσθέστε το url του Paypal πληρωμής όταν στέλνετε ένα έγγραφο με το ταχυδρομείο
-PredefinedMailContentLink=Μπορείτε να κάνετε κλικ στο ασφαλές παρακάτω σύνδεσμο για να κάνετε την πληρωμή σας (PayPal), αν δεν έχει ήδη γίνει.\n\n%s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Λάθος κωδικός
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index e087a98e8ce..0bf30370753 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Προϊόν ή Υπηρεσία
 ProductsAndServices=Προϊόντα και Υπηρεσίες
 ProductsOrServices=Προϊόντα ή Υπηρεσίες
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Προϊόντα μη διαθέσιμα για αγορά ή πώληση
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Είστε βέβαιοι ότι θέλετε να δι
 ProductSpecial=Ειδικές
 QtyMin=Ελάχιστη Ποσότητα
 PriceQtyMin=Τιμή για ελάχιστη ποσότητα (χωρίς έκπτωση)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Συντελεστής Φ.Π.Α. (για αυτόν τον Προμηθευτή/Προϊόν)
 DiscountQtyMin=Προεπιλεγμένη έκπτωση για ποσότητα
 NoPriceDefinedForThisSupplier=Καμία τιμή / ποσότητα δεν έχει οριστεί για αυτή την επιχείρηση / προϊόν
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index bd0dfd0e9d4..fdd88c8f6be 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -10,15 +10,15 @@ PrivateProject=Αντιπρόσωποι του έργου
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Όλα τα έργα
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να δείτε.
 ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Τα κλειστά έργα δεν είναι ορατά.
 TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν.
 TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Ο φόρτος εργασίας δεν ορίζεται
 NewTimeSpent=Ο χρόνος που δαπανάται
 MyTimeSpent=Ο χρόνος μου πέρασε
+BillTime=Bill the time spent
 Tasks=Εργασίες
 Task=Εργασία
 TaskDateStart=Ημερομηνία έναρξης εργασιών
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Λίστα των δωρεών που σχετί
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Κατάλογος των εκδηλώσεων που σχετίζονται με το έργο
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Δραστηριότητα στο έργο αυτή την εβδομάδα
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Δραστηριότητα στο έργο αυτό 
 ActivityOnProjectThisYear=Δραστηριότητα στο έργο αυτού του έτους
 ChildOfProjectTask=Παιδί του έργου / εργασίας
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Δεν ιδιοκτήτης αυτού του ιδιωτικού έργου,
 AffectedTo=Κατανέμονται σε
 CantRemoveProject=Το έργο αυτό δεν μπορεί να αφαιρεθεί, όπως αναφέρεται από κάποια άλλα αντικείμενα (τιμολόγιο, εντολές ή άλλες). Δείτε referers καρτέλα.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Έργο %s δημιουργήθηκε
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Εργασία %s δημιουργήθηκε
 TaskModifiedInDolibarr=Εργασία %s τροποποιήθηκε
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
index db9fc3e1be9..8c9a936d873 100644
--- a/htdocs/langs/el_GR/propal.lang
+++ b/htdocs/langs/el_GR/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Υπογραφή (ανάγκες χρέωσης)
 PropalStatusNotSigned=Δεν έχει υπογραφεί (κλειστό)
 PropalStatusBilled=Χρεώνεται
 PropalStatusDraftShort=Προσχέδιο
+PropalStatusValidatedShort=Επικυρώθηκε
 PropalStatusClosedShort=Κλειστό
 PropalStatusSignedShort=Υπογραφή
 PropalStatusNotSignedShort=Δεν έχει υπογραφεί
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index 4071efed9f9..842a9e568a2 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=Αυτή η τιμή εμφανίζεται μόνο σαν πληροφορία και δεν χρησιμοποιείται για κανένα υπολογισμό
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index aed4f4731dc..5d3846efb15 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Τροποποίηση αποθήκη
 MenuNewWarehouse=Νέα αποθήκη
 WarehouseSource=Αποθήκη Πηγή
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Στόχος αποθήκη
 ValidateSending=Διαγραφή αποστολή
 CancelSending=Ακύρωση αποστολής
@@ -22,6 +24,7 @@ Movements=Κινήματα
 ErrorWarehouseRefRequired=Αποθήκη όνομα αναφοράς απαιτείται
 ListOfWarehouses=Κατάλογος των αποθηκών
 ListOfStockMovements=Κατάλογος των κινήσεων των αποθεμάτων
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
@@ -162,7 +165,7 @@ inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+inventoryCreate=Δημιουργία νέου
 inventoryEdit=Επεξεργασία
 inventoryValidate=Επικυρώθηκε
 inventoryDraft=Σε εξέλιξη
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index b4b3e56abdf..8c3ee41a5b9 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index 1627fee0e14..d8c176758d0 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Εμφάνιση αναφοράς εξόδων
 NewTrip=Νέα αναφορά εξόδων
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Σύνολο χλμ
 DeleteTrip=Διαγραφή αναφοράς εξόδων
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Αναμονή έγγρισης
 ExpensesArea=Περιοχή αναφοράς εξόδων
 ClassifyRefunded=Κατηγοριοποίηση ως «επιστράφει»
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Πληροφορίες εταιρίας
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 672bbb4f559..7dd7a0972a8 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Δημιουργήθηκε χρήστη θα είναι ένας εσωτερικός χρήστης (επειδή δεν συνδέεται με ένα συγκεκριμένο τρίτο μέρος)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb των χρηστών
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Μόνο μια superadmin μπορεί να προβεί στην ανακατάταξη ενός superadmin
 HierarchicalResponsible=Επόπτης
 HierarchicView=Ιεραρχική προβολή
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index ad8722058c3..6686d75c52a 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Διαγραφή ιστοχώρου
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Προβολή σελίδας σε νέα καρτέλα
 SetAsHomePage=Ορισμός σαν αρχική σελίδα
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Ανάγνωση
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 5a995267111..4062bb27a98 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Για την διαδικασία
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Τρίτο κόμμα τραπεζικός κωδικός
-NoInvoiceCouldBeWithdrawed=Δεν τιμολόγιο αποσύρθηκε με επιτυχία. Βεβαιωθείτε ότι το τιμολόγιο είναι για τις επιχειρήσεις με έγκυρη απαγόρευση.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Ταξινομήστε πιστώνεται
 ClassCreditedConfirm=Είστε σίγουροι ότι θέλετε να χαρακτηρίσει την παραλαβή ως απόσυρση πιστώνεται στον τραπεζικό σας λογαριασμό;
 TransData=Η ημερομηνία αποστολής
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang
index 9f31c7c53e9..d744e0b1e87 100644
--- a/htdocs/langs/en_AU/companies.lang
+++ b/htdocs/langs/en_AU/companies.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - companies
-VATIsUsed=GST is used
-VATIsNotUsed=GST is not used
 VATIntraCheck=Cheque
diff --git a/htdocs/langs/en_AU/compta.lang b/htdocs/langs/en_AU/compta.lang
index 5a1df38e2cf..8498a092945 100644
--- a/htdocs/langs/en_AU/compta.lang
+++ b/htdocs/langs/en_AU/compta.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
 AmountHTVATRealReceived=Amount excl GST collected
 AmountHTVATRealPaid=Amount excl GST paid
-VATToPay=GST to pay
 VATCollected=GST to collect
 PaymentVat=GST payment
 ShowVatPayment=Show GST payment
@@ -12,15 +11,9 @@ DateChequeReceived=Cheque received date
 NbOfCheques=Nb of cheques
 RulesResultDue=- It includes outstanding invoices, expenses, GST, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and GST and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, GST and salaries. <br>- It is based on the payment dates of the invoices, expenses, GST and salaries. The donation date for donation.
-VATReport=GST report
 VATReportByCustomersInInputOutputMode=Report by the customer GST collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer GST collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the GST collected and paid
-VATReportByQuartersInDueDebtMode=Report by rate of the GST collected and paid
 SeeVATReportInInputOutputMode=See report <b>%sGST encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sGST on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the GST regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the GST invoices on the basis of the invoice date.
 RulesVATDueServices=- For services, the report includes GST invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the GST invoices, based on the invoice date.
 CalculationRuleDesc=To calculate total GST, there is two methods:<br>Method 1 is rounding GST on each line, then summing them.<br>Method 2 is summing all GST on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang
index 985f125d7de..7642b8d03eb 100644
--- a/htdocs/langs/en_CA/companies.lang
+++ b/htdocs/langs/en_CA/companies.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - companies
-VATIsUsed=GST is used
-VATIsNotUsed=GST is not use
 LocalTax1IsUsedES=PST is used
 LocalTax1IsNotUsedES=GST is not used
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 1fea94adb02..7cf7fd02136 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -3,21 +3,33 @@ ACCOUNTING_EXPORT_PIECE=Export the number of pieces
 ConfigAccountingExpert=Configuration for the financial expert module
 Journalization=Journalisation
 BackToChartofaccounts=Return to chart of accounts
-OverviewOfAmountOfLinesNotBound=Overview of number of lines not linked to finance account
-OverviewOfAmountOfLinesBound=Overview of number of lines already linked to finance account
+OverviewOfAmountOfLinesNotBound=Overview of number of lines not bound to an finance account
+OverviewOfAmountOfLinesBound=Overview of number of lines already bound to an finance account
 DeleteCptCategory=Remove finance account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this finance account from the account group?
+JournalizationInLedgerStatus=Status of journals
+NotYetInGeneralLedger=Not yet journalised in ledgers
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalised finance group
+MainAccountForCustomersNotDefined=Main finance account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main finance account for suppliers not defined in setup
+MainAccountForUsersNotDefined=Main finance account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main finance account for VAT payment not defined in setup
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several steps:
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting the correct default finance account when posting the journal (writing records in Journals and General ledger)
+AccountancyAreaDescChartModel=STEP %s: Create a chart of accounts from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of accounts from menu %s
 AccountancyAreaDescVat=STEP %s: Define finance accounts for each VAT Rate. For this, use the menu entry %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default finance accounts for each type of expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=STEP %s: Define default finance accounts for payment of salaries. For this, use the menu entry %s.
 AccountancyAreaDescContrib=STEP %s: Define default finance accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEP %s: Define default finance accounts for donations. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default finance accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=STEP %s: Define default finance accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define finance accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
 AccountancyAreaDescProd=STEP %s: Define finance accounts on your products/services. For this, use the menu entry %s.
 AccountancyAreaDescBind=STEP %s: Checking links between existing %s lines and finance account is done, so application will be able to journalise transactions in Ledger with one click. To complete missing links use the menu entry %s.
 AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click button <strong>%s</strong>.
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make future modifications.
 Addanaccount=Add a financial account
 AccountAccounting=Financial Account
 SubledgerAccount=Sub-ledger Account
@@ -62,10 +74,15 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default sales account (used if not defined in th
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Default services purchase account (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default services sales account (used if not defined in the service sheet)
 LabelAccount=Account name
+LabelOperation=Account operation
 Sens=Meaning
 NumPiece=Item number
+AccountingCategory=Personalised groups
 GroupByAccountAccounting=Group by finance account
-DelBookKeeping=Delete record in the Ledger
+AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports.
+ByPersonalizedAccountGroups=By personalised groups
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to this transaction will be deleted)
+DescJournalOnlyBindedVisible=This is a view of records that are linked to an finance account and can be recorded into the Ledger.
 FeeAccountNotDefined=Account for fees not defined
 NumMvts=Transaction Number
 ErrorDebitCredit=Debit and Credit fields cannot have values at the same time
@@ -73,6 +90,9 @@ AddCompteFromBK=Add finance accounts to the group
 ReportThirdParty=List third party accounts
 DescThirdPartyReport=View the list of the third party customers and suppliers and their financial accounts
 ListAccounts=List of the financial accounts
+Pcgtype=Group account
+Pcgsubtype=Subgroup account
+PcgtypeDesc=Group and subgroup accounts are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for finance accounts of products to build the expense/income report.
 DescVentilCustomer=View the list of customer invoice lines linked (or not) to a product financial account
 DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the links between your invoice lines and the finance account of your chart of accounts, with just one click of the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not linked to any account, you will have to make a manual link from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=View a detailed list of invoices, customers and their product financial account
@@ -89,9 +109,14 @@ AutomaticBindingDone=Automatic link done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this finance account because it is used
 FicheVentilation=Link card
 GeneralLedgerIsWritten=Transactions are written to the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be processed. If there is no other error message, this is probably because they had already been processed.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalised. If there is no other error message, this is probably because they were already journalised.
+NoNewRecordSaved=No more records to journalise
 ListOfProductsWithoutAccountingAccount=List of products not linked to any finance account
 ChangeBinding=Change the link
+Accounted=Posted in ledger
+NotYetAccounted=Not yet posted in ledger
+ApplyMassCategories=Apply bulk categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in a personalised group
 CategoryDeleted=Category for the finance account has been removed
 AccountingJournals=Finance journals
 AccountingJournal=Finance journal
@@ -105,18 +130,26 @@ Modelcsv_ciel=Export to Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export to Quadratus QuadraCompta
 Modelcsv_ebp=Export to EBP
 Modelcsv_cogilog=Export to Cogilog
+Modelcsv_agiris=Export to Agiris
+Modelcsv_configurable=Export Configuration
 ChartofaccountsId=Chart of accounts ID
+InitAccountancyDesc=This page can be used to create a financial account for products and services that do not have a financial account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account for linking transaction records about payments, salaries, donations, taxes and vat when no specific finance account had already been set.
 OptionModeProductSell=Type of sale
 OptionModeProductBuy=Type of purchase
 OptionModeProductSellDesc=Show all products with finance accounts for sales.
 OptionModeProductBuyDesc=Show all products with finance accounts for purchases.
+CleanFixHistory=Remove accounting code from lines that do not exist in chart of accounts
 CleanHistory=Reset all links for selected year
 ValueNotIntoChartOfAccount=This account does not exist in the chart of account
 Range=Range of finance accounts
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup were not done, please complete them
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory setup steps were not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No finance account group available for country %s (See Home - Setup - Dictionary)
+ErrorInvoiceContainsLinesNotYetBounded=You tried to journalise some lines of the invoice <strong>%s</strong>, but some  are not yet linked to a finance account. Journalisation of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to a finance account.
 ExportNotSupported=The export format is not supported on this page
 BookeppingLineAlreayExists=Lines already exist in bookkeeping
 Binded=Lines linked
 ToBind=Lines to link
+UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the link manually
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journals are posted up-to-date, the bookkeeping view is more accurate.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index a9f12d8b90c..e5a6744ee87 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -46,7 +46,6 @@ MeasuringUnit=Measurement unit
 EMailsDesc=This page allows you to overwrite your PHP parameters for sending emails. In most cases on a Unix/Linux OS, your PHP setup is correct and these parameters are unnecessary.
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined in PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined in PHP on Unix like systems)
-MAIN_MAIL_ERRORS_TO=Sender email used for returned (bounced) emails sent
 MAIN_MAIL_AUTOCOPY_TO=Systematically send a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all email postings (for test purposes or demos)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
@@ -73,7 +72,6 @@ GenericMaskCodes4b=<u>Example of third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example of product created on 2007-03-01:</u><br>
 GenericNumRefModelDesc=Returns a customisable number according to a defined mask.
 UMaskExplanation=This parameter allows you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for a full list of all actors and their organisations
 AddCRIfTooLong=There is no automatic text wrapping. If lines of text extend off the page in your documents, you must insert carriage returns where appropriate to break lines in the textarea.
 ConfirmPurge=Are you sure you want to execute this purge?<br>This will definitely delete  all your data files with no way to restore them (ECM files, attached files...).
 ListOfDirectories=List of OpenDocument template directories
diff --git a/htdocs/langs/en_GB/projects.lang b/htdocs/langs/en_GB/projects.lang
index f506b1a134e..5b9cb9a0de0 100644
--- a/htdocs/langs/en_GB/projects.lang
+++ b/htdocs/langs/en_GB/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referrers tab.
+SendProjectRef=About project %s
diff --git a/htdocs/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
index 45efd3453c6..3663bd47db5 100644
--- a/htdocs/langs/en_GB/website.lang
+++ b/htdocs/langs/en_GB/website.lang
@@ -2,3 +2,4 @@
 WebsiteSetupDesc=Create here as many entries for websites as you need. Then go into menu Websites to edit them.
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge an SEO URL when the website is run from a Virtual host of a Web server (like Apache, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> is not yet available. You must first add a page.
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index 34cd00624a3..786cf4c2179 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -4,7 +4,6 @@ NbOfInvoiceToWithdrawWithInfo=No. of customer invoices with direct debit payment
 AmountToWithdraw=Amount to pay
 NoInvoiceToWithdraw=No customer invoice with open 'Direct Debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
 MakeWithdrawRequest=Make a Direct Debit payment request
-NoInvoiceCouldBeWithdrawed=No invoice paid successfully. Check that the invoice is on a company with a valid BAN.
 ClassCreditedConfirm=Are you sure you want to classify this Payment receipt as credited on your bank account?
 WithdrawalRefused=Payment refused
 WithdrawalRefusedConfirm=Are you sure you want to enter a Payment rejection for Company
@@ -19,7 +18,6 @@ ShowWithdraw=Show Payment
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one payment not yet processed, it won't be set as paid to allow prior Payment management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When the payment order is closed, payment on the invoice will be automatically recorded, and the invoice closed if the outstanding balance is null.
 WithdrawalFile=Payment file
-RUMWillBeGenerated=UMR number will be generated once bank account information is saved
 WithdrawRequestAmount=The amount of Direct Debit request:
 WithdrawRequestErrorNilAmount=Unable to create a Direct Debit request for an empty amount.
 SEPALegalText=By signing this mandate form, you authorise (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
diff --git a/htdocs/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang
index bece63d2190..8c832c99ff6 100644
--- a/htdocs/langs/en_IN/projects.lang
+++ b/htdocs/langs/en_IN/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 OppStatusPROPO=Quotation
+SendProjectRef=About project %s
diff --git a/htdocs/langs/en_NZ/companies.lang b/htdocs/langs/en_NZ/companies.lang
index afa8538da3b..fd92c40825e 100644
--- a/htdocs/langs/en_NZ/companies.lang
+++ b/htdocs/langs/en_NZ/companies.lang
@@ -3,6 +3,3 @@ VATIsUsed=GST is used
 VATIsNotUsed=GST is not used
 VATIntra=GST number
 VATIntraShort=GST number
-VATIntraVeryShort=GST
-VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
diff --git a/htdocs/langs/en_NZ/compta.lang b/htdocs/langs/en_NZ/compta.lang
index 7b85434bb5c..14bea291eb6 100644
--- a/htdocs/langs/en_NZ/compta.lang
+++ b/htdocs/langs/en_NZ/compta.lang
@@ -10,5 +10,3 @@ VATCollected=GST collected
 VATPayment=GST Payment
 VATPayments=GST Payments
 NewVATPayment=New GST payment
-TotalToPay=Total to pay
-TotalVATReceived=Total GST received
\ No newline at end of file
diff --git a/htdocs/langs/en_NZ/main.lang b/htdocs/langs/en_NZ/main.lang
index 2af1b36ceb0..45235b7bf39 100644
--- a/htdocs/langs/en_NZ/main.lang
+++ b/htdocs/langs/en_NZ/main.lang
@@ -19,16 +19,11 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-UnitPrice=Unit price
 UnitPriceHT=Unit price (excl GST)
-UnitPriceTTC=Unit price
 AmountHT=Amount (excl GST)
 AmountTTC=Amount (incl GST)
 AmountVAT=Amount GST
-PriceQtyHT=Price for this quantity excl GST
 PriceQtyMinHT=Price quantity min. excl GST
-PriceQtyTTC=Price for this quantity incl GST
-PriceQtyMinTTC=Price quantity min. incl GST
 TotalHT=Total (excl GST)
 TotalTTC=Total (incl GST)
 TotalTTCToYourCredit=Total (incl GST) to your credit
diff --git a/htdocs/langs/en_NZ/sendings.lang b/htdocs/langs/en_NZ/sendings.lang
index ceb733e140f..8414b50f16b 100644
--- a/htdocs/langs/en_NZ/sendings.lang
+++ b/htdocs/langs/en_NZ/sendings.lang
@@ -1,3 +1,2 @@
-# Dolibarr language file - en_NZ - main
-# This file contains only line that must differs from en_US file
-SendingSheet=Packing Slip
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - sendings
+SendingSheet=Packing Slip
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c8973887d2d..7207110ce42 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for veo not defined in setup
 MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
 MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group 
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vndor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".  
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,6 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate. 
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5c733fcfc7c..0058a005bf0 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add salaries users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,12 +447,13 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible. 
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.  
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.  
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be car also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of special expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vndor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 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=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1055,7 +1061,8 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-AccountantDesc=Edit on this page all known information of your accountant/auditor to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1230,15 +1240,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1628,8 +1638,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor 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 #####
@@ -1666,7 +1676,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type 
+TypePaymentDesc=0:Customer payment type, 1:Vndor payment type, 2:Both customers and vendors payment type 
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1688,7 +1698,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> 
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1697,6 +1707,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1719,19 +1730,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1781,7 +1792,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource 
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 4ab64a98224..f1e17a43cfe 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -112,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 122d1a2a69a..b4891579763 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -286,8 +286,8 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
-DiscountFromExcessPaid=Payments from excess paid of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -348,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -532,3 +532,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 8b38b2f1f42..c0c8d4c0cef 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 24f5bc100f6..9f2e16857de 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Other
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 3473667fe55..b3c458833d9 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -80,7 +80,7 @@ VATIsUsed=Sales tax is used
 VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor vendor, no available refering objects
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 24724088e45..db9b4d481e8 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 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 <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
\ No newline at end of file
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 8947fcc47ac..ab319522db0 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -79,5 +79,5 @@ CronCannotLoadObject=Class file %s was loaded, but object %s was not found into
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang
index f0fa27bcbf8..81f62469896 100644
--- a/htdocs/langs/en_US/dict.lang
+++ b/htdocs/langs/en_US/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 588044f18df..2352e704bde 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -39,8 +39,8 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFilesOrDirs=Removed not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
 ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index efee041cbf4..4141df0c967 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for endor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 27a2edd1fda..fe96d7c0f97 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -146,7 +146,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
diff --git a/htdocs/langs/en_US/ldap.lang b/htdocs/langs/en_US/ldap.lang
index d6360f3e540..67824ccd237 100644
--- a/htdocs/langs/en_US/ldap.lang
+++ b/htdocs/langs/en_US/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
\ No newline at end of file
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index e38b038cfee..b155e2e4208 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToSalaries=To salarie(s)
 MailCC=Copy to
+MailToCCSalaries=Copy to salarie(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 38db3c58b99..77e9c04b10a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -64,7 +64,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
@@ -231,7 +231,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b> 
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +402,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +415,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +494,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +620,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +680,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -866,7 +867,7 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
-LineNb=Line nb
+LineNb=Line no.
 IncotermLabel=Incoterms
 # Week day
 Monday=Monday
@@ -915,11 +916,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -940,4 +941,6 @@ Local=Local
 Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
-AssignedTo=Assigned to
\ No newline at end of file
+AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index 8a8a9f20788..b9d52dcfdc6 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -28,10 +28,10 @@ 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=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 8a8346aac4a..e6e58498d1a 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -118,7 +118,7 @@ YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated 
 YourSubscriptionWasRecorded=Your new subscription was recorded
 SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=You membership was canceled
+YourMembershipWasCanceled=Your membership was canceled
 CardContent=Content of your member card
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang
index 1f8a90b5657..0819a077f71 100644
--- a/htdocs/langs/en_US/opensurvey.lang
+++ b/htdocs/langs/en_US/opensurvey.lang
@@ -57,4 +57,5 @@ ErrorInsertingComment=There was an error while inserting your comment
 MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
\ No newline at end of file
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name, that the one used to vote, to post a comment
\ No newline at end of file
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 8ab5b85b7e6..06191d9f7b7 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 2afabe43b06..04b38e531ef 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your 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
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index e5393466c3d..abf262ec9ba 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 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.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
@@ -332,4 +333,4 @@ ConfirmCloneProductCombinations=Would you like to copy all the product variants
 CloneDestinationReference=Destination product reference
 ErrorCopyProductCombinations=There was an error while copying the product variants
 ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
\ No newline at end of file
+ErrorProductCombinationNotFound=Product variant not found
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 5cc94c39309..6dfb11e2284 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 31873ad527e..d1b1f85224f 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -202,4 +202,5 @@ inventoryDeleteLine=Delete line
 RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
-StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
\ No newline at end of file
+StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
\ No newline at end of file
diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/en_US/supplier_proposal.lang
+++ b/htdocs/langs/en_US/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
 ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
 LastSupplierProposals=Latest %s price requests
 AllPriceRequests=All requests
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/en_US/ticketsup.lang b/htdocs/langs/en_US/ticketsup.lang
index d46a6be5dbd..84cc786ef6d 100644
--- a/htdocs/langs/en_US/ticketsup.lang
+++ b/htdocs/langs/en_US/ticketsup.lang
@@ -103,7 +103,7 @@ TicketPublicInterfaceTopicHelp=This text will appear as the title of the public
 TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
 TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
 ExtraFieldsTicketSup=Extra attributes
-TicketSupCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL contant equal to 1
+TicketSupCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
 TicketsDisableEmail=Do not send ticket creation or message send emails
 TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
 TicketsLogEnableEmail=Enable log by email
@@ -115,8 +115,6 @@ TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
 TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
 TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
-TicketsShowExtrafieldsIntoPublicArea=Show Extras fields in the public interface
-TicketsShowExtrafieldsIntoPublicAreaHelp=When this option is enabled, additional attributes defined on the tickets will be shown in the public interface of ticket creation.
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the thirdparty they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -173,7 +171,6 @@ TicketChangeType=Change type
 TicketChangeCategory=Change category
 TicketChangeSeverity=Change severity
 TicketAddMessage=Add a message
-TicketEditProperties=Edit properties
 AddMessage=Add a message
 MessageSuccessfullyAdded=Ticket added
 TicketMessageSuccessfullyAdded=Message successfully added
@@ -264,7 +261,7 @@ TicketNewEmailBodyInfosTrackId=Ticket tracking number : %s
 TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a trouble ticket in our management system.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
 TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
 TicketPublicMsgViewLogIn=Please enter ticket tracking ID
 TicketTrackId=Tracking ID
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 2da76863d41..c600a2e9685 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -38,9 +38,9 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
 YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-CheckVirtualHostPerms=Check also that virtual host has <strong>%s</strong> on files into<br><strong>%s</strong>
-ReadPerm=Read permission
-WritePerm=Write permission
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.  
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index eba04cc44d1..ed19a531c07 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
\ No newline at end of file
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index c5508ab297a..6fd5e95017d 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -22,8 +22,8 @@ Chartofaccounts=Gráfico de cuentas
 CurrentDedicatedAccountingAccount=Cuenta dedicada actual
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de factura
-OverviewOfAmountOfLinesNotBound=Descripción general de la cantidad de líneas no vinculadas a la cuenta de contabilidad
-OverviewOfAmountOfLinesBound=Descripción general de la cantidad de líneas ya vinculadas a la cuenta de contabilidad
+OverviewOfAmountOfLinesNotBound=Descripción general de la cantidad de líneas no vinculadas a una cuenta de contabilidad
+OverviewOfAmountOfLinesBound=Descripción general de la cantidad de líneas ya vinculadas a una cuenta de contabilidad
 ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta de contabilidad del grupo de cuenta contable?
 JournalizationInLedgerStatus=Estado de la periodización
 AlreadyInGeneralLedger=Ya se ha contabilizado en libros mayores
@@ -115,21 +115,20 @@ LabelOperation=Operación de etiqueta
 Sens=Significado
 NumPiece=Pieza número
 TransactionNumShort=Num. transacción
+AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
 DeleteMvt=Eliminar líneas de libro mayor
 DelYear=Año para borrar
 DelJournal=Diario para eliminar
 ConfirmDeleteMvt=Esto eliminará todas las líneas del Libro mayor por año y / o desde un diario específico. Se requiere al menos un criterio.
-DelBookKeeping=Eliminar el registro del Libro mayor
 FinanceJournal=Diario de finanzas
 ExpenseReportsJournal=Diario de informes de gastos
 DescFinanceJournal=Diario financiero que incluye todos los tipos de pagos por cuenta bancaria
-DescJournalOnlyBindedVisible=Esta es una vista del registro que está vinculada a la cuenta de contabilidad y se puede registrar en el Libro mayor.
+DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor.
 VATAccountNotDefined=Cuenta para el IVA no definido
 ThirdpartyAccountNotDefined=Cuenta para un tercero no definido
 ProductAccountNotDefined=Cuenta para producto no definido
 FeeAccountNotDefined=Cuenta por tarifa no definida
 BankAccountNotDefined=Cuenta bancaria no definida
-ThirdPartyAccount=Cuenta de socio de negocio
 NewAccountingMvt=Nueva transacción
 NumMvts=Numero de transacciones
 ListeMvts=Lista de movimientos
@@ -140,6 +139,7 @@ DescThirdPartyReport=Consulte aquí la lista de los clientes y proveedores de te
 ListAccounts=Lista de cuentas contables
 UnknownAccountForThirdparty=Cuenta de terceros desconocida. Usaremos %s
 UnknownAccountForThirdpartyBlocking=Cuenta de terceros desconocida. Error de bloqueo
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cuenta de terceros desconocida y cuenta de espera no definida. Error de bloqueo
 PcgtypeDesc=El grupo y el subgrupo de cuenta se usan como criterios predefinidos de "filtro" y "agrupamiento" para algunos informes contables. Por ejemplo, 'INGRESO' o 'GASTO' se utilizan como grupos para cuentas contables de productos para generar el informe de gastos / ingresos.
 TotalVente=Volumen de negocios total antes de impuestos
 TotalMarge=Margen total de ventas
@@ -160,17 +160,18 @@ ErrorAccountancyCodeIsAlreadyUse=No puede eliminar esta cuenta porque está sien
 MvtNotCorrectlyBalanced=El movimiento no está correctamente equilibrado. Crédito = %s. Débito = %s
 FicheVentilation=Tarjeta de enlace
 GeneralLedgerIsWritten=Las transacciones se escriben en el Libro mayor
-GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pudieron ser despachadas. Si no hay otro mensaje de error, esto es probablemente porque ya fueron enviados.
+GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pueden ser contabilizadas. Si no hay otro mensaje de error, esto es probablemente porque ya estaban en el diario.
 NoNewRecordSaved=No más registro para agendar
 ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta de contabilidad
 ChangeBinding=Cambiar la encuadernación
+Accounted=Contabilizado en el libro mayor
+NotYetAccounted=Aún no contabilizado en el libro mayor
 ApplyMassCategories=Aplicar categorías de masa
 AddAccountFromBookKeepingWithNoCategories=Cuenta disponible aún no en un grupo personalizado
 CategoryDeleted=La categoría de la cuenta de contabilidad ha sido eliminada
 AccountingJournals=Libros contables
 AccountingJournal=Diario de contabilidad
 NewAccountingJournal=Nueva revista de contabilidad
-AccountingJournalType1=Operación miscelánea
 AccountingJournalType5=Informe de gastos
 ErrorAccountingJournalIsAlreadyUse=Este diario ya es uso
 ExportDraftJournal=Exportar borrador del diario
@@ -195,6 +196,8 @@ PredefinedGroups=Grupos predefinidos
 ValueNotIntoChartOfAccount=Este valor de la cuenta de contabilidad no existe en el cuadro de cuentas
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de configuración no se hicieron, por favor complételos
 ErrorNoAccountingCategoryForThisCountry=No hay un grupo de cuenta contable disponible para el país %s (Consulte Inicio - Configuración - Diccionarios)
+ErrorInvoiceContainsLinesNotYetBounded=Intenta hacer un diario de algunas líneas de la factura <strong> %s </ strong>, pero algunas otras líneas aún no están limitadas a la cuenta de contabilidad. Se rechaza la periodización de todas las líneas de factura para esta factura.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Algunas líneas en la factura no están vinculadas a la cuenta contable.
 ExportNotSupported=El formato de exportación establecido no es compatible con esta página
 BookeppingLineAlreayExists=Líneas ya existentes en Bookeeping
 Binded=Líneas atadas
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index b8b8c1ac533..d91055b2389 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -196,8 +196,10 @@ MAIN_MAIL_SMTP_SERVER=Servidor SMTP/SMTP (por defecto en php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Puerto SMTP / SMTPS (no definido en PHP en sistemas tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Servidor SMTP / SMTPS (no definido en PHP en sistemas tipo Unix)
 MAIN_MAIL_EMAIL_FROM=Correo electrónico remitente para correos electrónicos automáticos (por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=El correo electrónico del remitente utilizado para el error devuelve los correos electrónicos enviados
+MAIN_MAIL_ERRORS_TO=Correo electrónico utilizado como campo 'Errores a' en los correos electrónicos enviados
 MAIN_MAIL_AUTOCOPY_TO=Envíe sistemáticamente una copia oculta de todos los correos electrónicos enviados a
+MAIN_DISABLE_ALL_MAILS=Deshabilitar todos los envíos de correos electrónicos (para propósitos de prueba o demostraciones)
+MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
 MAIN_MAIL_SENDMODE=Método a usar para enviar correos electrónicos
 MAIN_MAIL_SMTPS_ID=SMTP ID si se requiere autenticación
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP si se requiere autenticación
@@ -235,7 +237,7 @@ InfDirExample=<br>Entonces, declare en el archivo <strong>conf.php</strong><br>
 YouCanSubmitFile=Para este paso, puede enviar el archivo .zip del paquete de módulo aquí:
 CallUpdatePage=Vaya a la página que actualiza la estructura de la base de datos y los datos: %s.
 LastActivationIP=Última activación IP
-UpdateServerOffline=Actualizar servidor fuera de línea
+UpdateServerOffline=Servidor de actualización fuera de línea
 WithCounter=Administrar un contador
 GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se podrían usar las siguientes etiquetas:<br><b> {000000}</b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br><b>{000000+000}</b> igual que el anterior, pero se aplica un desplazamiento correspondiente al número a la derecha del signo + a partir del primer %s. <br> <b> {000000@x}</b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definidos en su configuración, o 99 para restablecer a cero cada mes). Si se usa esta opción y x es 2 o mayor, también se requiere la secuencia {aa} {mm} o {aaaa} {mm}. <br><b>{dd}</b> día (01 a 31).<br><b> {mm}</b> mes (01 a 12). <br> <b>{yy}</b>, <b> {aaaa}</b> o <b>{y}</b> años en 2, 4 o 1 números.<br>
 GenericMaskCodes2=<b>{cccc}</b> el código del cliente en n caracteres <br><b>{cccc000}</b> el código del cliente en n caracteres va seguido de un contador dedicado para el cliente. Este contador dedicado al cliente se restablece al mismo tiempo que el contador global. <br><b>{tttt}</b> El código de tipo de tercero en n caracteres (consulte el menú Inicio - Configuración - Diccionario - Tipos de terceros) . Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero.<br>
@@ -311,12 +313,13 @@ ExtrafieldCheckBoxFromList=Casillas de verificación de la mesa
 ExtrafieldLink=Enlace a un objeto
 ComputedFormula=Campo computado
 ComputedFormulaDesc=Puede ingresar aquí una fórmula usando otras propiedades del objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede usar cualquier fórmula compatible con PHP, incluido el "?" operador de condición y objeto global siguiente: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong> ADVERTENCIA</strong>: solo algunas propiedades de $object puede estar disponible. Si necesita propiedades no cargadas, simplemente busque el objeto en su fórmula como en el segundo ejemplo. <br> Usar un campo calculado significa que no puede ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, la fórmula puede devolver nada. <br><br>Ejemplo de fórmula: <br>$object-> id <10? round ($ object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2) <br><br>Ejemplo para recargar objeto<br> (($reloadedobj = new Societe ($db)) && ($reloadedobj-> fetch ($obj-> id? $Obj-> id: ($obj-> rowid? $Obj-> rowid: $ object-> id))> 0))? $reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1'<br><br>Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal: <br> (($reloadedobj = new task ($ db)) && ($ reloadedobj-> fetch ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($secondloadedobj-> fetch ($reloadedobj-> fk_project )> 0))? $secondloadedobj-> ref: 'Proyecto principal no encontrado'
+ExtrafieldParamHelpPassword=Mantenga este campo vacío significa que el valor se almacenará sin cifrado (el campo debe estar solo oculto con estrella en la pantalla). Establezca aquí el valor 'automático' para usar la regla de cifrado predeterminada para guardar la contraseña en la base de datos (entonces el valor leído será el solo hash, no hay forma de recuperar el valor original)
 ExtrafieldParamHelpselect=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0')<br><br> por ejemplo: <br>1, valor1<br>2, valor2<br>código3, valor3<br>...<br><br>Para que la lista dependa de otra lista de atributos complementarios: <br> 1, valor1 | opciones_ <i>parent_list_code</i>: parent_key<br>2, value2 | options_<i>parent_list_code</i>:parent_key <br><br>Para que la lista dependa de otra lista: <br>1, value1 | <i>parent_list_code</i> :parent_key <br>2,value2|<i> parent_list_code</i> :parent_key
 ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1, valor1 <br> 2, valor2 <br> 3, valor3 <br> ...
 ExtrafieldParamHelpradio=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0')<br><br>por ejemplo: <br>1, valor1<br>2, valor2<br>3, valor3<br> ...
 ExtrafieldParamHelpsellist=Lista de valores proviene de una tabla <br>Sintaxis: table_name: label_field: id_field :: filter<br>Ejemplo: c_typent: libelle: id :: filter <br><br>-idfilter es necesariamente una clave int primaria <br> - filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo valor activo <br> También puede usar $ ID $ en filtro que es la identificación actual del objeto actual <br> Para hacer un SELECCIONAR en filtro use $ SEL $ <br> si quieres filtrar en extrafields utiliza la sintaxis extra.fieldcode = ... (donde el código de campo es el código de extrafield)<br><br>Para que la lista dependa de otra lista de atributos complementarios:<br>c_typent: libelle: id: options_<i> parent_list_code</i> |parent_column: filter <br><br> Para que la lista dependa de otra lista: <br>c_typent: libelle: id: <i> parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelpchkbxlst=La lista de valores proviene de una tabla <br> Sintaxis: table_name: label_field: id_field :: filter <br> Ejemplo: c_typent: libelle: id :: filter <br> <br> el filtro puede ser una prueba simple (por ejemplo, active = 1 ) para mostrar solo el valor activo <br> También puede usar $ ID $ en el filtro bruja es la identificación actual del objeto actual <br> Para hacer un SELECCIONAR en filtro use $ SEL $<br> si desea filtrar el uso de campos extraños sintaxis extra.fieldcode = ... (donde el código de campo es el código de extrafield)<br> <br>Para que la lista dependa de otra lista de atributos complementarios:<br>c_typent: libelle: id: options_ <i>parent_list_code</i>|parent_column: filter <br><br>Para que la lista dependa de otra lista:<br>c_typent: libelle: id:<i> parent_list_code</i>lparent_column: filter
-ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath <br> Sintaxis: ObjectName: Classpath <br> Ejemplo: Societe: societe / class / societe.class.php
+ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath <br> Sintaxis: ObjectName: Classpath <br> Ejemplos: <br> Societe: societe / class / societe.class.php <br> Contacto: contact / class / contact.class.php
 LibraryToBuildPDF=Biblioteca utilizada para la generación de PDF
 LocalTaxDesc=Algunos países aplican 2 o 3 impuestos en cada línea de factura. Si este es el caso, elija tipo para el segundo y tercer impuesto y su tasa. El tipo posible es: <br> 1: impuesto local se aplica a productos y servicios sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 2: se aplica el impuesto local sobre productos y servicios, incluido el IVA (el impuesto local se calcula sobre el monto + impuesto principal ) <br> 3: el impuesto local se aplica a los productos sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 4: se aplica el impuesto local sobre los productos, incluido IVA (el impuesto local se calcula sobre el monto + el IVA principal) <br> 5: local se aplica impuesto sobre los servicios sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 6: el impuesto local se aplica a los servicios, incluido el IVA (el impuesto local se calcula sobre el monto + impuestos)
 LinkToTestClickToDial=Ingrese un número de teléfono para llamar y mostrar un enlace para probar la URL de ClickToDial para el usuario <strong>%s</strong>
@@ -344,7 +347,7 @@ ModuleCompanyCodePanicum=Devuelve un código de contabilidad vacío.
 ModuleCompanyCodeDigitaria=El código de contabilidad depende del código de un tercero. El código se compone del carácter "C" en la primera posición seguido de los primeros 5 caracteres del código de terceros.
 Use3StepsApproval=De forma predeterminada, los pedidos de compra deben ser creados y aprobados por 2 usuarios diferentes (un paso / usuario para crear y un paso / usuario para aprobar. Tenga en cuenta que si el usuario tiene ambos permisos para crear y aprobar, un paso / usuario será suficiente) . Puede solicitar con esta opción que presente un tercer paso / aprobación del usuario, si el monto es mayor que un valor dedicado (por lo que se necesitarán 3 pasos: 1 = validación, 2 = primera aprobación y 3 = segunda aprobación si el monto es suficiente). <br> Configure esto como vacío si una aprobación (2 pasos) es suficiente, configúrelo a un valor muy bajo (0.1) si siempre se requiere una segunda aprobación (3 pasos).
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) sea más alta que ...
-WarningPHPMail=ADVERTENCIA: Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un correo electrónico desde otro servidor que no sea el servidor de Yahoo si la dirección de correo electrónico utilizada como remitente es su correo electrónico de Yahoo (como myemail@yahoo.com, myemail@yahoo.fr, ...). Su configuración actual utiliza el servidor de la aplicación para enviar correos electrónicos, por lo que algunos destinatarios (el compatible con el restrictivo protocolo DMARC) le preguntarán a Yahoo si pueden aceptar su correo electrónico y Yahoo responderá "no" porque el servidor no es un servidor. propiedad de Yahoo, por lo que es posible que no se acepten pocos de sus correos electrónicos enviados. <br> Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración de Correo electrónico para elegir el otro método "servidor SMTP" e ingresar al servidor SMTP y credenciales proporcionadas por su proveedor de correo electrónico (solicite a su proveedor de correo electrónico que obtenga credenciales SMTP para su cuenta).
+WarningPHPMail2=Si su proveedor SMTP por correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raras), esta es la dirección IP de su aplicación ERP CRM: <strong> %s </ strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
 RequiredBy=Este módulo es requerido por el módulo (s)
@@ -371,7 +374,6 @@ Module25Desc=Gestión de pedidos del cliente
 Module30Name=Facturas
 Module30Desc=Gestión de facturas y notas de crédito para clientes. Gestión de facturas para proveedores
 Module40Desc=Gestión y compra de proveedores (pedidos y facturas)
-Module42Name=Registros
 Module42Desc=Instalaciones de registro (archivo, syslog, ...). Dichos registros son para fines técnicos / de depuración.
 Module49Desc=Gestión del editor
 Module50Desc=Gestión de producto
@@ -428,8 +430,7 @@ Module2300Name=Trabajos programados
 Module2300Desc=Gestión programada de trabajos (alias cron o crono tabla)
 Module2400Name=Eventos / Agenda
 Module2400Desc=Siga los eventos hechos y venideros. Deje que la aplicación registre los eventos automáticos con fines de seguimiento o registre eventos manuales o rendez-vous.
-Module2500Name=Gestión de contenido electrónico
-Module2500Desc=Guarde y comparta documentos
+Module2500Desc=Sistema de gestión de documentos / gestión electrónica de contenidos. Organización automática de sus documentos generados o almacenados. Compártelos cuando lo necesites.
 Module2600Name=API / servicios web (servidor SOAP)
 Module2600Desc=Habilite el servidor Dolibarr SOAP que proporciona servicios de API
 Module2610Name=API / servicios web (servidor REST)
@@ -439,7 +440,7 @@ Module2660Desc=Habilite el cliente de servicios web Dolibarr (se puede usar para
 Module2700Desc=Use el servicio Gravatar en línea (www.gravatar.com) para mostrar la foto de los usuarios / miembros (que se encuentra con sus correos electrónicos). Necesita un acceso a internet
 Module2900Desc=Capacidades de conversiones GeoIP Maxmind
 Module3100Desc=Agregar un botón de Skype a los usuarios / terceros / contactos / tarjetas de miembros
-Module3200Desc=Active el registro de algunos eventos comerciales en un registro no reversible. Los eventos se archivan en tiempo real. El registro es una tabla de eventos encadenados que luego se puede leer y exportar. Este módulo puede ser obligatorio para algunos países.
+Module3200Desc=Active el registro de algunos eventos comerciales en un registro inalterable. Los eventos se archivan en tiempo real. El registro es una tabla de eventos encadenados que solo se puede leer y exportar. Este módulo puede ser obligatorio para algunos países.
 Module4000Desc=Gestión de recursos humanos (gestión del departamento, contratos de empleados y sentimientos)
 Module5000Name=Multi-compañía
 Module5000Desc=Le permite administrar múltiples compañías
@@ -447,7 +448,6 @@ Module6000Desc=Gestión de flujo de trabajo
 Module10000Desc=Crea sitios web públicos con un editor WYSIWG. Simplemente configure su servidor web (Apache, Nginx, ...) para que apunte al directorio dedicado de Dolibarr para tenerlo en línea en Internet con su propio nombre de dominio.
 Module20000Name=Administración de peticiones días libres
 Module20000Desc=Declarar y seguir a los empleados deja las solicitudes
-Module39000Name=Lote de producto
 Module39000Desc=Número de lote o de serie, administración de la fecha de caducidad y de vencimiento en los productos
 Module50000Desc=Módulo para ofrecer una página de pago en línea que acepta pagos con tarjeta de crédito / débito a través de PayBox. Esto se puede usar para permitir que sus clientes realicen pagos gratuitos o para un pago en un objeto Dolibarr en particular (factura, orden, ...)
 Module50100Name=Puntos de venta
@@ -625,11 +625,7 @@ Permission1251=Ejecutar las importaciones masivas de datos externos en la base d
 Permission1321=Exportar facturas, atributos y pagos de clientes
 Permission1322=Reabrir una factura paga
 Permission1421=Exportar pedidos y atributos de los clientes
-Permission20001=Lea las solicitudes de ausencia (la suya y la de sus subordinados)
-Permission20002=Crea/modifica tus solicitudes de permiso
 Permission20003=Eliminar solicitudes de permiso
-Permission20004=Leer todas las solicitudes de permisos (incluso usuarios no subordinados)
-Permission20005=Crear/modificar solicitudes de permiso para todos
 Permission20006=Solicitudes de permiso de administrador (configuración y saldo de actualización)
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
@@ -655,6 +651,7 @@ DictionaryVAT=Tipos de IVA o tasas de impuestos a las ventas
 DictionaryRevenueStamp=Cantidad de timbres fiscales
 DictionaryPaymentConditions=Términos de pago
 DictionaryTypeContact=Tipo de contacto / dirección
+DictionaryTypeOfContainer=Tipo de páginas web / contenedores
 DictionaryEcotaxe=Ecotax (RAEE)
 DictionaryFormatCards=Formatos de tarjetas
 DictionaryFees=Informe de gastos: tipos de líneas de informe de gastos
@@ -662,6 +659,7 @@ DictionarySendingMethods=Métodos de envío
 DictionaryStaff=Personal
 DictionaryAvailability=Retraso en la entrega
 DictionarySource=Origen de las propuestas / órdenes
+DictionaryAccountancyCategory=Grupos personalizados para informes
 DictionaryAccountancysystem=Modelos para el cuadro de cuentas
 DictionaryAccountancyJournal=Libros contables
 DictionaryEMailTemplates=Plantillas de correos electrónicos
@@ -715,7 +713,7 @@ NbOfRecord=N° de registros
 DriverType=Tipo de controlador
 SummarySystem=Resumen de información del sistema
 SummaryConst=Lista de todos los parámetros de configuración de Dolibarr
-MenuCompanySetup=Empresa/Organización
+MenuCompanySetup=Empresa / Organización
 DefaultMenuManager=Administrador de menú estándar
 DefaultMenuSmartphoneManager=Administrador de menú de teléfono inteligente
 Skin=Tema de la piel
@@ -729,8 +727,8 @@ PermanentLeftSearchForm=Formulario de búsqueda permanente en el menú de la izq
 DefaultLanguage=Lenguaje predeterminado para usar (código de idioma)
 EnableMultilangInterface=Habilitar interfaz multilingüe
 EnableShowLogo=Mostrar logo en el menú de la izquierda
-CompanyInfo=Información empresa/organización
-CompanyIds=Identidades de empresa/organización
+CompanyInfo=Información de la empresa / organización
+CompanyIds=Identidades de empresa / organización
 CompanyName=Nombre
 CompanyCurrency=Moneda principal
 DoNotSuggestPaymentMode=No sugiera
@@ -833,11 +831,14 @@ DefineHereComplementaryAttributes=Defina aquí todos los atributos, que aún no
 ExtraFields=Atributos complementarios
 ExtraFieldsLines=Atributos complementarios (líneas)
 ExtraFieldsLinesRec=Atributos complementarios (líneas plantillas de facturas)
+ExtraFieldsSupplierOrdersLines=Atributos complementarios (líneas de pedido)
+ExtraFieldsSupplierInvoicesLines=Atributos complementarios (líneas de factura)
 ExtraFieldsThirdParties=Atributos complementarios (terceros)
 ExtraFieldsContacts=Atributos complementarios (contacto/dirección)
 ExtraFieldsMember=Atributos complementarios (miembro)
 ExtraFieldsMemberType=Atributos complementarios (tipo de miembro)
 ExtraFieldsCustomerInvoices=Atributos complementarios (facturas)
+ExtraFieldsCustomerInvoicesRec=Atributos complementarios (plantillas de facturas)
 ExtraFieldsSupplierOrders=Atributos complementarios (pedidos)
 ExtraFieldsSupplierInvoices=Atributos complementarios (facturas)
 ExtraFieldsProject=Atributos complementarios (proyectos)
@@ -1154,7 +1155,6 @@ ConfirmDeleteMenu=¿Seguro que quieres eliminar la entrada del menú <b>%s</b>?
 FailedToInitializeMenu=Error al inicializar el menú
 TaxSetup=Impuestos, impuestos sociales o fiscales y configuración del módulo de dividendos
 OptionVatMode=IVA debido
-OptionVATDefault=Base de efectivo
 OptionVATDebitOption=Devengo
 OptionVatDefaultDesc=El IVA es pagadero: <br> - a la entrega de los bienes (utilizamos la fecha de la factura) <br> - en los pagos por los servicios
 OptionVatDebitOptionDesc=El IVA es pagadero: <br> - a la entrega de los bienes (utilizamos la fecha de la factura) <br> - en la factura (débito) de los servicios
@@ -1324,6 +1324,7 @@ AddTriggers=Agregar disparadores
 AddMenus=Agregar menús
 AddPermissions=Agregar permisos
 AddExportProfiles=Agregar perfiles de exportación
+AddImportProfiles=Añadir perfiles de importación
 AddOtherPagesOrServices=Agregar otras páginas o servicios
 AddModels=Agregar documento o plantillas de numeración
 AddSubstitutions=Añadir sustituciones de teclas
@@ -1340,8 +1341,9 @@ TypeCdr=Use "Ninguno" si la fecha del plazo de pago es la fecha de la factura m
 BaseCurrency=Moneda de referencia de la empresa (entre en la configuración de la empresa para cambiar esto)
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo Registros no reversibles se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Intenta instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor del módulo y está seguro de que este módulo no altera negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo trae una característica no legal, usted se convierte en responsable del uso de un software no legal.
+SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en sí si este grupo es un cálculo de otros grupos
 ResourceSetup=Recurso de configuración del módulo
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
-DisabledResourceLinkUser=Enlace de recurso desactivado al usuario
-DisabledResourceLinkContact=Enlace de recurso desactivado al contacto
+DisabledResourceLinkUser=Deshabilitar característica para vincular un recurso a los usuarios
+DisabledResourceLinkContact=Deshabilitar característica para vincular un recurso a contactos
 ConfirmUnactivation=Confirmar restablecimiento del módulo
diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang
index 8b8203105cd..0a2f4b880db 100644
--- a/htdocs/langs/es_CL/agenda.lang
+++ b/htdocs/langs/es_CL/agenda.lang
@@ -29,7 +29,6 @@ PropalClassifiedBilledInDolibarr=Propuesta %s clasificado facturado
 InvoiceValidatedInDolibarrFromPos=Factura %s validada de POS
 InvoiceBackToDraftInDolibarr=La factura %s vuelve al estado del giro
 InvoicePaidInDolibarr=Factura %s cambiado a pagado
-MemberSubscriptionAddedInDolibarr=Se agregó una suscripción para el miembro %s
 ShipmentValidatedInDolibarr=Envío %s validado
 ShipmentClassifyClosedInDolibarr=Envío %s clasificado facturado
 ShipmentUnClassifyCloseddInDolibarr=Envío %s clasificado reabierto
@@ -59,7 +58,8 @@ AgendaUrlOptions1=También puede agregar los siguientes parámetros para filtrar
 AgendaUrlOptions3=<b>logina =%s</b> para restringir la salida a acciones propiedad de un usuario<b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> para restringir la salida a acciones que no son propiedad del usuario <b>%s</b>.
 AgendaUrlOptions4=<b>logint =%s</b> para restringir la salida a acciones asignadas al usuario <b>%s</b> (propietario y otros).
-AgendaUrlOptionsProject=<b> project = PROJECT_ID </ b> para restringir el resultado a acciones asociadas al proyecto <b> PROJECT_ID </ b>.
+AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __ </ b> para restringir el resultado a acciones vinculadas al proyecto <b> __ PROJECT_ID __ </ b>.
+AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </ b> para excluir el evento automático.
 AgendaShowBirthdayEvents=Mostrar cumpleaños de contactos
 AgendaHideBirthdayEvents=Ocultar cumpleaños de contactos
 ExportDataset_event1=Lista de eventos de la agenda
@@ -67,7 +67,6 @@ DefaultWorkingDays=Rango predeterminado de días laborables en la semana (Ejempl
 DefaultWorkingHours=Horas de trabajo predeterminadas en el día (Ejemplo: 9-18)
 ExtSites=Importar calendarios externos
 ExtSitesEnableThisTool=Mostrar los calendarios externos (definidos en la configuración global) en la agenda. No afecta los calendarios externos definidos por los usuarios.
-AgendaExtNb=Calendario N° %s
 ExtSiteUrlAgenda=URL para acceder al archivo .ical
 DateActionBegin=Fecha del evento de inicio
 ConfirmCloneEvent=¿Seguro que quieres clonar el evento <b>%s</b>?
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index 0110156b9ef..11d752cb07b 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -68,7 +68,6 @@ PaymentAmount=Monto del pago
 ValidatePayment=Validar el pago
 PaymentHigherThanReminderToPay=Pago más alto que un recordatorio para pagar
 HelpPaymentHigherThanReminderToPay=Atención, el monto de pago de una o más facturas es más alto que el resto para pagar. <br> Edite su entrada; de lo contrario, confirme y piense en crear una nota de crédito del exceso recibido por cada factura en exceso.
-HelpPaymentHigherThanReminderToPaySupplier=Atención, el monto de pago de una o más facturas es más alto que el resto para pagar. <br> Edite su entrada, de lo contrario confirme.
 ClassifyUnBilled=Clasificar 'Unbilled'
 CreateCreditNote=Crear nota de crédito
 AddBill=Crear factura o nota de crédito
@@ -88,7 +87,7 @@ PriceBase=Base de precios
 BillStatusDraft=Borrador (debe ser validado)
 BillStatusPaid=Pagado
 BillStatusPaidBackOrConverted=Reembolso de la nota de crédito o convertido en descuento
-BillStatusConverted=Pagado (listo para la factura final)
+BillStatusConverted=Pagado (listo para el consumo en la factura final)
 BillStatusCanceled=Abandonado
 BillStatusValidated=Validado (debe pagarse)
 BillStatusStarted=Empezado
@@ -116,6 +115,7 @@ ErrorDiscountAlreadyUsed=Error, descuento ya usado
 ErrorInvoiceAvoirMustBeNegative=Error, la factura correcta debe tener una cantidad negativa
 ErrorInvoiceOfThisTypeMustBePositive=Error, este tipo de factura debe tener una cantidad positiva
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no puede cancelar una factura que ha sido reemplazada por otra factura que todavía está en estado de borrador
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Esta parte u otra ya se usa para que la serie de descuento no se pueda eliminar.
 BillFrom=De
 BillTo=A
 ActionsOnBill=Acciones en la factura
@@ -142,6 +142,7 @@ ConfirmCancelBillQuestion=¿Por qué quiere clasificar esta factura como "abando
 ConfirmClassifyPaidPartially=¿Está seguro de que desea cambiar la factura del <b>%s</b> al estado pagado?
 ConfirmClassifyPaidPartiallyQuestion=Esta factura no ha sido pagada por completo. ¿Cuáles son las razones para que cierre esta factura?
 ConfirmClassifyPaidPartiallyReasonAvoir=El impago restante <b>(%s%s)</b> es un descuento otorgado porque el pago se realizó antes del plazo. Regularizo el IVA con una nota de crédito.
+ConfirmClassifyPaidPartiallyReasonDiscount=El no pagado restante <b>(%s %s)</b> es un descuento otorgado porque el pago se realizó antes del plazo.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El impago restante <b>(%s%s)</b> es un descuento otorgado porque el pago se realizó antes del plazo. Acepto perder el IVA sobre este descuento.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=El impago restante <b>(%s%s)</b> es un descuento otorgado porque el pago se realizó antes del plazo. Recupero el IVA de este descuento sin una nota de crédito.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Mal cliente
@@ -233,7 +234,6 @@ Deposit=Pago inicial
 Deposits=Bajo pago
 DiscountFromCreditNote=Descuento de la nota de crédito %s
 DiscountFromDeposit=Anticipos desde la factura %s
-DiscountFromExcessReceived=Pagos por exceso recibido de la factura %s
 AbsoluteDiscountUse=Este tipo de crédito se puede utilizar en la factura antes de su validación
 CreditNoteDepositUse=La factura debe ser validada para usar este tipo de créditos
 NewGlobalDiscount=Nuevo descuento absoluto
@@ -280,10 +280,6 @@ FrequencyUnit=Unidad de frecuencia
 toolTipFrequency=Ejemplos: <br> <b> Establecer 7, Día </ b>: dar una nueva factura cada 7 días <br> <b> Establecer 3, Mes </ b>: dar una nueva factura cada 3 meses
 NextDateToExecution=Fecha para la próxima generación de facturas
 DateLastGeneration=Fecha de última generación
-MaxPeriodNumber=Máx N° de generación de factura
-NbOfGenerationDone=N° de generación de facturas ya hecho
-NbOfGenerationDoneShort=N° de generación hecho
-MaxGenerationReached=Máximo N° de generaciones alcanzadas
 GeneratedFromRecurringInvoice=Generado a partir de la factura recurrente de la plantilla %s
 DateIsNotEnough=Fecha no alcanzada todavía
 InvoiceGeneratedFromTemplate=Factura %s generada a partir de la factura recurrente de la plantilla %s
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 22f96498a73..193bf35f5e4 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -31,7 +31,6 @@ Individual=Individuo privado
 ToCreateContactWithSameName=Creará automáticamente un contacto / dirección con la misma información que un tercero bajo el tercero. En la mayoría de los casos, incluso si su tercero es una persona física, crear un tercero solo es suficiente.
 ParentCompany=Empresa matriz
 Subsidiaries=Subsidiarias
-ReportByCustomers=Informe de los clientes
 CivilityCode=Código de civilidad
 RegisteredOffice=Oficina registrada
 Lastname=Apellido
@@ -45,8 +44,8 @@ PhonePerso=Pers. teléfono
 No_Email=Rechazar correos electrónicos masivos
 Town=Ciudad
 Poste=Posición
-VATIsUsed=Usa IVA
-VATIsNotUsed=No usa IVA
+VATIsUsed=Impuesto a las ventas se utiliza
+VATIsNotUsed=Impuesto a las ventas no se utiliza
 CopyAddressFromSoc=Rellenar dirección con dirección de tercero
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero, ni cliente ni proveedor, no hay objetos de referencia disponibles
 OverAllProposals=Cotizaciones
@@ -84,9 +83,9 @@ ProfId3PT=Prof Id 3 (Número de registro comercial)
 ProfId4PT=Prof Id 4 (Conservatorio)
 ProfId2TN=Prof Id 2 (matrícula fiscal)
 ProfId3TN=Prof Id 3 (código de Douane)
-ProfId1US=ID del profesor
-VATIntra=Número de valor agregado
-VATIntraShort=Numero IVA
+ProfId1US=Id del profesor (FEIN)
+VATIntra=ID de impuesto a las ventas
+VATIntraShort=Identificación del impuesto
 VATIntraSyntaxIsValid=La sintaxis es valida
 ProspectCustomer=Prospecto/Cliente
 Prospect=Prospectar
@@ -98,8 +97,6 @@ CompanyHasAbsoluteDiscount=Este cliente tiene descuento disponible (notas de cr
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tiene descuento disponible (pagos iniciales, comerciales) para <b>%s</b>%s
 CompanyHasCreditNote=Este cliente todavía tiene notas de crédito por <b>%s</b>%s
 CompanyHasNoAbsoluteDiscount=Este cliente no tiene crédito de descuento disponible
-CustomerAbsoluteDiscountAllUsers=Descuentos absolutos (concedidos por todos los usuarios)
-CustomerAbsoluteDiscountMy=Descuentos absolutos (otorgados por usted)
 AddContactAddress=Crear contacto / dirección
 EditContactAddress=Editar contacto / dirección
 ContactId=ID de contacto
@@ -171,8 +168,7 @@ NoDolibarrAccess=Sin acceso a Dolibarr
 ExportDataset_company_1=Terceros (Empresas / fundaciones / personas físicas) y propiedades
 ExportDataset_company_2=Contactos y propiedades
 ImportDataset_company_1=Terceros (Empresas / fundaciones / personas físicas) y propiedades
-ImportDataset_company_3=Detalles del banco
-ImportDataset_company_4=Terceros / representantes de ventas (afectar a los representantes de ventas de los usuarios a las empresas)
+ImportDataset_company_4=Terceros / representantes de ventas (asignar usuarios de representantes de ventas a las empresas)
 DeliveryAddress=Dirección de entrega
 SupplierCategory=Categoría del proveedor
 DeleteFile=Borrar archivo
@@ -193,14 +189,13 @@ ProductsIntoElements=Lista de productos / servicios en %s
 CurrentOutstandingBill=Factura pendiente actual
 OutstandingBill=Max. por factura pendiente
 OutstandingBillReached=Max. por la factura pendiente alcanzado
+OrderMinAmount=Monto mínimo para la orden
 MonkeyNumRefModelDesc=Devuelva numero con formato %saaam-nnnn para código de cliente y %saaam-nnnn para código de proveedor donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0.
 LeopardNumRefModelDesc=El código es libre. Este código se puede modificar en cualquier momento.
 ManagingDirectors=Nombre del gerente (CEO, director, presidente ...)
 MergeOriginThirdparty=Tercero duplicado (tercero que desea eliminar)
 ConfirmMergeThirdparties=¿Estás seguro de que deseas fusionar a este tercero en el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al tercero actual, luego se eliminará el tercero.
-ThirdpartiesMergeSuccess=Las terceras partes se han fusionado
 SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
 SaleRepresentativeLastname=Apellido del representante de ventas
-ErrorThirdpartiesMerge=Hubo un error al eliminar las terceros. Por favor revise el registro. Los cambios han sido revertidos.
 NewCustomerSupplierCodeProposed=Nuevo código de cliente o proveedor sugerido en código duplicado
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index a4c3095b546..d69f324cc36 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Facturación/Pagos
+MenuFinancial=Facturación | Pago
 TaxModuleSetupToModifyRules=Vaya a <a href="%s"> Configuración del módulo de impuestos </a> para modificar las reglas de cálculo
 TaxModuleSetupToModifyRulesLT=Vaya a <a href="%s"> Configuración de la empresa </a> para modificar las reglas de cálculo
 OptionMode=Opción para contabilidad
@@ -26,7 +26,6 @@ Credit=Crédito
 Piece=Contabilidad Doc.
 AmountHTVATRealReceived=Neto recaudado
 AmountHTVATRealPaid=Neto pagado
-VATToPay=IVA Debito
 VATReceived=Impuesto recibido
 VATToCollect=IVA Crédito
 VATSummary=Balance de impuestos
@@ -137,23 +136,13 @@ RulesAmountOnInOutBookkeepingRecord=Incluye registro en su Libro mayor con cuent
 RulesResultBookkeepingPredefined=Incluye registro en su Libro mayor con cuentas de contabilidad que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPersonalized=Muestra un registro en su Libro mayor con cuentas de contabilidad <b> agrupadas por grupos personalizados </ b>
 SeePageForSetup=Ver el menú <a href="%s"> %s </a> para la configuración
-LT2ReportByCustomersInInputOutputModeES=Informe de un tercero IRPF
-LT1ReportByCustomersInInputOutputModeES=Informe de un tercero RE
-VATReport=Informe de IVA
 VATReportByCustomersInInputOutputMode=Informe del cliente IVA recaudado y pagado
-VATReportByCustomersInDueDebtMode=Informe del cliente IVA recaudado y pagado
-VATReportByQuartersInInputOutputMode=Informe por tasa de IVA cobrado y pagado
-LT1ReportByQuartersInInputOutputMode=Informe por tasa RE
-LT2ReportByQuartersInInputOutputMode=Informe por tasa de IRPF
-VATReportByQuartersInDueDebtMode=Informe por tasa de IVA cobrado y pagado
-LT1ReportByQuartersInDueDebtMode=Informe por tasa RE
-LT2ReportByQuartersInDueDebtMode=Informe por tasa de IRPF
+LT1ReportByQuartersES=Informe por tasa RE
+LT2ReportByQuartersES=Informe por tasa de IRPF
 SeeVATReportInInputOutputMode=Ver informe<b>%sajuste de IVA%s</b>para un cálculo estándar
 SeeVATReportInDueDebtMode=Consulte el informe <b>%s IVA en flujo%s</b> para un cálculo con una opción en el flujo
 RulesVATInServices=- Para los servicios, el informe incluye las regulaciones del IVA realmente recibidas o emitidas sobre la base de la fecha de pago.
-RulesVATInProducts=- Para los activos materiales, incluye las facturas de IVA en función de la fecha de facturación.
 RulesVATDueServices=- Para los servicios, el informe incluye las facturas con IVA adeudadas, pagadas o no, en función de la fecha de la factura.
-RulesVATDueProducts=- Para los activos materiales, incluye las facturas de IVA, basadas en la fecha de la factura.
 OptionVatInfoModuleComptabilite=Nota: Para los activos materiales, debe usar la fecha de entrega para ser más justo.
 PercentOfInvoice=%% / factura
 NotUsedForGoods=No usado en productos
@@ -179,8 +168,6 @@ CalculationRuleDesc=Para calcular el IVA total, hay dos métodos: <br>El método
 CalculationRuleDescSupplier=De acuerdo con el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtenga el mismo resultado esperado por su proveedor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de facturación por producto, al utilizar el modo <b> contabilidad de efectivo </ b> no es relevante. Este informe solo está disponible cuando se utiliza el modo <b> contabilidad del compromiso </ b> (ver configuración del módulo de contabilidad).
 AccountancyJournal=Revista de códigos contables
-ACCOUNTING_VAT_SOLD_ACCOUNT=Cuenta de contabilidad por defecto para cobrar el IVA - IVA sobre las ventas (se usa si no está definido en la configuración del diccionario del IVA)
-ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta de contabilidad por defecto para el IVA recuperado - IVA en compras (utilizado si no está definido en la configuración del diccionario de IVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Cuenta de contabilidad por defecto para pagar el IVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta de contabilidad utilizada para terceros clientes
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de un tercero se utilizará solo para los contadores de Subledger. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de cliente dedicada dedicada a terceros.
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 85e09b6399c..8875f25d01f 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -31,7 +31,7 @@ ErrorCanNotCreateDir=No se puede crear el dir %s
 ErrorCanNotReadDir=No se puede leer dir %s
 ErrorConstantNotDefined=El parámetro %s no está definido
 ErrorLogoFileNotFound=No se encontró el archivo de logotipo '%s'
-ErrorGoToGlobalSetup=Ir a la configuración de 'Empresa/Organización' para arreglar esto
+ErrorGoToGlobalSetup=Ir a la configuración de 'Empresa / Organización' para arreglar esto
 ErrorGoToModuleSetup=Ir a la configuración del módulo para arreglar esto
 ErrorFailedToSendMail=Error al enviar el correo (remitente = %s, receptor = %s)
 ErrorFileNotUploaded=El archivo no fue cargado. Compruebe que el tamaño no exceda el máximo permitido, que el espacio libre esté disponible en el disco y que no haya un archivo con el mismo nombre en este directorio.
@@ -49,11 +49,11 @@ ErrorNoVATRateDefinedForSellerCountry=Error, sin tasas de IVA definidas para el
 ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de impuestos sociales/fiscales definidos para el país '%s'.
 ErrorFailedToSaveFile=Error, no se pudo guardar el archivo.
 ErrorCannotAddThisParentWarehouse=Está intentando agregar un almacén principal que ya es hijo de uno actual
-MaxNbOfRecordPerPage=N° máx de registro por página
 NotAuthorized=Usted no está autorizado a hacer eso.
 SetDate=Establece la fecha
 SeeAlso=Véase también %s
 SeeHere=Mira aquí
+ClickHere=haga clic aquí
 BackgroundColorByDefault=Color de fondo predeterminado
 FileRenamed=El archivo fue renombrado con éxito
 FileGenerated=El archivo fue generado con éxito
@@ -173,6 +173,7 @@ PriceUHTCurrency=U.P (moneda)
 PriceUTTC=ARRIBA. (inc. impuesto)
 Amount=Cantidad
 AmountInvoice=Importe de la factura
+AmountInvoiced=Monto facturado
 AmountPayment=Monto del pago
 AmountHTShort=Monto (neto)
 AmountTTCShort=Monto (IVA inc.)
@@ -215,6 +216,8 @@ LT1Type=Tipo de impuesto a las ventas 2
 LT2=Impuesto a las ventas 3
 LT2Type=Tipo de impuesto a las ventas 3
 VATRate=Tasa de impuesto
+VATCode=Código de tasa impositiva
+VATNPR=Tasa de impuesto NPR
 DefaultTaxRate=Tasa de impuesto predeterminada
 Average=Promedio
 Module=Módulo / Aplicación
@@ -227,7 +230,7 @@ ActionsToDoShort=Que hacer
 ActionsDoneShort=Hecho
 ActionNotApplicable=No aplica
 ActionRunningNotStarted=Para comenzar
-CompanyFoundation=Empresa/Organización
+CompanyFoundation=Empresa / Organización
 ContactsForCompany=Contactos para este tercero
 ContactsAddressesForCompany=Contactos/direcciones para este tercero
 AddressesForCompany=Direcciones para este tercero
@@ -266,6 +269,8 @@ Photo=Imagen
 Photos=Imágenes
 ConfirmDeletePicture=Confirmar eliminación de imagen?
 Login=Iniciar sesión
+LoginEmail=Ingreso (correo)
+LoginOrEmail=Iniciar sesión o correo electrónico
 CurrentLogin=Inicio de sesión actual
 EnterLoginDetail=Ingrese los detalles de inicio
 May=Mayo
@@ -293,7 +298,7 @@ NbOfLines=Número de líneas
 NbOfObjectReferers=Número de artículos relacionados
 Referers=Artículos relacionados
 DateFrom=Desde %s
-Check=Cheque
+Check=Revisar
 Uncheck=Desmarcar
 Internals=Interno
 Externals=Externo
@@ -369,6 +374,7 @@ Hidden=Oculto
 Source=Fuente
 Before=antes de
 IPAddress=dirección IP
+NewAttribute=Nuevo atributo
 AttributeCode=Código de atributo
 URLPhoto=URL de la foto / logotipo
 SetLinkToAnotherThirdParty=Enlace a otro tercero
@@ -421,7 +427,7 @@ MassFilesArea=Área para archivos creados por acciones masivas
 ConfirmMassDeletion=Confirmación de eliminación masiva
 ConfirmMassDeletionQuestion=¿Seguro que quieres eliminar el registro %s seleccionado?
 ClassifyBilled=Clasificar pago
-ClickHere=haga clic aquí
+ClassifyUnbilled=Clasificar sin facturar
 FrontOffice=Oficina frontal
 ExportFilteredList=Exportar lista filtrada
 ExportList=Lista de exportación
@@ -465,7 +471,7 @@ Select2NotFound=No se han encontrado resultados
 Select2Enter=Entrar
 Select2MoreCharacter=o más personaje
 Select2MoreCharacters=o más personajes
-Select2MoreCharactersMore=<strong> Sintaxis de búsqueda: </ strong> <br> <kbd> <strong> | </ strong> </ kbd> <kbd> O </ kbd> (a | b) <br> <kbd> <strong> * </ strong> </ kbd> <kbd> Cualquier carácter </ kbd> (a * b) <br /> <kbd> <strong> ^ </ strong> </ kbd> <kbd> Comience con </ kbd > (^ ab) <br /> <kbd> <strong> $ </ strong> </ kbd> <kbd> Finaliza con </ kbd> (ab $) <br />
+Select2MoreCharactersMore=<strong> Sintaxis de búsqueda: </strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b) <br><kbd><strong>*</strong></kbd><kbd> Cualquier carácter </kbd> (a * b)<br><kbd><strong> ^</strong></kbd> <kbd> Comience con</kbd> (^ ab) <br><kbd><strong> $</strong></kbd><kbd> finaliza con</kbd> (ab $) <br>
 Select2LoadingMoreResults=Cargando más resultados ...
 Select2SearchInProgress=Búsqueda en progreso ...
 SearchIntoCustomerInvoices=Facturas de cliente
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index a04a3869592..4e4ad9b61b2 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -8,8 +8,6 @@ MembersTickets=Entradas de los miembros
 FundationMembers=Miembros de la fundación
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, login: <b>%s</b>) ya está asignado al tercero <b>%s</b>. Primero elimine la asignación, porque un tercero no puede vincularse solo a un miembro (y viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, debe tener permiso para editar a todos los usuarios para poder vincular a un miembro con un usuario que no es el suyo.
-ThisIsContentOfYourCard=Hola. <br> <br> Esto es un recordatorio de la información que obtenemos sobre usted. No dude en contactarnos si algo parece estar mal. <br> <br>
-CardContent=Contenido de su tarjeta de miembro
 SetLinkToUser=Enlace a un usuario de Dolibarr
 SetLinkToThirdParty=Enlace a un tercero de Dolibarr
 MembersCards=Tarjetas de socios
@@ -79,6 +77,7 @@ PublicMemberCard=Tarjeta pública de miembro
 SubscriptionNotRecorded=Suscripción no grabada
 AddSubscription=Crear suscripción
 ShowSubscription=Mostrar suscripción
+CardContent=Contenido de su tarjeta de miembro
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del correo electrónico recibido en caso de inscripción automática de un invitado
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recibido en caso de auto inscripción de un invitado
 DescADHERENT_MAIL_FROM=Remitente Correo electrónico para correos electrónicos automáticos
diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
index dcbeb67cdb6..e4aed8f8337 100644
--- a/htdocs/langs/es_CL/other.lang
+++ b/htdocs/langs/es_CL/other.lang
@@ -15,6 +15,8 @@ TextNextMonthOfInvoice=Mes siguiente (texto) de fecha de factura
 DocFileGeneratedInto=Archivo de documento generado en <b>%s</b>.
 MessageOK=Mensaje en la página de devolución de pago validada
 MessageKO=Mensaje en la página de devolución de pago cancelado
+ContentOfDirectoryIsNotEmpty=El contenido de este directorio no está vacío.
+DeleteAlsoContentRecursively=Compruebe para eliminar todo el contenido recursiveley
 YearOfInvoice=Año de la fecha de factura
 PreviousYearOfInvoice=Año anterior de la fecha de facturación
 NextYearOfInvoice=El año siguiente a la fecha de la factura
@@ -62,8 +64,8 @@ LinkedObject=Objeto vinculado
 NbOfActiveNotifications=Número de notificaciones (N° de correos electrónicos de destinatarios)
 PredefinedMailTest=__(Hola)__\nEste es un correo de prueba enviado a __EMAIL__.\nLas dos líneas están separadas por un retorno de carro.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hola)__\nEste es un correo de <b> prueba </b> (la palabra prueba debe estar en negrita). <br> Las dos líneas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hola)__\n\nAquí encontrará la factura __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hola)__\n\nNos gustaría advertirle que la factura __REF__ parece no ser pagada. Así que esta es la factura en el archivo adjunto de nuevo, como un recordatorio.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hola)__\n\nAquí encontrará la factura __REF__\n\nEste es el enlace para realizar su pago en línea si esta factura no se ha pagado aún:\n__ONLINE_PAYMENT_URL__\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hola)__\n\nNos gustaría advertirle que la factura __REF__ parece no ser pagada. Así que esta es la factura en el archivo adjunto de nuevo, como un recordatorio.\n\nEste es el enlace para realizar su pago en línea:\n__ONLINE_PAYMENT_URL__\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hola)__\n\nAquí encontrará la propuesta comercial __PREF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hola)__\n\nAquí encontrará la solicitud de precio __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hola)__\n\nAquí encontrará el orden __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
@@ -101,9 +103,9 @@ Bottom=Fondo
 Surface=Zona
 VolumeUnitmm3=mm³ (μl)
 BugTracker=Localizador de bichos
-SendNewPasswordDesc=Este formulario le permite solicitar una nueva contraseña. Se enviará a su dirección de correo electrónico. <br> El cambio entrará en vigencia una vez que haga clic en el enlace de confirmación en el correo electrónico. <br /> Compruebe su bandeja de entrada.
+SendNewPasswordDesc=Este formulario le permite solicitar una nueva contraseña. Se enviará a su dirección de correo electrónico. <br> El cambio entrará en vigencia una vez que haga clic en el enlace de confirmación en el correo electrónico. <br> Verifique su bandeja de entrada.
 BackToLoginPage=Volver a la página de inicio de sesión
-AuthenticationDoesNotAllowSendNewPassword=El modo de autenticación es <b>%s</b>. <br> En este modo, Dolibarr no puede saber ni cambiar su contraseña. <br /> Póngase en contacto con el administrador del sistema si desea cambiar su contraseña.
+AuthenticationDoesNotAllowSendNewPassword=El modo de autenticación es <b>%s</b>. <br> En este modo, Dolibarr no puede saber ni cambiar su contraseña.<br> Póngase en contacto con el administrador del sistema si desea cambiar su contraseña.
 EnableGDLibraryDesc=Instale o habilite la biblioteca de GD en su instalación de PHP para usar esta opción.
 ProfIdShortDesc=<b>Prof Id %s</b> es una información que depende del país de un tercero. <br> Por ejemplo, para el país <b>%s</b>, es el código<b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP / CRM
@@ -156,6 +158,7 @@ IfAmountHigherThan=Si la cantidad es superior a <strong>%s</strong>
 SourcesRepository=Repositorio de fuentes
 PassEncoding=Codificación de contraseña
 PermissionsAdd=Permisos agregados
+YourPasswordMustHaveAtLeastXChars=Su contraseña debe tener al menos <strong>%s</strong> caracteres
 LibraryUsed=Biblioteca utilizada
 LibraryVersion=Versión de biblioteca
 NoExportableData=No se pueden exportar datos (no hay módulos con datos exportables cargados o sin permisos)
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 068f78e0cf3..a81f376141c 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -102,12 +102,12 @@ CustomerPrices=Precios de cliente
 SuppliersPrices=Precios de proveedor
 SuppliersPricesOfProductsOrServices=Precios del proveedor (de productos o servicios)
 CustomCode=Código de Aduanas / Productos / HS
-unitSET=Conjunto
 ProductCodeModel=Plantilla de referencia de producto
 ServiceCodeModel=Plantilla de referencia de servicio
 AlwaysUseNewPrice=Utilice siempre el precio actual del producto/servicio
 AlwaysUseFixedPrice=Usa el precio fijo
 PriceByQuantity=Diferentes precios por cantidad
+DisablePriceByQty=Deshabilitar precios por cantidad
 PriceByQuantityRange=Rango Cantidad
 MultipriceRules=Reglas del segmento de precios
 UseMultipriceRules=Utilice las reglas del segmento de precios (definidas en la configuración del módulo del producto) para autocalcular los precios de todos los demás segmentos de acuerdo con el primer segmento
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index 19dc9aa1b69..da175642b74 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -6,13 +6,13 @@ SharedProject=Todos
 PrivateProject=Contactos del proyecto
 ProjectsImContactFor=Proyectos Soy explícitamente un contacto de
 AllAllowedProjects=Todo el proyecto que puedo leer (mío + público)
-MyProjectsDesc=Esta vista se limita a los proyectos para los que es contacto.
+MyProjectsDesc=Esta vista está limitada a los proyectos para los que es contacto
 ProjectsPublicDesc=Esta vista presenta todos los proyectos que puede leer.
 TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas en proyectos que puede leer.
 ProjectsPublicTaskDesc=Esta vista presenta todos los proyectos y tareas que puede leer.
 ProjectsDesc=Esta vista presenta todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo).
 TasksOnProjectsDesc=Esta vista presenta todas las tareas en todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo).
-MyTasksDesc=Esta sección está limitada a proyectos o tareas en las que eres contacto.
+MyTasksDesc=Esta vista se limita a proyectos o tareas para los que es contacto
 OnlyOpenedProject=Solo los proyectos abiertos son visibles (los proyectos en borrador o cerrados no son visibles).
 TasksPublicDesc=Esta vista presenta todos los proyectos y tareas que puede leer.
 TasksDesc=Esta vista presenta todos los proyectos y tareas (sus permisos de usuario le otorgan permiso para ver todo).
@@ -35,6 +35,7 @@ TimesSpent=Tiempo dedicado
 LabelTask=Etiqueta de tarea
 TaskTimeSpent=Tiempo dedicado a tareas
 NewTimeSpent=Tiempo dedicado
+BillTime=Bill el tiempo pasado
 TaskDateStart=Fecha de inicio de la tarea
 TaskDateEnd=Fecha de finalización de tarea
 TaskDescription=Descripción de la tarea
@@ -62,12 +63,14 @@ ListExpenseReportsAssociatedProject=Lista de informes de gastos asociados con el
 ListDonationsAssociatedProject=Lista de donaciones asociadas con el proyecto
 ListActionsAssociatedProject=Lista de eventos asociados con el proyecto
 ListTaskTimeUserProject=Lista de tiempo consumido en las tareas del proyecto
+ListTaskTimeForTask=Lista de tiempo consumido en la tarea
 ActivityOnProjectToday=Actividad en proyecto hoy
 ActivityOnProjectYesterday=Actividad en el proyecto de ayer
 ActivityOnProjectThisWeek=Actividad en proyecto esta semana
 ActivityOnProjectThisMonth=Actividad en proyecto este mes
 ActivityOnProjectThisYear=Actividad en proyecto este año
 ChildOfProjectTask=Hijo del proyecto / tarea
+TaskHasChild=La tarea tiene un niño
 NotOwnerOfProject=No es dueño de este proyecto privado
 CantRemoveProject=Este proyecto no puede eliminarse ya que otros objetos lo hacen referencia (factura, pedidos u otros). Ver la pestaña de referers.
 ConfirmValidateProject=¿Seguro que quieres validar este proyecto?
@@ -152,5 +155,5 @@ OppStatusPROPO=Cotización
 AllowToLinkFromOtherCompany=Permitir vincular proyecto de otra empresa<br><br><u>Valores admitidos: </u><br> - Mantener vacío: puede vincular cualquier proyecto de la empresa (predeterminado)<br> - "todo": puede vincular cualquier proyecto, incluso proyecto de otras empresas<br> - Una lista de identificación de terceros separada por comas: puede vincular todos los proyectos de estos terceros definidos (Ejemplo: 123,4795,53)<br>
 LatestProjects=Últimos %s proyectos
 LatestModifiedProjects=Últimos proyectos modificados %s
-NoAssignedTasks=Sin tareas asignadas (se asigna proyecto / tareas desde el cuadro de selección superior para ingresar la hora en él)
+NoAssignedTasks=Sin tareas asignadas (asigne proyectos / tareas al usuario actual desde el cuadro de selección superior para ingresar la hora en él)
 AllowCommentOnProject=Permitir comentarios de los usuarios sobre los proyectos
diff --git a/htdocs/langs/es_CL/propal.lang b/htdocs/langs/es_CL/propal.lang
index ab9bc3a5d38..63f04520b37 100644
--- a/htdocs/langs/es_CL/propal.lang
+++ b/htdocs/langs/es_CL/propal.lang
@@ -8,7 +8,6 @@ CommercialProposal=Cotización
 PdfCommercialProposalTitle=Cotización
 ProposalCard=Ficha cotización
 NewProp=Nueva cotización
-NewPropal=Nueva cotización
 DeleteProp=Borrar Cotización
 ValidateProp=Validar cotización
 AddProp=Crear cotización
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
index 3c26813bb0f..06fd99b7411 100644
--- a/htdocs/langs/es_CL/stocks.lang
+++ b/htdocs/langs/es_CL/stocks.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - stocks
 WarehouseCard=Tarjeta de almacenamiento
 ParentWarehouse=Almacén principal
-NewWarehouse=Nuevo almacén / área de stock
+NewWarehouse=Nuevo almacén/área de stock
 WarehouseEdit=Modificar el almacén
 WarehouseSource=Almacén de origen
 WarehouseSourceNotDefined=Sin almacén definido
@@ -9,9 +9,7 @@ AddOne=Agrega uno
 WarehouseTarget=Almacén de destino
 ValidateSending=Eliminar envío
 CancelSending=Cancelar el envío
-StocksByLotSerial=Existencias por lote / serie
-LotSerial=Lotes / publicaciones seriadas
-LotSerialList=Lista de lotes / publicaciones seriadas
+StocksByLotSerial=Stock por lote/serie
 ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén
 ListOfWarehouses=Lista de almacenes
 ListOfStockMovements=Lista de movimientos de stock
@@ -26,7 +24,7 @@ NumberOfProducts=Número total de productos
 StockCorrection=Corrección de stock
 CorrectStock=Corregir stock
 StockTransfer=Transferencia de acciones
-MassStockTransferShort=Transferencia masiva de acciones
+MassStockTransferShort=Transferencia stock en masa
 StockMovement=Movimiento de valores
 StockMovements=Movimientos de acciones
 LabelMovement=Etiqueta de movimiento
@@ -45,11 +43,11 @@ OrderDispatch=Recibos de artículos
 RuleForStockManagementDecrease=Regla para la disminución automática de la gestión de stock (la disminución manual siempre es posible, incluso si se activa una regla de disminución automática)
 RuleForStockManagementIncrease=Regla para el aumento automático de la gestión de existencias (el aumento manual siempre es posible, incluso si se activa una regla de aumento automático)
 DeStockOnBill=Disminuir las existencias reales en las facturas de clientes / validación de notas de crédito
-DeStockOnValidateOrder=Disminuir las existencias reales en la validación de pedidos de los clientes
+DeStockOnValidateOrder=Disminuir las existencias reales en la validación de pedidos de clientes
 DeStockOnShipment=Disminuir las existencias reales en la validación de envío
 DeStockOnShipmentOnClosing=Disminuir las existencias reales en la clasificación de envío cerrado
-ReStockOnBill=Aumentar las existencias reales en las facturas de proveedores / validación de notas de crédito
-ReStockOnValidateOrder=Aumentar las existencias reales en la aprobación de pedidos de proveedores
+ReStockOnBill=Aumentar el stock real en la validación de facturas/notas de crédito de proveedores
+ReStockOnValidateOrder=Aumentar las existencias reales en la aprobación de pedidos a proveedores
 ReStockOnDispatchOrder=Aumente las existencias reales en el despacho manual a los almacenes, después de que el proveedor ordene la recepción de los bienes
 OrderStatusNotReadyToDispatch=El pedido todavía no tiene o no tiene un estado que permite el despacho de productos en almacenes de existencias.
 StockDiffPhysicTeoric=Explicación de la diferencia entre stock físico y virtual
@@ -57,7 +55,7 @@ NoPredefinedProductToDispatch=No hay productos predefinidos para este objeto. Po
 DispatchVerb=Envío
 StockLimit=Límite de existencias para alerta
 StockLimitDesc=(vacío) significa que no hay advertencia. <br> 0 se puede utilizar como advertencia tan pronto como el stock esté vacío.
-PhysicalStock=Inventario FISICO
+PhysicalStock=Stock fisico
 RealStockDesc=Las existencias físicas o reales son las existencias que tiene actualmente en sus almacenes / emplazamientos internos.
 RealStockWillAutomaticallyWhen=El stock real cambiará automáticamente de acuerdo con estas reglas (consulte la configuración del módulo de stock para cambiar esto):
 VirtualStockDesc=Las existencias virtuales son las acciones que recibirá una vez que todas las acciones pendientes pendientes que afecten a las existencias se cerrarán (orden de proveedor recibida, pedido del cliente enviado, ...)
@@ -75,8 +73,8 @@ ConfirmDeleteWarehouse=¿Estas seguro que quieres borrar la bodega <b>%s</b>?
 ThisWarehouseIsPersonalStock=Este almacén representa stock personal de %s %s
 SelectWarehouseForStockDecrease=Elija el almacén para usar para la disminución de stock
 SelectWarehouseForStockIncrease=Elija un almacén para aumentar las existencias
-NoStockAction=Sin acciones en inventario
-DesiredStock=Acción óptima deseada
+NoStockAction=Stock sin movimientos
+DesiredStock=Stock óptima deseado
 DesiredStockDesc=Esta cantidad de stock será el valor utilizado para rellenar el stock mediante la función de reposición.
 StockToBuy=Ordenar
 Replenishment=Reposición
@@ -85,14 +83,14 @@ VirtualDiffersFromPhysical=De acuerdo con las opciones de acciones de aumento /
 UseVirtualStockByDefault=Utilice stock virtual de forma predeterminada, en lugar de stock físico, para la función de reaprovisionamiento
 UseVirtualStock=Use stock virtual
 UsePhysicalStock=Usa material físico
-CurentlyUsingPhysicalStock=Inventario FISICO
+CurentlyUsingPhysicalStock=Stock fisico
 RuleForStockReplenishment=Regla para la reposición de existencias
 SelectProductWithNotNullQty=Seleccione al menos un producto con una cantidad no nula y un proveedor
 AlertOnly=Solo alertas
 WarehouseForStockDecrease=El almacén <b>%s</b> se usará para la disminución de stock
 WarehouseForStockIncrease=El almacén <b>%s</b> se usará para aumentar las existencias
-ReplenishmentStatusDesc=Esta es una lista de todos los productos con un stock inferior al stock deseado (o menor que el valor de alerta si está marcada la casilla "solo alerta"). Con la casilla de verificación, puede crear pedidos de proveedores para completar la diferencia.
-ReplenishmentOrdersDesc=Esta es una lista de todos los pedidos de proveedores abiertos, incluidos los productos predefinidos. Solo se muestran pedidos abiertos con productos predefinidos, por lo que los pedidos que pueden afectar a las existencias son visibles aquí.
+ReplenishmentStatusDesc=Esta es una lista de todos los productos con un stock inferior al stock deseado (o menor que el valor de alerta si está marcada la casilla "solo alerta"). Con la casilla de verificación, puede crear pedidos a proveedores para completar la diferencia.
+ReplenishmentOrdersDesc=Esta es una lista de todos los pedidos a proveedores abiertos, incluidos los productos predefinidos. Solo se muestran pedidos abiertos con productos predefinidos, por lo que los pedidos que pueden afectar a las existencias son visibles aquí.
 Replenishments=Reposición
 NbOfProductBeforePeriod=Cantidad de producto %s en stock antes del período seleccionado (<%s)
 NbOfProductAfterPeriod=Cantidad de producto %s en stock después del período seleccionado (> %s)
@@ -111,7 +109,7 @@ WarehouseAllowNegativeTransfer=Stock puede ser negativo
 qtyToTranferIsNotEnough=No tiene stock suficiente de su almacén de origen y su configuración no permite existencias negativas.
 MovementCorrectStock=Corrección de Stock para el producto %s
 InventoryCodeShort=Inv./Mov. código
-NoPendingReceptionOnSupplierOrder=No hay recepción pendiente debido a la orden de proveedor abierta
+NoPendingReceptionOnSupplierOrder=No hay recepción pendiente debido a la orden abierta a proveedor
 ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie (<strong>%s</strong>) ya existe pero con fecha de consumo o de vencimiento diferente (se encontró <strong>%s</strong> pero ingresó <strong>%s</strong>).
 OpenInternal=Abierto solo para acciones internas
 UseDispatchStatus=Utilice un estado de envío (aprobación / rechazo) para las líneas de productos en la recepción de pedidos del proveedor
@@ -124,7 +122,6 @@ AddStockLocationLine=Disminuya la cantidad y luego haga clic para agregar otro a
 InventoryDate=Fecha de inventario
 inventorySetup =Configuración de inventario
 inventoryValidatePermission=Validar el inventario
-inventoryCreateDelete=Crear / Eliminar inventario
 inventoryEdit=Editar
 inventoryDraft=Corriendo
 inventorySelectWarehouse=Opción de almacén
@@ -143,12 +140,11 @@ LastPA=Última BP
 RealValue=Valor real
 RegulatedQty=Cantidad regulada
 AddInventoryProduct=Agregar producto al inventario
-FlushInventory=Inventario al ras
+FlushInventory=Inventario sobrante
 ConfirmFlushInventory=¿Confirmas esta acción?
-InventoryFlushed=Inventario enrojecido
+InventoryFlushed=Inventario eliminado
 ExitEditMode=Edición de salida
 inventoryDeleteLine=Eliminar línea
 RegulateStock=Regular el stock
-ListInventory=Lista
 StockSupportServices=Servicios de soporte de gestión de stock
 StockSupportServicesDesc=Por defecto, puede almacenar solo productos con el tipo "producto". Si está activado, y si el servicio de módulo está activado, también puede almacenar un producto con el tipo "servicio"
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index a128bf4e651..fbca12ee95b 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -73,7 +73,6 @@ DaylingSavingTime=Horario de verano
 CurrentHour=Hora del PHP (servidor)
 Position=Puesto
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module42Name=Log
 DictionaryCanton=Departamento
 LTRate=Tipo
 CompanyName=Nombre
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index 200e6ec442e..250bb5bb7c3 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -1,22 +1,25 @@
 # Dolibarr language file - Source file is en_US - companies
+ConfirmDeleteContact=Está seguro de borrar este contacto y todas la información relacionada?
 ParentCompany=Sede principal
 Subsidiaries=Sucursales
 RegisteredOffice=Domicilio principal
 State=Departamento
 PhonePerso=Teléf. personal
+No_Email=Rechazar correos de cadena
+VATIsUsed=Sujeto a IVA
+VATIsNotUsed=No sujeto a IVA
 ProfId1AT=Id prof. 1 (USt.-IdNr)
 ProfId2AT=Id prof. 2 (USt.-Nr)
 ProfId3AT=Id prof. 3 (Handelsregister-Nr.)
 ProfId2CO=Identificación (CC, NIT, CE)
 ProfId3CO=CIIU
-VATIntra=NIT
-VATIntraShort=NIT
 CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> anticipos disponibles
 NoContactForAnyProposal=Este contacto no es contacto de ningúna cotización
 VATIntraCheckDesc=El link <b>%s</b> permite consultar al servicio RUES el NIT. Se requiere acceso a internet para que el servicio funcione
 VATIntraCheckURL=http://www.rues.org.co/RUES_Web/Consultas#tabs-3
 VATIntraCheckableOnEUSite=Verificar en la web
 VATIntraManualCheck=Puede también realizar una verificación manual en la web <a href="%s" target="_blank">%s</a>
+ExportDataset_company_2=Contactos de terceros y atributos
 ConfirmDeleteFile=¿Está seguro que quiere eliminar este archivo?
 ThirdPartiesArea=Área Terceros
 ManagingDirectors=Administrador(es) (CEO, gerente, director, presidente, etc.)
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 7fa5872f212..bca2d98ca04 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -34,4 +34,6 @@ RequestAlreadyDone=La solicitud ya ha sido procesada
 December=diciembre
 FindBug=Señalar un bug
 Currency=Moneda
+NewAttribute=Nuevo atributo
+AttributeCode=Código atributo
 PrintFile=Imprimir archivo %s
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 46365249827..426699b117a 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -11,8 +11,6 @@ Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
 VATManagement=Gestión ITBIS
 VATIsNotUsedDesc=El tipo de ITBIS propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
-VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el ITBIS.
-VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de ITBIS o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (ITBIS en franquicia), pagando un ITBIS en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación  "IVA no aplicable - art-293B del CGI" en las facturas.
 LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del ITBIS)
 LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
 LocalTax2IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index e6d9f06e3f0..2c38b535a36 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -202,6 +202,7 @@ MAIN_MAIL_EMAIL_FROM=Dirección electróica del remitente para correos electrón
 MAIN_MAIL_ERRORS_TO=Correo electrónico utilizado como campo 'Errores a' en los correos electrónicos enviados
 MAIN_MAIL_AUTOCOPY_TO=Enviar sistemáticamente una copia carbon oculta (CCO) de todos los correos enviados a
 MAIN_DISABLE_ALL_MAILS=Desactivar todos los envíos de correo electrónico (con fines de prueba o demos)
+MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
 MAIN_MAIL_SENDMODE=Método a utilizar para enviar mensajes de correo electrónico
 MAIN_MAIL_SMTPS_ID=ID de SMTP si se requiere autenticación
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP si se necesita autenticación
@@ -264,7 +265,7 @@ ErrorCantUseRazIfNoYearInMask=Error, no puede utilizar la opción @ para restabl
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no se puede utilizar la opción @ si la secuencia {aa}{mm} o {aaaa}{mm} no está en la máscara.
 UMask=Parámetro UMask para los nuevos archivos en el sistema de archivos de Unix/Linux/BSD/Mac.
 UMaskExplanation=Este parámetro le permite definir los permisos establecidos de forma predeterminada en los archivos creados por Dolibarr en el servidor (durante la carga, por ejemplo).<br> Debe ser el valor octal (por ejemplo, 0666 significa leer y escribir para todos).<br> Este parámetro es inútil en un servidor Windows.
-SeeWikiForAllTeam=Echar un vistazo a la página wiki para la lista completa de todos los actores y su organización
+SeeWikiForAllTeam=Echa un vistazo a la página wiki para ver una lista completa de todos los actores y su organización
 UseACacheDelay=Retardo para el almacenamiento en caché de la respuesta de exportación en segundos (0 o vacío para no caché)
 DisableLinkToHelpCenter=Ocultar enlace "<b>Necesita ayuda o soporte</b>" en la página de inicio de sesión
 AddCRIfTooLong=No hay envoltura automática, por lo que si la línea está fuera de la página de los documentos porque es demasiado larga, debe agregar devoluciones de carro en la zona de texto.
@@ -318,6 +319,7 @@ ExtrafieldCheckBoxFromList=Casillas de verificación de la tabla
 ExtrafieldLink=Enlace a un objeto
 ComputedFormula=Campo calculado
 ComputedFormulaDesc=Puede introducir aquí una fórmula utilizando otras propiedades de objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede utilizar cualquier fórmula compatible con PHP, incluyendo el "?" Operador de condición y objeto global siguiente: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Sólo algunas propiedades de $object puede estar disponible. Si necesita propiedades no cargadas, solo busque el objeto en su fórmula como en el segundo ejemplo.<br> Utilizando un campo computado significa que no puede ingresar ningún valor de la interfaz. Además, si hay un error de sintaxis, la fórmula no puede devolver nada.<br><br> Ejemplo de fórmula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Ejemplo para volver a cargar el objeto<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br> Otro ejemplo de fórmula para forzar la carga del objeto y su objeto primario:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Proyecto principal no encontrado'
+ExtrafieldParamHelpPassword=Mantener este campo vacío significa que el valor se almacenará sin encriptación (el campo debe estar oculto con estrella en la pantalla). <br>Establezca aquí valor 'automático' para usar la regla de encriptación predeterminada para guardar la contraseña en la base de datos (entonces la lectura de valor será solo hash, no hay forma de recuperar el valor original)
 ExtrafieldParamHelpselect=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser '0')<br><br> por ejemplo: <br>1,valor1<br>2,valor2<br> código3,valor3<br>... <br><br>Para que la lista dependa de otra lista de atributos complementarios: <br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para que la lista dependa de otra lista:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con la clave de formato, valor (donde la clave no puede ser '0')<br><br> por ejemplo: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpradio=La lista de valores debe ser líneas con la clave de formato, valor (donde la clave no puede ser '0')<br><br> por ejemplo: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
@@ -350,7 +352,7 @@ ModuleCompanyCodePanicum=Devolver un código de contabilidad vacío.
 ModuleCompanyCodeDigitaria=El código de contabilidad depende del código de un cliente/proveedor. El código está compuesto por el carácter "C" en la primera posición seguido por los primeros 5 caracteres del código de cliente/proveedor.
 Use3StepsApproval=De forma predeterminada, las órdenes de compra deben ser creadas y aprobadas por dos usuarios diferentes (un paso/usuario para crear y un paso/usuario para aprobar.) Nota: si el usuario tiene permiso para crear y aprobar, un paso/usuario será suficiente). Puede pedir con esta opción introducir una tercera aprobación de paso/usuario, si la cantidad es mayor que un valor dedicado (por lo que serán necesarios 3 pasos: 1= validación, 2= primera aprobación y 3= segunda aprobación si la cantidad es suficiente).<br> Establezca esto en blanco para una aprobación (2 pasos) es suficiente, establezca un valor muy bajo (0.1) si se requiere una segunda aprobación (3 pasos).
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) es mayor que ...
-WarningPHPMail=ADVERTENCIA: Algunos proveedores de correo electrónico (como Yahoo) no permite que usted envíe un correo electrónico desde otro servidor que el servidor de Yahoo si la dirección de correo electrónico utilizada como remitente es su correo electrónico de Yahoo (como: myemail@yahoo.com, myemail@yahoo.fr, ...). Su configuración actual utilice el servidor de la aplicación para enviar correo electrónico, por lo que algunos destinatarios (el compatibles con el protocolo DMARC restrictiva), le preguntará Yahoo si pueden aceptar su correo electrónico y Yahoo responderán "no" porque el servidor no es un servidor propiedad de Yahoo, por lo que algunos de sus correos electrónicos enviados no pueden ser aceptados.<br>Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración de correo electrónico a elegir el otro método "servidor SMTP" y digitar en el servidor SMTP las credenciales proporcionadas por su proveedor de correo electrónico (consulte a su proveedor de correo electrónico para obtener las credenciales SMTP de su cuenta).
+WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raras), esta es la dirección IP de su aplicación ERP CRM:<strong>%s</strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo(s)
 RequiredBy=Este módulo es necesario por el módulo(s)
@@ -477,6 +479,7 @@ Module55000Name=Sondeo, encuesta o votación
 Module55000Desc=Módulo para hacer sondeos en línea, encuestas o votaciones (como Doodle, Pasadores, Rdvz, ...)
 Module59000Desc=Módulo para administración los márgenes
 Module60000Desc=Módulo para gestionar las comisiones
+Module62000Desc=Añadir características para administrar Incoterm
 Module63000Desc=Administrar los recursos (impresoras, automóviles, habitación, ...) se puede compartir en eventos
 Permission11=Leer facturas de clientes
 Permission12=Crear / modificar facturas de clientes
@@ -652,11 +655,11 @@ Permission1237=Exportar órdenes de proveedores y sus detalles
 Permission1251=Ejecutar importaciones masivas de datos externos en la base de datos (carga de datos)
 Permission1321=Exportar facturas, atributos y pagos de clientes
 Permission1421=Exportar pedidos y atributos de clientes
-Permission20001=Lea las solicitudes de licencia / permiso (la suya y sus subordinados)
-Permission20002=Crear / modificar las solicitudes de licencia / permiso
+Permission20001=Lea las solicitudes de permiso (sus hojas y la de sus subordinados)
+Permission20002=Crea/modifica las solicitudes de permiso (las suyas y las de sus subordinados)
 Permission20003=Eliminar solicitudes de licencia / permiso
-Permission20004=Leer todas las solicitudes de licencia / permiso (incluso usuario no subordinados)
-Permission20005=Crear / modificar las solicitudes de licencia / permiso para todos
+Permission20004=Lea todas las solicitudes de permiso (incluso del usuario no subordinado)
+Permission20005=Crear/modificar solicitudes de permiso para todos (incluso para usuarios no subordinados)
 Permission20006=Administrar solicitud de licencia / permiso (configurar y actualizar, balance)
 Permission23001=Leer trabajo programada
 Permission23002=Crear / actualizar trabajo programado
@@ -689,6 +692,7 @@ DictionaryVAT=Tarifas de IVA o impuestos de IVA
 DictionaryRevenueStamp=Cantidad de sellos fiscales
 DictionaryPaymentConditions=Términos de pago
 DictionaryTypeContact=Tipos de contacto / dirección
+DictionaryTypeOfContainer=Tipo de páginas web/contenedores
 DictionaryFormatCards=Formatos de tarjetas
 DictionaryFees=Informe de gastos: tipos de líneas de informe de gastos
 DictionarySendingMethods=Métodos de envío
@@ -706,8 +710,8 @@ TypeOfRevenueStamp=Tipo de sello de ingresos
 VATManagement=Administración del IVA
 VATIsUsedDesc=Por defecto al crear prospectos, facturas, órdenes, etc la tasa de IVA sigue la regla estándar activa: <br>Si el vendedor no está sujeto al IVA, entonces el IVA por defecto es 0. Fin de la regla. <br>Si el (país vendedor = país comprador), entonces el IVA por defecto es igual al IVA del producto en el país vendedor. Fin de la regla. <br>Si el vendedor y el comprador están en la Comunidad Europea y los bienes son productos de transporte (automóvil, barco, avión), el IVA por defecto es 0 (el IVA debe ser pagado por el comprador a la aduana de su país y no al vendedor). Fin de la regla. <br>Si el vendedor y el comprador están en la Comunidad Europea y el comprador no es una empresa, entonces el IVA por defecto es el IVA del producto vendido. Fin de la regla. <br>Si el vendedor y el comprador están en la Comunidad Europea y el comprador es una empresa, entonces el IVA es 0 por defecto. Fin de la regla.<br>En cualquier otro caso, el impuesto por defecto es IVA = 0. Fin de la regla.
 VATIsNotUsedDesc=Por defecto, el IVA propuesto es 0, que puede utilizarse para casos como asociaciones, particulares o pequeñas empresas.
-VATIsUsedExampleFR=En Francia, significa empresas u organizaciones que tienen un sistema fiscal real (Real real simplificado o real normal). Un sistema en el que se declara el IVA.
-VATIsNotUsedExampleFR=En Francia, significa asociaciones no declaradas por IVA o empresas, organizaciones o profesiones liberales que han optado por el sistema fiscal de la microempresa (IVA en franquicia) y pagan una franquicia IVA sin declaración de IVA. Esta opción mostrará la referencia "IVA no aplicable - art-293B de CGI" en las facturas.
+VATIsUsedExampleFR=En Francia, significa empresas u organizaciones que tienen un sistema fiscal real (simplificado real o real). Un sistema en el que se declara el IVA.
+VATIsNotUsedExampleFR=En Francia, significa las asociaciones que no están declaradas con IVA o las empresas, organizaciones o profesiones liberales que han elegido el sistema fiscal de microempresas (IVA en franquicia) y pagaron una franquicia con IVA sin ninguna declaración de IVA. Esta elección mostrará la referencia "IVA no aplicable - art-293B de CGI" en las facturas.
 LTRate=Tarifa
 LocalTax1IsNotUsed=No utilice el segundo impuesto
 LocalTax1IsUsedDesc=Utilizar un segundo tipo de impuesto (distinto del IVA)
@@ -749,7 +753,6 @@ NbOfRecord=Nb de registros
 DriverType=Tipo de controlador
 SummarySystem=Resumen de información del sistema
 SummaryConst=Lista de todos los parámetros de configuración de Dolibarr
-MenuCompanySetup=Empresa / Organización
 DefaultMenuManager=Administrador de menús estándar
 DefaultMenuSmartphoneManager=Administrador de menús de smartphone
 Skin=Tema
@@ -762,8 +765,7 @@ LoginPage=Página de inicio de sesión
 PermanentLeftSearchForm=Formulario de búsqueda permanente en el menú de la izquierda
 DefaultLanguage=Idioma predeterminado a utilizar (código de idioma)
 EnableMultilangInterface=Habilitar interfaz multilingüe
-CompanyInfo=Empresa / Información de la organización
-CompanyIds=Empresa / Identidades de la empresa
+CompanyIds=Identidades de empresa/organización
 CompanyName=Nombre
 CompanyZip=Código Postal
 CompanyTown=Ciudad
@@ -1126,6 +1128,9 @@ SyslogFilename=Nombre de archivo y ruta de acceso
 YouCanUseDOL_DATA_ROOT=Puede utilizar DOL_DATA_ROOT/dolibarr.log para un archivo de registro en el directorio "documents" de Dolibarr. Puede establecer una ruta de acceso diferente para almacenar este archivo.
 ErrorUnknownSyslogConstant=Constante %s no es una constante Syslog conocida
 OnlyWindowsLOG_USER=Windows sólo admite LOG_USER
+CompressSyslogs=Syslog compresión y copia de seguridad de archivos
+SyslogFileNumberOfSaves=Copias de seguridad de registro
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar la programación de limpieza para establecer la frecuencia de copia de seguridad
 DonationsSetup=Configuración del módulo de donación
 DonationsReceiptModel=Plantilla de recibo de donación
 BarcodeSetup=Configuración del código de barras
@@ -1200,10 +1205,10 @@ ConfirmDeleteMenu=¿Está seguro de que desea eliminar la entrada de menú <b>%s
 FailedToInitializeMenu=Error al inicializar el menú
 TaxSetup=Impuestos, impuestos sociales y fiscales y configuración de módulos de dividendos
 OptionVatMode=IVA debido
-OptionVATDefault=Base de efectivo
 OptionVATDebitOption=Base de devengo
 OptionVatDefaultDesc=El IVA se debe:<br>- en la entrega de mercancías (que utilizamos la fecha de factura)<br>- en los pagos por servicios
 OptionVatDebitOptionDesc=El IVA se debe:<br>- en la entrega de las mercancías (utilizamos la fecha de factura)<br>- en la factura (débito) de los servicios
+OptionPaymentForProductAndServicesDesc=El IVA es pagadero: <br> - en el pago de los bienes <br> - en los pagos por servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad del IVA por defecto según la opción elegida:
 OnDelivery=En entrega
 OnPayment=En pago
@@ -1213,7 +1218,7 @@ SupposedToBeInvoiceDate=Fecha de factura utilizada
 Buy=Comprar
 Sell=Vender
 InvoiceDateUsed=Fecha de factura utilizada
-YourCompanyDoesNotUseVAT=Su empresa se ha definido para no utilizar el IVA (Inicio - Configuración - Empresa/Organización), por lo que no hay opciones de IVA para la configuración.
+YourCompanyDoesNotUseVAT=Su empresa ha sido definida para no usar el IVA (Inicio - Configuración - Compañía/Organización), por lo que no hay opciones de IVA para configurar.
 AccountancyCode=Código de contabilidad
 AccountancyCodeSell=Cuenta de venta. código
 AccountancyCodeBuy=Cuenta de compra. código
@@ -1390,7 +1395,10 @@ UserHasNoPermissions=Este usuario no tiene permiso definido
 TypeCdr=Utilice "Ninguno" si la fecha de pago es la fecha de factura más (+) un delta en días (delta es el campo "Nb de días")<br>Utilice "Al final del mes", si, después del delta, La fecha debe ser aumentada para llegar al final del mes (+ un "Offset" opcional en días) )<br>Use " Actual / Siguiente" para que la fecha del plazo de pago sea el primer Nth del mes (N se almacena en el campo "Nb de días")
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo registros no reversibles se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Intenta instalar el módulo %s que es un módulo externo. La activación de un módulo externo significa que confía en el editor del módulo y está seguro de que este módulo no altera negativamente el comportamiento de su aplicación y es compatible con las leyes de su país (%s). Si el módulo trae una característica no legal, usted se hace responsable del uso de un software no legal.
+SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en "sí" si este grupo es un cálculo de otros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Ingrese regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Algunas variantes de lenguaje encontradas
 ResourceSetup=Configuración del módulo Recurso
-DisabledResourceLinkUser=Enlace de recurso inhabilitado al usuario
-DisabledResourceLinkContact=Enlace de recurso inhabilitado para contactar
+DisabledResourceLinkUser=Deshabilitar característica para vincular un recurso a los usuarios
+DisabledResourceLinkContact=Deshabilitar característica para vincular un recurso a contactos
 ConfirmUnactivation=Confirmar restablecimiento del módulo
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 3f299b9d4a5..1238cf7b830 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -30,7 +30,7 @@ ErrorFailedToOpenFile=No se pudo abrir el archivo %s
 ErrorCanNotCreateDir=No se puede crear el directorio %s
 ErrorCanNotReadDir=No se puede leer el dir %s
 ErrorLogoFileNotFound=No se ha encontrado el archivo de logotipo '%s'
-ErrorGoToGlobalSetup=Ir a la configuración de "Empresa/Organización para solucionar este problema
+ErrorGoToGlobalSetup=Ir a la configuración de 'Empresa/Organización' para arreglar esto
 ErrorGoToModuleSetup=Ir al módulo de configuración para solucionar este problema
 ErrorFailedToSendMail=No se pudo enviar el correo (emisor= %s, receptor= %s)
 ErrorFileNotUploaded=El archivo no se ha subido. Compruebe que el tamaño no exceda el máximo permitido, el espacio libre disponible en el disco y que no hay ya un archivo con el mismo nombre en este directorio.
@@ -49,10 +49,10 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no hay tipos de IVA definidos para
 ErrorNoSocialContributionForSellerCountry=Error, no hay ningun tipo de impuesto fiscal definido para el país '%s'.
 ErrorFailedToSaveFile=Error, Error al guardar el archivo.
 ErrorCannotAddThisParentWarehouse=Está intentando agregar un almacén padre que ya es un hijo de uno actual
-MaxNbOfRecordPerPage=Maximo número de registro por página
 NotAuthorized=No está autorizado para hacer eso.
 SetDate=Establecer fecha
 SeeHere=Mire aquí
+ClickHere=haga clic aquí
 BackgroundColorByDefault=Color de fondo por defecto
 FileRenamed=El archivo se cambió de nombre correctamente.
 FileGenerated=El archivo se generó correctamente
@@ -121,6 +121,7 @@ Valid=Válido
 ToLink=Enlazar
 Choose=Escoger
 Resize=Cambiar el tamaño
+ResizeOrCrop=Cambiar el tamaño o el cultivo
 NoUserGroupDefined=No se ha definido ningún grupo de usuarios
 PasswordRetype=Reescribe tu contraseña
 NoteSomeFeaturesAreDisabled=Tenga en cuenta que una gran cantidad de funciones/módulos están deshabilitados en esta demostración.
@@ -167,6 +168,7 @@ Default=Predeterminados
 DefaultValue=Valor predeterminado
 DefaultValues=Valores predeterminados
 UnitPriceHT=Precio unitario (neto)
+UnitPriceHTCurrency=Precio unitario (neto) (moneda)
 UnitPriceTTC=Precio unitario
 PriceU=Precio
 PriceUHT=Precio
@@ -174,6 +176,7 @@ PriceUHTCurrency=Precio (moneda)
 PriceUTTC=Precio (inc. IVA)
 Amount=Cantidad
 AmountInvoice=Valor de la factura
+AmountInvoiced=Monto facturado
 AmountPayment=Monto del pago
 AmountHTShort=Valor (neto)
 AmountTTCShort=Valor (inc. IVA)
@@ -193,6 +196,7 @@ AmountLT2ES=Valor IRPF
 AmountTotal=Valor total
 AmountAverage=Valor promedio
 PriceQtyMinHT=Precio cantidad min. (neto IVA)
+PriceQtyMinHTCurrency=Precio de cantidad minima. (neto de impuestos) (moneda)
 TotalHTShort=Total (neto)
 TotalHTShortCurrency=Total (neto en moneda)
 TotalTTCShort=Total (inc. IVA)
@@ -214,6 +218,8 @@ LT1Type=Impuesto sobre las ventas 2 tipo
 LT2=Impuesto sobre ventas 3
 LT2Type=Impuesto sobre las ventas tipo 3
 VATRate=Tasa de impuesto
+VATCode=Código de tasa impositiva
+VATNPR=Tasa de impuesto NPR
 DefaultTaxRate=Tasa de impuesto predeterminada
 Average=Promedio
 Module=Módulo/Aplicación
@@ -232,13 +238,15 @@ ActionsDoneShort=Hecho
 ActionNotApplicable=No aplica
 ActionRunningNotStarted=Para comenzar
 LatestLinkedEvents=Últimos eventos vinculados %s
-CompanyFoundation=Empresa/Organización
+Accountant=Contador
 ContactsForCompany=Contactos de clientes
 ContactsAddressesForCompany=Contactos/direcciones de clientes
 AddressesForCompany=Direcciones de clientes
 ActionsOnCompany=Eventos sobre clientes
 ActionsOnMember=Eventos sobre miembros
 NActionsLate=%s tarde
+ToDo=Que hacer
+Completed=Terminado
 RequestAlreadyDone=La solicitud ya se registró
 Filter=Filtrar
 FilterOnInto=Criterios de búsqueda '<strong> %s </strong>' en los campos %s
@@ -272,6 +280,8 @@ Photos=Imágenes
 DeletePicture=Borrar imagen
 ConfirmDeletePicture=Confirmar eliminación de la imagen?
 Login=Iniciar sesión
+LoginEmail=Ingreso (Correo Electronico)
+LoginOrEmail=Iniciar sesión o correo electrónico
 CurrentLogin=Inicio de sesión actual
 January=Enero
 February=Febrero
@@ -389,6 +399,7 @@ PrintContentArea=Mostrar la página para imprimir el área de contenido principa
 MenuManager=Administrador de menús
 WarningYouAreInMaintenanceMode=Advertencia, está en un modo de mantenimiento, por lo que sólo se permite el acceso <b>%s</b> a la aplicación en este momento.
 CoreErrorMessage=Disculpe, ocurrió un error. Póngase en contacto con el administrador del sistema para comprobar los registros o desactivar $dolibarr_main_prod=1 para obtener más información.
+ValidatePayment=Validar pago
 FieldsWithAreMandatory=Los campos con <b>%s</b> son obligatorios
 FieldsWithIsForPublic=Los campos con <b>%s</b> se muestran en la lista pública de miembros. Si no lo desea, marque la casilla "público".
 AccordingToGeoIPDatabase=(Según la conversión GeoIP)
@@ -397,6 +408,7 @@ ToTest=Prueba
 ValidateBefore=La tarjeta debe ser validado antes de usar esta función
 Hidden=Oculto
 Source=Fuente
+NewAttribute=Nuevo atributo
 AttributeCode=Código de atributo
 URLPhoto=URL de la foto/logotipo
 SetLinkToAnotherThirdParty=Enlace a otro cliente
@@ -449,7 +461,7 @@ ShowTempMassFilesArea=Mostrar área de archivos creados por acciones masivas
 ConfirmMassDeletion=Confirmación de eliminación masiva
 ConfirmMassDeletionQuestion=¿Seguro que quieres eliminar el %s registro seleccionado?
 ClassifyBilled=Clasificar facturas
-ClickHere=haga clic aquí
+ClassifyUnbilled=Clasificar sin facturar
 ExportFilteredList=Exportar lista filtrada
 ExportList=Exportar lista
 Miscellaneous=Varios
@@ -482,10 +494,10 @@ Select2ResultFoundUseArrows=Se han encontrado algunos resultados. Utilice las fl
 Select2NotFound=No se han encontrado resultados
 Select2Enter=Ingresar
 Select2MoreCharacter=o más carácter
-Select2MoreCharactersMore=<strong>Sintaxis de búsqueda:</strong><br><kbd><strong> |</strong></kbd><kbd>O</kbd>(a|b)<br><kbd><strong>*</strong></kbd><kbd>Cualquier carácter</kbd>(a*b)<br /><kbd><strong>^</strong></kbd><kbd>Empezar con</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd>Terminar con</kbd>(ab$)<br />
+Select2MoreCharactersMore=<strong>Sintaxis de búsqueda:</strong><br><kbd><strong> | </strong></kbd><kbd>O </kbd> (a|b)<br><kbd><strong> * </strong></kbd><kbd>Cualquier carácter</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd>Comience con</kbd> (^ab)<br><kbd><strong> $ </strong></kbd><kbd>Finalice con</kbd> (ab$)<br>
 Select2LoadingMoreResults=Cargando más resultados ...
 Select2SearchInProgress=Búsqueda en proceso...
-SearchIntoThirdparties=Clientes
+SearchIntoThirdparties=Clientes/Proveedores
 SearchIntoCustomerInvoices=Facturas de clientes
 SearchIntoCustomerProposals=Propuestas de clientes
 SearchIntoSupplierProposals=Propuestas de proveedor
@@ -494,3 +506,4 @@ SearchIntoExpenseReports=Reporte de gastos
 SearchIntoLeaves=Hojas
 CommentPage=Espacio para comentarios
 Everybody=Todos
+AssignedTo=Asignado a
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 59c20932702..38f3ce8399c 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicio
 Doctype=Tipo de documento
 Docdate=Fecha
 Docref=Referencia
-Code_tiers=Tercero
 LabelAccount=Descripción
 LabelOperation=Etiqueta operación
 Sens=Sentido
@@ -169,7 +168,6 @@ DelYear=Año a eliminar
 DelJournal=Diario a eliminar
 ConfirmDeleteMvt=Esto eliminará todas las lineas del Libro Mayor del año y/o de un diario específico. Se requiere al menos un criterio.
 ConfirmDeleteMvtPartial=Esto eliminará la transacción del libro mayor (se eliminarán todas las líneas relacionadas con la misma transacción)
-DelBookKeeping=Eliminar los registros del Libro Mayor
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
 DescFinanceJournal=El diario financiero incluye todos los tipos de pagos por cuenta bancaria
@@ -220,7 +218,7 @@ ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que est
 MvtNotCorrectlyBalanced=Asiento contabilizado incorrectamente. Debe=%s. Haber=%s
 FicheVentilation=Ficha contable
 GeneralLedgerIsWritten=Transacciones escritas en el Libro Mayor
-GeneralLedgerSomeRecordWasNotRecorded=Algunas de las operaciones que no podrán registrarse. Si no hay un mensaje de error, es probable que ya estén contabilizadas
+GeneralLedgerSomeRecordWasNotRecorded=Algunas de las operaciones no pueden contabilizarse. Si no hay otro mensaje de error, es probable que ya estén contabilizadas.
 NoNewRecordSaved=No hay más registros para el diario
 ListOfProductsWithoutAccountingAccount=Listado de productos sin cuentas contables
 ChangeBinding=Cambiar la unión
@@ -236,13 +234,15 @@ AccountingJournal=Diario contable
 NewAccountingJournal=Nuevo diario contable
 ShowAccoutingJournal=Mostrar diario contable
 Nature=Naturaleza
-AccountingJournalType1=Operaciones varias
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Ventas
 AccountingJournalType3=Compras
 AccountingJournalType4=Banco
 AccountingJournalType5=Informes de gastos
+AccountingJournalType8=Inventario
 AccountingJournalType9=Haber
 ErrorAccountingJournalIsAlreadyUse=Este diario ya esta siendo usado
+AccountingAccountForSalesTaxAreDefinedInto=Nota: La cuenta contable del IVA a las ventas se define en el menú <b> %s</b> - <b> %s</b>
 
 ## Export
 ExportDraftJournal=Exportar libro borrador
@@ -284,6 +284,8 @@ Formula=Fórmula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos necesarios de la configuración no están realizados, por favor complételos.
 ErrorNoAccountingCategoryForThisCountry=No hay grupos contables disponibles para %s (Vea Inicio - Configuración - Diccionarios)
+ErrorInvoiceContainsLinesNotYetBounded=Intenta hacer un diario de algunas líneas de la factura <strong>%s</strong>, pero algunas otras líneas aún no están vinculadas a cuentas contables. Se rechaza la contabilización de todas las líneas de factura de esta factura.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Algunas líneas de la factura no están vinculadas a cuentas contables.
 ExportNotSupported=El formato de exportación configurado no es soportado en esta página
 BookeppingLineAlreayExists=Lineas ya existentes en la contabilidad
 NoJournalDefined=Sin diario definido
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 142337a0206..9d7b393b547 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Cambiar el precio cuya referencia de base es
 MassConvert=Convertir masivamente
 String=Cadena de texto
 TextLong=Texto largo
+HtmlText=Texto html
 Int=Numérico entero
 Float=Decimal
 DateAndTime=Fecha y hora
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Casilla de selección de tabla
 ExtrafieldLink=Objeto adjuntado
 ComputedFormula=Campo combinado
 ComputedFormulaDesc=Puede introducir aquí una fórmula utilizando otras propiedades de objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede utilizar cualquier fórmula compatible con PHP, incluido el operador de condición "?" y los objetos globales siguientes: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENCIÓN</strong>: Sólo algunas propiedades de $object pueden estar disponibles. Si necesita propiedades no cargadas, solo busque el objeto en su fórmula como en el segundo ejemplo. <br>Usando un campo computado significa que no puede ingresar ningún valor de la interfaz. Además, si hay un error de sintaxis, la fórmula puede devolver nada. <br><br>Ejemplo de fórmula: <br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Ejemlo de recarga de objeto<br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal:  <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Mantener este campo vacío significa que el valor se almacenará sin cifrado (el campo permanecerá solo oculto con estrellas en la pantalla). <br>Establezca aquí el valor 'auto' para usar la regla de cifrado predeterminada para guardar la contraseña en la base de datos (entonces el valor leído será solo el hash, no hay forma de recuperar el valor original)
 ExtrafieldParamHelpselect=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para tener una lista en funcion de campos adicionales de lista:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para tener la lista en función de otra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=El listado de parámetros tiene que ser key,valor (donde key no puede ser 0)<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=Lista de parámetros proviene de una tabla <br> Sinta
 ExtrafieldParamHelpchkbxlst=Lista de parámetros proviene de una tabla <br> Sintaxis: nombre_tabla: etiqueta_field: id_field :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ ID $ en el filtro witch es el id actual del objeto actual <br> Para hacer un SELECT en el filtro de uso $ SEL $ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath<br>Sintaxis: ObjectName:Classpath<br>Ejemplo: <br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Libreria usada en la generación de los PDF
-WarningUsingFPDF=Atención: Su archivo <b>conf.php</b> contiene la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Esto hace que se use la librería FPDF para generar sus archivos PDF. Esta librería es antigua y no cubre algunas funcionalidades (Unicode, transparencia de imágenes, idiomas cirílicos, árabes o asiáticos, etc.), por lo que puede tener problemas en la generación de los PDF.<br>Para resolverlo, y disponer de un soporte completo de PDF, puede descargar la <a href="http://www.tcpdf.org/" target="_blank">librería TCPDF</a> , y a continuación comentar o eliminar la línea <b>$dolibarr_pdf_force_fpdf=1</b>, y añadir en su lugar <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
 LocalTaxDesc=Algunos países aplican 2 o 3 tasas a cada línea de factura. Si es el caso, escoja el tipo de la segunda y tercera tasa y su valor. Los posibles tipos son:<br>1 : tasa local aplicable a productos y servicios sin IVA (tasa local es calculada sobre la base imponible)<br>2 : tasa local se aplica a productos y servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)<br>3 : tasa local se aplica a productos sin IVA (tasa local es calculada sobre la base imponible)<br>4 : tasa local se aplica a productos incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)<br>5 : tasa local se aplica a servicios sin IVA (tasa local es calculada sobre base imponible)<br>6 : tasa local se aplica a servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)
 SMS=SMS
 LinkToTestClickToDial=Introduzca un número de teléfono al que llamar para probar el enlace de llamada ClickToDial para el usuario <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Devuelve un código contable vacío.
 ModuleCompanyCodeDigitaria=El código contable depende del 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.
 Use3StepsApproval=De forma predeterminada, los pedidos a proveedor deben ser creados y aprobados por 2 usuarios diferentes (un paso/usuario para crear y un paso/usuario para aprobar. Tenga en cuenta que si el usuario tiene tanto el permiso para crear y aprobar, un paso usuario será suficiente) . Puede pedir con esta opción introducir una tercera etapa de aprobación/usuario, si la cantidad es superior a un valor específico (por lo que serán necesarios 3 pasos: 1 validación, 2=primera aprobación y 3=segunda aprobación si la cantidad es suficiente).<br>Deje vacío si una aprobación (2 pasos) es suficiente, si se establece en un valor muy bajo (0,1) se requiere siempre una segunda aprobación (3 pasos).
 UseDoubleApproval=Usar 3 pasos de aprobación si el importe (sin IVA) es mayor que...
-WarningPHPMail=ADVERTENCIA: Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un e-mail desde otro servidor que no sea el servidor de Yahoo si la dirección de correo electrónico utilizada como remitente es su correo e-mail de Yahoo (como myemail@yahoo.com, myemail@yahoo.fr, ...). Su configuración actual utiliza el servidor de la aplicación para enviar e-mail, por lo que algunos destinatarios (compatibles con el protocolo restrictivo DMARC) le preguntarán a Yahoo si pueden aceptar su e-mail y Yahoo responderá "no" porque el servidor no es un servidor Propiedad de Yahoo, por lo que algunos de sus e-mails enviados pueden no ser aceptados. Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración de e-mail para elegir el método "servidor SMTP" y introdudir el servidor SMTP y credenciales proporcionadas por su proveedor de correo electrónico (pregunte a su proveedor de correo electrónico las credenciales SMTP para su cuenta).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP de su aplicación ERP CRM: <strong>%s</strong>.
 ClickToShowDescription=Clic para ver la descripción
 DependsOn=Este módulo necesita los módulos
 RequiredBy=Este módulo es requerido por los módulos
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Marca de agua en los informes de gastos
 AttachMainDocByDefault=Establezca esto en 1 si desea adjuntar el documento principal al e-mail de forma predeterminada (si corresponde)
 FilesAttachedToEmail=Adjuntar archivo
 SendEmailsReminders=Enviar recordatorios de la agenda por correo electrónico
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Usuarios y grupos
 Module0Desc=Gestión de Usuarios / Empleados y grupos
@@ -619,6 +622,8 @@ Module59000Name=Márgenes
 Module59000Desc=Módulo para gestionar los márgenes de beneficio
 Module60000Name=Comisiones
 Module60000Desc=Módulo para gestionar las comisiones de venta
+Module62000Name=Incoterm
+Module62000Desc=Añade funciones para gestionar Incoterm
 Module63000Name=Recursos
 Module63000Desc=Gestionar recursos (impresoras, automóviles, salas, ...) puede compartirlos en  los eventos
 Permission11=Consultar facturas
@@ -834,10 +839,10 @@ Permission1321=Exportar facturas a clientes, campos adicionales y cobros
 Permission1322=Reabrir una factura pagada
 Permission1421=Exportar pedidos de clientes y campos adicionales
 Permission20001=Leer peticiones días retribuidos (suyos y subordinados)
-Permission20002=Cear/modificar sus días retribuidos
+Permission20002=Crear/modificar peticiones días retribuidos (suyos y subordinados)
 Permission20003=Eliminar peticiones de días retribuidos
 Permission20004=Leer todas las peticiones de días retribuidos (incluso no subordinados)
-Permission20005=Crear/modificar días retribuidos para todos
+Permission20005=Crear/modificar las peticiones de días retribuidos (incluso no subordinados)
 Permission20006=Administrar días retribuidos (configuración y actualización de balance)
 Permission23001=Consultar Trabajo programado
 Permission23002=Crear/actualizar Trabajo programado
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Importes de sellos fiscales
 DictionaryPaymentConditions=Condiciones de pago
 DictionaryPaymentModes=Modos de pago
 DictionaryTypeContact=Tipos de contactos/direcciones
+DictionaryTypeOfContainer=Tipo de página/contenedor
 DictionaryEcotaxe=Baremos CEcoParticipación (DEEE)
 DictionaryPaperFormat=Formatos de papel
 DictionaryFormatCards=Formatos de fichas
@@ -977,7 +983,7 @@ Host=Servidor
 DriverType=Tipo de driver
 SummarySystem=Resumen de la información de sistemas Dolibarr
 SummaryConst=Lista de todos los parámetros de configuración Dolibarr
-MenuCompanySetup=Empresa/Institución
+MenuCompanySetup=Empresa/Organización
 DefaultMenuManager= Gestor del menú estándar
 DefaultMenuSmartphoneManager=Gestor de menú smartphone
 Skin=Tema visual
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Zona de búsqueda permanente del menú izquierdo
 DefaultLanguage=Idioma por defecto a utilizar (código idioma)
 EnableMultilangInterface=Activar interfaz multi-idioma
 EnableShowLogo=Mostrar el logotipo en el menú de la izquierda
-CompanyInfo=Información de la empresa/institución
-CompanyIds=Identificación reglamentaria
+CompanyInfo=Información de la empresa/organización
+CompanyIds=Identificación de la empresa/organización
 CompanyName=Nombre/Razón social
 CompanyAddress=Dirección
 CompanyZip=Código postal
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Los parámetros de configuración solamente pueden ser tratados
 SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
 SystemAreaForAdminOnly=Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta área.
 CompanyFundationDesc=Edite en esta página toda la información conocida de la empresa o institución que necesita gestionar (Para ello haga click en el botón "Modificar" o "Grabar" a pie de página)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Puede encontrar aquí todos los parámetros relacionados con la apariencia de Dolibarr
 AvailableModules=Módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos).
@@ -1441,6 +1448,9 @@ SyslogFilename=Nombre y ruta del archivo
 YouCanUseDOL_DATA_ROOT=Puede utilizar DOL_DATA_ROOT/dolibarr.log para un registro en el directorio "documentos" de Dolibarr. Sin embargo, puede establecer un directorio diferente para guardar este archivo.
 ErrorUnknownSyslogConstant=La constante %s no es una constante syslog conocida
 OnlyWindowsLOG_USER=Windows sólo soporta LOG_USER
+CompressSyslogs=Compresión Syslog y copia de seguridad de archivos
+SyslogFileNumberOfSaves=Copias de seguridad de log
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar tareas programados de limpieza para establecer la frecuencia de copia de seguridad del log
 ##### Donations #####
 DonationsSetup=Configuración del módulo donaciones
 DonationsReceiptModel=Modelo recepción de donaciones
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Error al inicialiar el menú
 ##### Tax #####
 TaxSetup=Configuración del módulo impuestos sociales o fiscales
 OptionVatMode=Opción de carga de IVA
-OptionVATDefault=Criterio de caja
+OptionVATDefault=Base estándar
 OptionVATDebitOption=Criterio de devengo
 OptionVatDefaultDesc=La carga del IVA es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del IVA es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
+OptionPaymentForProductAndServices=Base de efectivo para productos y servicios
+OptionPaymentForProductAndServicesDesc=La carga del IVA es: <br>-en el pago de los bienes <br>-sobre el pago por los servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de IVA por defecto según la opción eligida
 OnDelivery=En la entrega
 OnPayment=En el pago
@@ -1718,6 +1730,7 @@ MailToSendContract=Para enviar un contrato
 MailToThirdparty=Para enviar e-mail desde la página del tercero
 MailToMember=Para enviar un e-mail desde la página de miembro
 MailToUser=Para enviar un e-mail desde la página de usuario
+MailToProject= To send email from project page
 ByDefaultInList=Mostrar por defecto en modo lista
 YouUseLastStableVersion=Usa la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta release mayor (no dude en usarlo en sus sitios web)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Margen izquierdo en PDF
 MAIN_PDF_MARGIN_RIGHT=Margen derecho en PDF
 MAIN_PDF_MARGIN_TOP=Margen superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Margen inferior en PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto a sí si este grupo es un cálculo de otros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Ingrese regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
+SeveralLangugeVariatFound=Varias variantes de idioma encontradas
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuración del módulo Recursos
 UseSearchToSelectResource=Utilice un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
-DisabledResourceLinkUser=Desactivar enlace recursos a usuario
-DisabledResourceLinkContact=Desactivar enlace recurso a contacto
+DisabledResourceLinkUser=Desactivar funcionalidad de enlazar recursos a usuarios
+DisabledResourceLinkContact=Desactivar funcionalidad de enlazar recurso a contactos
 ConfirmUnactivation=Confirme el restablecimiento del módulo
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 8a210bb5181..72cb945c46a 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Miembro %s validado
 MemberModifiedInDolibarr=Miembro %s modificado
 MemberResiliatedInDolibarr=Miembro %s terminado
 MemberDeletedInDolibarr=Miembro %s eliminado
-MemberSubscriptionAddedInDolibarr=Subscripción del miembro %s añadida
+MemberSubscriptionAddedInDolibarr=Subscripción %s del miembro %s añadida
+MemberSubscriptionModifiedInDolibarr=Suscripción %s del miembro %s modificada
+MemberSubscriptionDeletedInDolibarr=Suscripción %s del miembro %s eliminada
 ShipmentValidatedInDolibarr=Expedición %s validada
 ShipmentClassifyClosedInDolibarr=Expedición %s clasificada como pagada
 ShipmentUnClassifyCloseddInDolibarr=Expedición %s clasificada como reabierta
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Puede también añadir estos parámetros al filtro de salida:
 AgendaUrlOptions3=<b>logina=%s</b> para restringir inserciones a acciones creadas por el usuario <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b> logina =!%s</b> para restringir la salida a acciones que no pertenecen al usuario <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b>para restringir notificaciones en acciones asignadas al usuario <b>%s</b>(propietario y otros).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir inserciones a acciones asociadas al proyecto <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para restringir exportación de acciones asociadas al proyecto <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> para excluir el evento automático.
 AgendaShowBirthdayEvents=Mostrar cumpleaños de los contactos
 AgendaHideBirthdayEvents=Ocultar cumpleaños de los contactos
 Busy=Ocupado
@@ -109,7 +112,7 @@ ExportCal=Exportar calendario
 ExtSites=Calendarios externos
 ExtSitesEnableThisTool=Mostrar calendarios externos (definido en la configuración global) en la agenda. No afecta a los calendarios externos definidos por los usuarios
 ExtSitesNbOfAgenda=Número de calendarios
-AgendaExtNb=Calendario nº %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=Url de acceso al archivo .ical
 ExtSiteNoLabel=Sin descripción
 VisibleTimeRange=Rango de tiempo visible
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 85bc94d9040..1f0edb8aa98 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -7,6 +7,7 @@ BankName=Nombre del banco
 FinancialAccount=Cuenta
 BankAccount=Cuenta bancaria
 BankAccounts=Cuentas Bancarias
+BankAccountsAndGateways=Cuentas bancarias | Gateways
 ShowAccount=Mostrar cuenta
 AccountRef=Ref. cuenta financiera
 AccountLabel=Etiqueta cuenta financiera
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 6946e96c971..3db190fe425 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Reembolsado
 DeletePayment=Eliminar el pago
 ConfirmDeletePayment=¿Está seguro de querer eliminar este pago?
 ConfirmConvertToReduc=¿Desea convertir este %s en un descuento absoluto?<br>El importe se guardará entre todos los descuentos y podría utilizarse como descuento para una factura actual o futura para este cliente.
+ConfirmConvertToReducSupplier=¿Desea convertir este %s en un descuento absoluto?<br>El importe se guardará entre todos los descuentos y podría utilizarse como descuento para una factura actual o futura para este cliente.
 SupplierPayments=Pagos a proveedores
 ReceivedPayments=Pagos recibidos
 ReceivedCustomersPayments=Pagos recibidos de cliente
@@ -91,7 +92,7 @@ PaymentAmount=Importe pago
 ValidatePayment=Validar este pago
 PaymentHigherThanReminderToPay=Pago superior al resto a pagar
 HelpPaymentHigherThanReminderToPay=Atención, el importe del pago de una o más facturas es superior al resto a pagar.<br> Corrija su entrada, de lo contrario, confirme y piense en crear un abono de lo percibido en exceso para cada factura sobre-pagada.
-HelpPaymentHigherThanReminderToPaySupplier=Atención, el importe del pago de una o más facturas es más alto que el resto a pagar.<br> Edite su entrada, de lo contrario confirme.
+HelpPaymentHigherThanReminderToPaySupplier=Atención, el importe del pago de una o más facturas es superior al resto a pagar.<br> Corrija su entrada, de lo contrario, confirme y piense en crear un abono de lo percibido en exceso para cada factura sobre-pagada.
 ClassifyPaid=Clasificar 'Pagado'
 ClassifyPaidPartially=Clasificar 'Pagado parcialmente'
 ClassifyCanceled=Clasificar 'Abandonado'
@@ -110,6 +111,7 @@ DoPayment=Ingresar pago
 DoPaymentBack=Ingresar reembolso
 ConvertToReduc=Convertir en reducción futura
 ConvertExcessReceivedToReduc=Convertir lo recibido en exceso en descuento futuro
+ConvertExcessPaidToReduc=Convertir lo recibido en exceso en descuento futuro
 EnterPaymentReceivedFromCustomer=Añadir pago recibido de cliente
 EnterPaymentDueToCustomer=Realizar pago de abonos al cliente
 DisabledBecauseRemainderToPayIsZero=Desactivado ya que el resto a pagar es 0
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Estado de las facturas generadas
 BillStatusDraft=Borrador (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Reembolsada o convertida en descuento
-BillStatusConverted=Pagada (lista para factura final)
+BillStatusConverted=Pagada (lista para usarse en factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
 BillStatusStarted=Pagada parcialmente
@@ -220,6 +222,7 @@ RemainderToPayBack=Resta por reembolsar
 Rest=Pendiente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
+ExcessPaid=Pagado en exceso
 EscompteOffered=Descuento (Pronto pago)
 EscompteOfferedShort=Descuento
 SendBillRef=Envío de la factura %s
@@ -283,16 +286,20 @@ Deposit=Anticipo
 Deposits=Anticipos
 DiscountFromCreditNote=Descuento resultante del abono %s
 DiscountFromDeposit=Pagos de la factura de anticipo %s
-DiscountFromExcessReceived=Pagos recibido en exceso de la factura %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Este tipo de descuento no puede ser utilizado en una factura antes de su validación
 CreditNoteDepositUse=La factura debe ser validada para usar este tipo de crédito.
 NewGlobalDiscount=Nuevo descuento fijo
 NewRelativeDiscount=Nuevo descuento
+DiscountType=Tipo de descuento
 NoteReason=Nota/Motivo
 ReasonDiscount=Motivo
 DiscountOfferedBy=Acordado por
 DiscountStillRemaining=Descuentos disponibles
 DiscountAlreadyCounted=Descuentos ya consumidos
+CustomerDiscounts=Descuentos a clientes
+SupplierDiscounts=Descuentos de proveedores
 BillAddress=Dirección de facturación
 HelpEscompte=Un <b>descuento</b> es un descuento acordado sobre una factura dada, a un cliente que realizó su pago mucho antes del vencimiento.
 HelpAbandonBadCustomer=Este importe se abandonó (cliente juzgado como moroso) y se considera como una pérdida excepcional.
@@ -341,10 +348,10 @@ NextDateToExecution=Fecha para la generación de la próxima factura
 NextDateToExecutionShort=Fecha próxima generación
 DateLastGeneration=Fecha de la última generación
 DateLastGenerationShort=Fecha última generación
-MaxPeriodNumber=Nº máximo de facturas a generar
-NbOfGenerationDone=Nº de facturas ya generadas
-NbOfGenerationDoneShort=Generados
-MaxGenerationReached=Máximo número de generaciones alcanzado
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validar facturas automáticamente
 GeneratedFromRecurringInvoice=Generado desde la plantilla de facturas recurrentes %s
 DateIsNotEnough=Aún no se ha alcanzado la fecha
@@ -521,3 +528,7 @@ BillCreated=%s factura(s) creadas
 StatusOfGeneratedDocuments=Estado de la generación de documentos
 DoNotGenerateDoc=No generar archivo de documento
 AutogenerateDoc=Generar automáticamente archivo de documento
+AutoFillDateFrom=Definir fecha de inicio para la línea de servicio con fecha de factura
+AutoFillDateFromShort=Definir fecha de inicio
+AutoFillDateTo=Establecer fecha de finalización para la línea de servicio con la próxima fecha de facturación
+AutoFillDateToShort=Definir fecha de finalización
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 65867f3831f..381bc370547 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -43,6 +43,7 @@ Individual=Particular
 ToCreateContactWithSameName=Creará automáticamente un contacto físico con la misma información. en la mayoría de casos. En la mayoría de los casos, incluso si el tercero es una persona física, la creación de un tercero por sí solo es suficiente.
 ParentCompany=Sede central
 Subsidiaries=Filiales
+ReportByMonth=Informe por mes
 ReportByCustomers=Informe por cliente
 ReportByQuarter=Informe por tasa
 CivilityCode=Código cortesía
@@ -75,10 +76,12 @@ Town=Población
 Web=Web
 Poste= Puesto
 DefaultLang=Idioma por defecto
-VATIsUsed=Sujeto a IVA
-VATIsNotUsed=No sujeto a IVA
+VATIsUsed=IVA está siendo usado
+VATIsUsedWhenSelling=Esto define si este tercero incluye un impuesto a la venta o no cuando realiza una factura a sus propios clientes
+VATIsNotUsed=IVA no está siendo usado
 CopyAddressFromSoc=Copiar dirección de la empresa
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero que no es cliente ni proveedor, sin objetos referenciados
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tercero que no es cliente ni proveedor, descuentos no disponibles
 PaymentBankAccount=Cuenta bancaria de pago
 OverAllProposals=Presupuestos
 OverAllOrders=Pedidos
@@ -239,7 +242,7 @@ ProfId3TN=Código en aduana
 ProfId4TN=CCC
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=NIF intracomunitario
-VATIntraShort=NIF intra.
+VATIntra=CIF/NIF intracomunitario
+VATIntraShort=CIF intra.
 VATIntraSyntaxIsValid=Sintaxis válida
+VATReturn=Devolución IVA
 ProspectCustomer=Cliente potencial/Cliente
 Prospect=Cliente potencial
 CustomerCard=Ficha cliente
 Customer=Cliente
 CustomerRelativeDiscount=Descuento cliente relativo
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Descuento relativo
 CustomerAbsoluteDiscountShort=Descuento fijo
 CompanyHasRelativeDiscount=Este cliente tiene un descuento por defecto de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente no tiene descuentos relativos por defecto
+HasRelativeDiscountFromSupplier=Tiene un descuento predeterminado de <b> %s%%</b> en este proveedor
+HasNoRelativeDiscountFromSupplier=No tiene descuento relativo predeterminado en este proveedor
 CompanyHasAbsoluteDiscount=Este cliente tiene <b>%s %s</b> en descuentos (abonos o anticipos) disponibles
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tiene descuentos disponibles (abonos, comerciales) para <b>%s</b> %s
 CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> en anticipos disponibles
+HasNoAbsoluteDiscountFromSupplier=No tiene crédito de descuento disponible en este proveedor
+HasAbsoluteDiscountFromSupplier=Tiene descuentos disponibles (notas de créditos o anticipos) para <b> %s </b> %s en este proveedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Tiene descuentos disponibles (comerciales, anticipos) para <b> %s </b> %s en este proveedor
+HasCreditNoteFromSupplier=Tiene abonos para <b> %s </b> %s en este proveedor
 CompanyHasNoAbsoluteDiscount=Este cliente no tiene más descuentos fijos disponibles
-CustomerAbsoluteDiscountAllUsers=Descuentos fijos en curso (acordado por todos los usuarios)
-CustomerAbsoluteDiscountMy=Descuentos fijos en curso (acordados personalmente)
+CustomerAbsoluteDiscountAllUsers=Descuentos fijos a clientes (acordado por todos los usuarios)
+CustomerAbsoluteDiscountMy=Descuentos fijos a clientes (acordados personalmente)
+SupplierAbsoluteDiscountAllUsers=Descuentos fijos de proveedores (acordado por todos los usuarios)
+SupplierAbsoluteDiscountMy=Descuentos fijos de proveedores (acordados personalmente)
 DiscountNone=Ninguna
 Supplier=Proveedor
 AddContact=Crear contacto
@@ -378,8 +391,8 @@ ExportDataset_company_1=Terceros (Empresas / asociaciones / particulares) y prop
 ExportDataset_company_2=Contactos de terceros y campos adicionales
 ImportDataset_company_1=Terceros (Empresas / asociaciones / particulares) y propiedades
 ImportDataset_company_2=Contactos/Direcciones (de terceros o no) y campos adicionales
-ImportDataset_company_3=Cuentas bancarias
-ImportDataset_company_4=Terceros/Comerciales (Afecta a los usuarios comerciales de terceros)
+ImportDataset_company_3=Cuentas bancarias de terceros
+ImportDataset_company_4=Terceros/Comerciales (Asigna usuarios comerciales a terceros)
 PriceLevel=Nivel de precios
 DeliveryAddress=Dirección de envío
 AddAddress=Añadir dirección
@@ -406,6 +419,7 @@ ProductsIntoElements=Lista de productos/servicios en %s
 CurrentOutstandingBill=Riesgo alcanzado
 OutstandingBill=Importe máximo para facturas pendientes
 OutstandingBillReached=Importe máximo para facturas pendientes
+OrderMinAmount=Importe mínimo para pedido
 MonkeyNumRefModelDesc=Devuelve un número bajo el formato %syymm-nnnn para los códigos de clientes y %syymm-nnnn para los códigos de los proveedores, donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0.
 LeopardNumRefModelDesc=Código de cliente/proveedor libre sin verificación. Puede ser modificado en cualquier momento.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 277c8f8fcf5..6a8b4710e30 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -31,7 +31,7 @@ Credit=Haber
 Piece=Doc. contabilidad
 AmountHTVATRealReceived=Total repercutido
 AmountHTVATRealPaid=Total pagado
-VATToPay=IVA ventas
+VATToPay=Ventas IVA
 VATReceived=IVA repercutido
 VATToCollect=IVA compras
 VATSummary=Balance de IVA
@@ -103,6 +103,7 @@ LT2PaymentsES=Pagos IRPF
 VATPayment=Pago IVA
 VATPayments=Pagos IVA
 VATRefund=Devolución IVA
+NewVATPayment=New sales tax payment
 Refund=Devolución
 SocialContributionsPayments=Pagos tasas sociales/fiscales
 ShowVatPayment=Ver pagos IVA
@@ -157,30 +158,34 @@ RulesResultDue=- Incluye las facturas pendientes, los gastos, el IVA,  las donac
 RulesResultInOut=- Incluye los pagos realizados sobre las facturas, las gastos y el IVA. <br>- Se basa en las fechas de pago de las facturas, gastos e IVA. La fecha de donación para las donaciones
 RulesCADue=- Incluye las facturas a clientes, estén pagadas o no.<br>- Se basa en la fecha de validación de las mismas.<br>
 RulesCAIn=- Incluye los pagos efectuados de las facturas a clientes.<br>- Se basa en la fecha de pago de las mismas<br>
+RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario de ventas.
 RulesAmountOnInOutBookkeepingRecord=Incluye registro en su libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPredefined=Incluye registro en su libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPersonalized=Muestra un registro en su libro mayor con cuentas contables <b>agrupadas por grupos personalizados</b>
 SeePageForSetup=Vea el menú <a href="%s">%s</a> para configurarlo
 DepositsAreNotIncluded=- Las facturas de anticipo no están incluidas
 DepositsAreIncluded=- Las facturas de anticipo están incluidas
-LT2ReportByCustomersInInputOutputModeES=Informe por tercero del IRPF
-LT1ReportByCustomersInInputOutputModeES=Informe de RE por terceros
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Informe de RE por terceros
+LT2ReportByCustomersES=Informe por tercero del IRPF
 VATReport=Informe IVA
+VATReportByPeriods=Informe de IVA por período
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Informe por cliente del IVA repercutido y soportado
-VATReportByCustomersInDueDebtMode=Informe por cliente del IVA repercutido y soportado
 VATReportByQuartersInInputOutputMode=Informe por tasa del IVA repercutido y soportado
-LT1ReportByQuartersInInputOutputMode=Informe de RE por tasa
-LT2ReportByQuartersInInputOutputMode=Informe de IRPF por tasa
-VATReportByQuartersInDueDebtMode=Informe por tasa del IVA repercutido y soportado
-LT1ReportByQuartersInDueDebtMode=Informe de RE por tasa
-LT2ReportByQuartersInDueDebtMode=Informe de IRPF por tasa
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Informe de RE por tasa
+LT2ReportByQuartersES=Informe de IRPF por tasa
 SeeVATReportInInputOutputMode=Ver el informe <b>%sIVA pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver el informe <b>%sIVA debido%s</b> para un modo de cálculo con la opción sobre lo debido
 RulesVATInServices=- Para los servicios, el informe incluye el IVA de los pagos recibidos o emitidos basándose en la fecha de pago.
-RulesVATInProducts=- Para los bienes materiales, incluye el IVA de las facturas basándose en la fecha de la factura.
+RulesVATInProducts=- Para los los bienes materiales, el informe incluye el IVA de los pagos recibidos o emitidos basándose en la fecha de pago.
 RulesVATDueServices=- Para los servicios, el informe incluye el IVA de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
 RulesVATDueProducts=- Para los bienes materiales, incluye el IVA de las facturas basándose en la fecha de la factura.
 OptionVatInfoModuleComptabilite=Nota: Para los bienes materiales, sería necesario utilizar la fecha de entrega para para ser más justo.
+ThisIsAnEstimatedValue=Esta es una vista previa, basada en eventos de negocios y no en la tabla de contabilidad final, por lo que los resultados finales pueden diferir de estos valores de vista previa
 PercentOfInvoice=%%/factura
 NotUsedForGoods=No utilizado para los bienes
 ProposalStats=Estadísticas de presupuestos
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: No se encuentra la cuenta bancaria
 FiscalPeriod=Periodo contable
 ListSocialContributionAssociatedProject=Listado de contribuciones sociales asociadas al proyecto
 DeleteFromCat=Eliminar del grupo de contabilidad
+AccountingAffectation=Asignación de cuenta contable
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 59ccc0e766a..da8ac9c00aa 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Sin trabajos registrados
 CronPriority=Prioridad
 CronLabel=Etiqueta
 CronNbRun=Núm. ejec.
-CronMaxRun=Nº máximo ejecuciones
+CronMaxRun=Max number launch
 CronEach=Toda(s)
 JobFinished=Tareas lanzadas y finalizadas
 #Page card
@@ -74,9 +74,10 @@ CronFrom=De
 CronType=Tipo de tarea
 CronType_method=Llamar a un método de clase Dolibarr
 CronType_command=Comando Shell
-CronCannotLoadClass=No se puede cargar la clase %s u objeto %s
+CronCannotLoadClass=No se puede cargar el archivo de la clase %s (para usar la clase %s)
+CronCannotLoadObject=El archivo de la clase %s ha sido cargado, pero no se ha encontrado en ella el objeto %s
 UseMenuModuleToolsToAddCronJobs=Vaya al menú "Inicio - Utilidades administración - Tareas programadas" para ver y editar tareas programadas.
 JobDisabled=Tarea desactivada
 MakeLocalDatabaseDumpShort=Copia local de la base de datos
-MakeLocalDatabaseDump=Crear una copia local de la base de datos. Los parámetros son: compresión ('gz' o 'bz' o 'ninguno'), tipo de copia de seguridad ('mysql' o 'pgsql'), 1, 'auto' o nombre de archivo para construir, nº de archivos de copia de seguridad a mantener
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Atención: para mejorar el rendimiento, cualquiera que sea la próxima fecha de ejecución de las tareas activas, sus tareas pueden retrasarse un máximo de %s horas antes de ejecutarse
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index bdd30414b9a..a5fd83f9e9b 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Ha ocurrido un error al intentar añadir un regist
 ErrorFailedToRemoveToMailmanList=Error en la eliminación de %s de la lista Mailmain %s o base SPIP
 ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al antiguo
 ErrorFailedToValidatePasswordReset=No se ha podido restablecer la contraseña. Es posible que este enlace ya se haya utilizado (este enlace sólo puede usarse una vez). Si no es el caso, trate de reiniciar el proceso de restablecimiento de contraseña desde el principio.
-ErrorToConnectToMysqlCheckInstance=Error de conexión con el servidor de la base de datos. Compruebe que MySQL está funcionando (en la mayoría de los casos, puede ejecutarlo desde la línea de comandos utilizando el comando  'etc sudo /etc/init.d/mysql start.
+ErrorToConnectToMysqlCheckInstance=Error de conexión con la base de datos. Compruebe que el servidor de base de datos está en marcha (por ejemplo, con mysql/maríadb, pudes lanzarlo con la línea de comando 'sudo service mysql start').
 ErrorFailedToAddContact=Error en la adición del contacto
 ErrorDateMustBeBeforeToday=La fecha no puede ser posterior a hoy
 ErrorPaymentModeDefinedToWithoutSetup=Se ha establecido el modo de pago al tipo %s pero en la configuración del módulo de facturas no se ha indicado la información para mostrar de este modo de pago.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que usted intenta a
 ErrorFileNotFoundWithSharedLink=Archivo no encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
 ErrorProductBarCodeAlreadyExists=El código de barras del producto %s ya existe en otra referencia de producto.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que no es posible utilizar productos virtuales para aumentar/disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie/lote.
+ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para las líneas libres
 
 # Warnings
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Algunas veces se realizaron registrod a usuar
 WarningYourLoginWasModifiedPleaseLogin=Su cuenta de acceso ha sido modificada. Por razones de seguridad, tendrá que iniciar sesión con su nuevo acceso antes de la próxima acción.
 WarningAnEntryAlreadyExistForTransKey=Ya existe una entrada para la clave de traducción para este idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Atención, el número de destinatarios diferentes está limitado a <b>%s</b>cuando se usan las acciones masivas en las listas
+WarningDateOfLineMustBeInExpenseReportRange=Advertencia, la fecha de la línea no está en el rango del informe de gastos
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index 217e492aad2..98959df18b2 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -16,7 +16,12 @@ CancelCP=Anulada
 RefuseCP=Rechazada
 ValidatorCP=Validador
 ListeCP=Listado de días libres
+LeaveId=ID Vacaciones
 ReviewedByCP=Será revisada por
+UserForApprovalID=ID de usuario de aprobación
+UserForApprovalFirstname=Nombre de usuario de aprobación
+UserForApprovalLastname=Apellido del usuario de aprobación
+UserForApprovalLogin=Inicio de sesión de usuario de aprobación
 DescCP=Descripción
 SendRequestCP=Enviar la petición de días libres
 DelayToRequestCP=Las peticiones de días libres deben realizarse al menos <b>%s días</b> antes.
@@ -30,7 +35,14 @@ ErrorUserViewCP=No está autorizado a leer esta petición de días libres.
 InfosWorkflowCP=Información del workflow
 RequestByCP=Pedido por
 TitreRequestCP=Ficha días libres
+TypeOfLeaveId=ID tipo de vacaciones
+TypeOfLeaveCode=Código tipo de vacaciones
+TypeOfLeaveLabel=Tipo de etiqueta de vacaciones
 NbUseDaysCP=Número de días libres consumidos
+NbUseDaysCPShort=Días consumidos
+NbUseDaysCPShortInMonth=Días consumidos en mes
+DateStartInMonth=Fecha de inicio en mes
+DateEndInMonth=Fecha de finalización en mes
 EditCP=Modificar
 DeleteCP=Eliminar
 ActionRefuseCP=Rechazar
@@ -59,6 +71,7 @@ DateRefusCP=Fecha del rechazo
 DateCancelCP=Fecha de la anulación
 DefineEventUserCP=Asignar permiso excepcional a un usuario
 addEventToUserCP=Asignar este permiso
+NotTheAssignedApprover=Usted no es el aprobador asignado
 MotifCP=Motivo
 UserCP=Usuario
 ErrorAddEventToUserCP=Se ha producido un error en la asignación del permiso excepcional.
@@ -81,7 +94,12 @@ EmployeeFirstname=Nombre del empleado
 TypeWasDisabledOrRemoved=El tipo de día libre (id %s) ha sido desactivado o eliminado
 LastHolidays=Últimas %s solicitudes de días libres
 AllHolidays=Todas las solicitudes de días libres
-
+HalfDay=Medio día
+NotTheAssignedApprover=Usted no es el aprobador asignado
+LEAVE_PAID=Vacación
+LEAVE_SICK=Baja por enfermedad
+LEAVE_OTHER=Otra petición
+LEAVE_PAID_FR=Vacación
 ## Configuration du Module ##
 LastUpdateCP=Última actualización automática de días retribuidos
 MonthOfLastMonthlyUpdate=Mes de la última actualización automática de días retribuidos
diff --git a/htdocs/langs/es_ES/loan.lang b/htdocs/langs/es_ES/loan.lang
index 6b7fbf06d34..f0badf583c7 100644
--- a/htdocs/langs/es_ES/loan.lang
+++ b/htdocs/langs/es_ES/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuración del módulo préstamos
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Cuenta contable por defecto para el capital
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Cuenta contable por defecto para el interés
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Cuenta contable por defecto para el seguro
-CreateCalcSchedule=Crear/Modificar vencimientos de préstamos
+FinancialCommitment=Prestamo
+CreateCalcSchedule=Editar el prestamo
+InterestAmount=Cantidad de interés
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 48932dbba97..401b7589dd2 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Resultado del envío masivo de e-mails
 NbSelected=Nº seleccionados
 NbIgnored=Nº ignorados
 NbSent=Nº enviados
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=¿Está seguro de querer cambiar el estado del e-mailing <b>%s</b> a borrador?
 MailingModuleDescContactsWithThirdpartyFilter=Filtro de contactos con tercero
 MailingModuleDescContactsByCompanyCategory=Contactos de terceros por categoría
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index e9d3aff70dc..a7000b66e24 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parámetro %s no definido
 ErrorUnknown=Error desconocido
 ErrorSQL=Error de SQL
 ErrorLogoFileNotFound=El archivo logo '%s' no se encuentra
-ErrorGoToGlobalSetup=Vaya a la Configuración ' Empresa/Institución ' para corregir
+ErrorGoToGlobalSetup=Vaya a la Configuración ' Empresa/Institución ' para corregir esto
 ErrorGoToModuleSetup=Vaya a la configuración del módulo para corregir
 ErrorFailedToSendMail=Error en el envío del e-mail (emisor=%s, destinatario=%s)
 ErrorFileNotUploaded=El archivo no se ha podido transferir
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVA definido para e
 ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de tasa social/fiscal definida para el país '%s'.
 ErrorFailedToSaveFile=Error, el registro del archivo falló.
 ErrorCannotAddThisParentWarehouse=Intenta añadir un almacén padre que ya es hijo del actual
-MaxNbOfRecordPerPage=Nº máximo de registros por página
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=No está autorizado para hacer esto.
 SetDate=Fijar fecha
 SelectDate=Seleccione una fecha
 SeeAlso=Ver también %s
 SeeHere=Vea aquí
+ClickHere=Haga clic aquí
+Here=Here
 Apply=Aplicar
 BackgroundColorByDefault=Color de fondo
 FileRenamed=El archivo ha sido renombrado correctamente
@@ -185,6 +187,7 @@ ToLink=Enlace
 Select=Seleccionar
 Choose=Elegir
 Resize=Redimensionar
+ResizeOrCrop=Cambiar el tamaño o cortar
 Recenter=Encuadrar
 Author=Autor
 User=Usuario
@@ -325,8 +328,10 @@ Default=Predeterminado
 DefaultValue=Valor por defecto
 DefaultValues=Valores por defecto
 Price=Precio
+PriceCurrency=Precio (moneda)
 UnitPrice=Precio unitario
 UnitPriceHT=Precio base
+UnitPriceHTCurrency=Precio unitario (moneda)
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
@@ -334,6 +339,7 @@ PriceUHTCurrency=P.U. (divisa)
 PriceUTTC=P.U. (i.i.)
 Amount=Importe
 AmountInvoice=Importe factura
+AmountInvoiced=Importe facturado
 AmountPayment=Importe pago
 AmountHTShort=Base imp.
 AmountTTCShort=Importe
@@ -353,6 +359,7 @@ AmountLT2ES=Importe IRPF
 AmountTotal=Importe total
 AmountAverage=Importe medio
 PriceQtyMinHT=Precio cantidad min. total
+PriceQtyMinHTCurrency=Precio cantidad min. total (moneda)
 Percentage=Porcentaje
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tasa IVA
+VATCode=Código tasa IVA
+VATNPR=Tasa NPR
 DefaultTaxRate=Tasa de impuesto por defecto
 Average=Media
 Sum=Suma
@@ -419,7 +428,8 @@ ActionRunningShort=En progreso
 ActionDoneShort=Terminado
 ActionUncomplete=Incompleto
 LatestLinkedEvents=Últimos %s eventos vinculados
-CompanyFoundation=Empresa/Institución
+CompanyFoundation=Empresa/Organización
+Accountant=Contable
 ContactsForCompany=Contactos de este tercero
 ContactsAddressesForCompany=Contactos/direcciones de este tercero
 AddressesForCompany=Direcciones de este tercero
@@ -427,6 +437,9 @@ ActionsOnCompany=Eventos respecto a este tercero
 ActionsOnMember=Eventos respecto a este miembro
 ActionsOnProduct=Eventos sobre este producto
 NActionsLate=%s en retraso
+ToDo=A realizar
+Completed=Realizado
+Running=En progreso
 RequestAlreadyDone=Solicitud ya registrada
 Filter=Filtro
 FilterOnInto=Buscar critero '<strong>%s</strong>' en las filas %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Atención, está en modo mantenimiento, así que
 CoreErrorTitle=Error del sistema
 CoreErrorMessage=Lo sentimos, pero ha ocurrido un error. Póngase en contacto con el administrador del sistema para comprobar los registros o desactive $dolibarr_main_prod=1 para obtener más información.
 CreditCard=Tarjeta de crédito
+ValidatePayment=Validar este pago
+CreditOrDebitCard=Tarjeta de crédito o débito
 FieldsWithAreMandatory=Los campos marcados por un <b>%s</b> son obligatorios
 FieldsWithIsForPublic=Los campos marcados por <b>%s</b> se mostrarán en la lista pública de miembros. Si no desea verlos, desactive la casilla "público".
 AccordingToGeoIPDatabase=(Obtenido por conversión GeoIP)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Confirmación de borrado en lote
 ConfirmMassDeletionQuestion=Esta seguro que quiere supprimir el/los %s registro(s) seleccionado(s) ?
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Clasificar facturado
+ClassifyUnbilled=Clasificar no facturado
 Progress=Progreso
-ClickHere=Haga clic aquí
 FrontOffice=Front office
 BackOffice=Back office
 View=Ver
@@ -851,6 +866,8 @@ FileNotShared=Archivo no compartido a público externo
 Project=Proyecto
 Projects=Proyectos
 Rights=Permisos
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Lunes
 Tuesday=Martes
@@ -916,3 +933,11 @@ CommentDeleted=Comentario borrado
 Everybody=Proyecto compartido
 PayedBy=Pagado por
 PayedTo=Pagado a
+Monthly=Mensual
+Quarterly=Trimestral
+Annual=Anual
+Local=Local
+Remote=Remoto
+LocalAndRemote=Local y remoto
+KeyboardShortcut=Atajo de teclado
+AssignedTo=Asignada a
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 31cc6821bbf..8a54dc8d18f 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=El margen  debe ser un valor numérico
 markRateShouldBeLesserThan100=El margen tiene que ser menor que 100
 ShowMarginInfos=Mostrar info de márgenes
 CheckMargins=Detalles de márgenes
-MarginPerSaleRepresentativeWarning=El informe de margen por usuario usa el enlace entre terceros y comerciales para calcular el margen de cada usuario. Debido a que algunos terceros pueden no estar vinculados a un comercial y algunos terceros pueden estar relacionados con varios usuarios, algunos márgenes pueden no aparecer en este informe o podrá aparecer en varias líneas diferentes.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index da7c3f4e189..c0811465322 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Lista de miembros públicos validados
 ErrorThisMemberIsNotPublic=Este miembro no es público
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, login: <b>%s</b>) está vinculado al tercero <b>%s</b>. Elimine el enlace existente ya que un tercero sólo puede estar vinculado a un solo miembro (y viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, debe poseer los derechos de modificación de todos los usuarios para poder vincular un miembro a un usuario que no sea usted mismo.
-ThisIsContentOfYourCard=Hola.<br><br>Este es un recordatorio de la información que obtenemos sobre usted. No dude en contactar con nosotros si algo le parece incorrecto.<br><br>
-CardContent=Contenido de su ficha de miembro
 SetLinkToUser=Vincular a un usuario Dolibarr
 SetLinkToThirdParty=Vincular a un tercero Dolibarr
 MembersCards=Carnés de miembros
@@ -108,17 +106,33 @@ PublicMemberCard=Ficha pública miembro
 SubscriptionNotRecorded=Subscripción no guardada
 AddSubscription=Crear afiliación
 ShowSubscription=Mostrar afiliación
-SendAnEMailToMember=Enviar e-mail de información al miembro (E-mail: <b>%s</b>)
+# Label of email templates
+SendingAnEMailToMember=Enviar e-mail de información al miembro
+SendingEmailOnAutoSubscription=Enviar E-Mail en una auto-inscripción
+SendingEmailOnMemberValidation=Enviar E-Mail en la validación de un nuevo miembro
+SendingEmailOnNewSubscription=Enviar E-Mail en una nueva suscripción
+SendingReminderForExpiredSubscription=Enviar un recordatorio para suscripción expirada
+SendingEmailOnCancelation=Enviar E-Mail en una cancelación
+# Topic of email templates
+YourMembershipRequestWasReceived=Su membresía fue recibida.
+YourMembershipWasValidated=Su membresía ha sido validada.
+YourSubscriptionWasRecorded=Su suscripción ha sido guardada
+SubscriptionReminderEmail=Recordatorio de suscripción
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Contenido de su ficha de miembro
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=Queremos informarle que se ha solicitado una nueva membresía. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Queremos hacerle saber que su membresía fue validada con la siguiente información: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Queremos informarle que su nueva suscripción fue grabada. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Queremos informarle que su nueva suscripción está a punto de expirar.  Esperamos que pueda renovarla<br><br>
+ThisIsContentOfYourCard=Este es un recordatorio de la información que obtenemos sobre usted. No dude en contactar con nosotros si algo le parece incorrecto.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del e-mail recibido en caso de auto-inscripción de un invitado
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recibido en caso de auto-inscripción de un invitado
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Asunto del e-mail enviado cuando un invitado se auto-inscriba
-DescADHERENT_AUTOREGISTER_MAIL=E-mail enviado cuando un invitado se auto-inscriba
-DescADHERENT_MAIL_VALID_SUBJECT=Asunto del e-mail  de validación de miembro
-DescADHERENT_MAIL_VALID=E-mail de validación de miembro
-DescADHERENT_MAIL_COTIS_SUBJECT=Asunto del e-mail de validación de cotización
-DescADHERENT_MAIL_COTIS=E-mail de validación de una afiliación
-DescADHERENT_MAIL_RESIL_SUBJECT=Asunto de e-mail de baja
-DescADHERENT_MAIL_RESIL=E-mail de baja
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla del e-mail a enviar cuando un miembro se auto-inscriba
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla del e-mail a enviar a un miembro cuando un miembro se valide
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla del e-mail para usar para enviar e-mail a un miembro en un nuevo registro de suscripción
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla del e-mail a enviar cuando una membresía esté a punto de expirar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla del e-mail a enviar a un miembro cuando un miembro se de de baja
 DescADHERENT_MAIL_FROM=E-mail emisor para los e-mails automáticos
 DescADHERENT_ETIQUETTE_TYPE=Formato páginas etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto a imprimir en la dirección de las etiquetas de cada miembro
@@ -177,3 +191,8 @@ NoVatOnSubscription=Sin IVA para en las afiliaciones
 MEMBER_PAYONLINE_SENDEMAIL=E-mail a usar para alertas de e-mail cuando Dolibarr reiba una confirmación de pago validado para una subscripción (por ejemplo: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto usado para las suscripciones en línea en facturas: %s
 NameOrCompany=Nombre o Empresa
+SubscriptionRecorded=Suscripción guardada
+NoEmailSentToMember=No se envió ningún e-mail al miembro
+EmailSentToMember=E-Mail enviado al miembro a %s
+SendReminderForExpiredSubscriptionTitle=Enviar un recordatorio por E-Mail para la suscripción expirada
+SendReminderForExpiredSubscription=Enviar recordatorio por e-mail a los miembros cuando la suscripción esté a punto de caducar (el parámetro es el número de días antes del final de la suscripción para enviar el recordatorio)
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index 188887b7a06..5f568d7e485 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -94,3 +94,4 @@ YouCanUseTranslationKey=Aquí puede usar una clave que es la clave de traducció
 DropTableIfEmpty=(Eliminar tabla si está vacía)
 TableDoesNotExists=La tabla %s no existe
 TableDropped=Tabla %s eliminada
+InitStructureFromExistingTable=Construir la estructura de array de una tabla existente
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index bca0fdaa899..8a205565ff5 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Desconectado. Ir a la página de inicio de sesión ...
 MessageForm=Mensaje en el formulario de pago en línea
 MessageOK=Mensaje en la página de retorno de pago confirmado
 MessageKO=Mensaje en la página de retorno de pago cancelado
+ContentOfDirectoryIsNotEmpty=Este directorio no está vacío
+DeleteAlsoContentRecursively=Compruebe para eliminar todo el contenido recursivamente
 
 YearOfInvoice=Año de la fecha de la factura
 PreviousYearOfInvoice=Año anterior de la fecha de la factura
@@ -78,8 +80,8 @@ LinkedObject=Objeto adjuntado
 NbOfActiveNotifications=Número de notificaciones (nº de destinatarios)
 PredefinedMailTest=__(Hello)__\nEste es un correo de prueba enviado a __EMAIL__.\nLas dos líneas están separadas por un retorno de carro.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nEste es un correo de <b> prueba</b> (la palabra prueba debe estar en negrita). <br> Las dos líneas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí encontrará la factura __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNos gustaría advertirle que la factura __REF__ parece no estar pagada. Así que le enviamos de nuevo la factura en el archivo adjunto, como un recordatorio.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí encontrará la factura __REF__\n\nEste es el enlace para realizar un pago en línea en caso de que la factura aún no se encuentre pagada:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNos gustaría advertirle que la factura __REF__ parece no estar pagada. Así que le enviamos de nuevo la factura en el archivo adjunto, como un recordatorio.\n\nEste es el enlace para poder realizar un pago en línea de la misma\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hola)__\n\nNos ponemos en contacto con usted para facilitarle el presupuesto __PREF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hola)__\n\nNos ponemos en contacto con usted para facilitarle nuestra solicitud de presupuesto __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hola)__\n\nNos ponemos en contacto con usted para facilitarle el pedido __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Transferir
 CancelUpload=Cancelar la transferencia
 FileIsTooBig=El archivo es demasiado grande
 PleaseBePatient=Rogamos espere unos instantes...
+NewPassword=Nueva contraseña
 ResetPassword=Reiniciar contraseña
 RequestToResetPasswordReceived=Se ha recibido una solicitud para cambiar tu contraseña de Dolibarr
 NewKeyIs=Esta es su nueva contraseña para iniciar sesión
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL de la página
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descripción
 WEBSITE_KEYWORDS=Claves
+LinesToImport=Lines to import
diff --git a/htdocs/langs/es_ES/paypal.lang b/htdocs/langs/es_ES/paypal.lang
index 749cf482c39..df87e8e90f2 100644
--- a/htdocs/langs/es_ES/paypal.lang
+++ b/htdocs/langs/es_ES/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Sólo PayPal
 ONLINE_PAYMENT_CSS_URL=URL opcional de la hoja de estilo CSS en la página de pago en línea
 ThisIsTransactionId=Identificador de la transacción: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Añadir la url del pago Paypal al enviar un documento por e-mail
-PredefinedMailContentLink=Puede hacer clic en el enlace seguro de abajo para realizar su pago a través de PayPal\n\n%s\n\n
+PredefinedMailContentLink=Puede hacer clic en el siguiente enlace para realizar su pago si aún no lo ha hecho. <br> <br> %s <br> <br>
 YouAreCurrentlyInSandboxMode=Actualmente se encuentra en el modo %s "sandbox"
 NewOnlinePaymentReceived=Nuevo pago en línea recibido
 NewOnlinePaymentFailed=Nuevo pago en línea intentado pero ha fallado
@@ -30,3 +30,6 @@ ErrorCode=Código de error
 ErrorSeverityCode=Gravedad del Código de error 
 OnlinePaymentSystem=Sistema de pago online
 PaypalLiveEnabled=Paypal en vivo habilitado (de lo contrario, modo prueba/sandbox)
+PaypalImportPayment=Importe pagos Paypal
+PostActionAfterPayment=Acciones después de los pagos
+ARollbackWasPerformedOnPostActions=Se realizó una reversión en todas las acciones. Debe completar las acciones manualmente si son necesarias.
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 7234df78d8e..c97d546f831 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Código de contabilidad (venta de exportación)
 ProductOrService=Producto o servicio
 ProductsAndServices=Productos y servicios
 ProductsOrServices=Productos o servicios
+ProductsPipeServices=Productos | Servicios
 ProductsOnSaleOnly=Productos solo a la venta
 ProductsOnPurchaseOnly=Productos solamente en compra
 ProductsNotOnSell=Productos ni a la venta ni a la compra
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=¿Está seguro de querer eliminar esta línea de produc
 ProductSpecial=Especial
 QtyMin=Cantidad mínima
 PriceQtyMin=Precio para esta cantidad mínima (sin descuento)
+PriceQtyMinCurrency=Precio para esta cantidad mínima (sin descuento)(moneda)
 VATRateForSupplierProduct=Tasa IVA (para este producto/proveedor)
 DiscountQtyMin=Descuento por defecto para esta cantidad
 NoPriceDefinedForThisSupplier=Ningún precio/cant. definido para este proveedor/producto
@@ -179,7 +181,7 @@ m3=m³
 liter=litro
 l=L
 unitP=Pieza
-unitSET=Establecer
+unitSET=Conjunto
 unitS=Segundo
 unitH=Hora
 unitD=Día
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 52220bc443c..96c5555f427 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Contactos proyecto
 ProjectsImContactFor=Proyectos de los que soy contacto explícito
 AllAllowedProjects=Todos los proyectos que puedo leer (míos + públicos)
 AllProjects=Todos los proyectos
-MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto.
+MyProjectsDesc=Esta vista está limitada a aquellos proyectos en los que usted es un contacto
 ProjectsPublicDesc=Esta vista muestra todos los proyectos a los que usted tiene derecho a visualizar.
 TasksOnProjectsPublicDesc=Esta vista muestra todos los proyectos a los que tiene derecho a visualizar.
 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).
 TasksOnProjectsDesc=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 o tareas en los que usted es un contacto.
+MyTasksDesc=Esta vista se limita a los proyectos o tareas en los que usted es un contacto
 OnlyOpenedProject=Sólo los proyectos abiertos son visibles (los proyectos en estado borrador cerrado no son visibles).
 ClosedProjectsAreHidden=Los proyectos cerrados no son visibles.
 TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tareas en proyectos abiertos
 WorkloadNotDefined=Carga de trabajo no definida
 NewTimeSpent=Tiempos dedicados
 MyTimeSpent=Mi tiempo dedicado
+BillTime=Facturar tiempo dedicado
 Tasks=Tareas
 Task=Tarea
 TaskDateStart=Fecha inicio
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Listado de donaciones asociadas al proyecto
 ListVariousPaymentsAssociatedProject=Lista de pagos diversos asociados con el proyecto
 ListActionsAssociatedProject=Lista de eventos asociados al proyecto
 ListTaskTimeUserProject=Listado de tiempos en tareas del proyecto
+ListTaskTimeForTask=Listado de tiempos en tareas
 ActivityOnProjectToday=Actividad en el proyecto hoy
 ActivityOnProjectYesterday=Actividad en el proyecto ayer
 ActivityOnProjectThisWeek=Actividad en el proyecto esta semana
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Actividad en el proyecto este mes
 ActivityOnProjectThisYear=Actividad en el proyecto este año
 ChildOfProjectTask=Hilo de la tarea
 ChildOfTask=Hijo de la tarea
+TaskHasChild=La tarea tiene hijas
 NotOwnerOfProject=No es responsable de este proyecto privado
 AffectedTo=Asignado a
 CantRemoveProject=Este proyecto no puede ser eliminado porque está referenciado por muchos objetos (facturas, pedidos u otras). ver la lista en la pestaña Referencias.
@@ -137,6 +140,7 @@ ProjectReportDate=Cambiar fechas de las tareas según la fecha de inicio del nue
 ErrorShiftTaskDate=Se ha producido un error en el cambio de las fechas de las tareas
 ProjectsAndTasksLines=Proyectos y tareas
 ProjectCreatedInDolibarr=Proyecto %s creado
+ProjectValidatedInDolibarr=Proyecto %s validado
 ProjectModifiedInDolibarr=Proyecto %s modificado
 TaskCreatedInDolibarr=La tarea %s fue creada
 TaskModifiedInDolibarr=La tarea %s fue modificada
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Permitir vincular proyecto de otra empresa <br> <br>
 LatestProjects=Últimos %s presupuestos
 LatestModifiedProjects=Últimos %s proyectos modificados 
 OtherFilteredTasks=Otras tareas filtradas
-NoAssignedTasks=Sin tareas asignadas ( Asígnese tareas si desea indicar tiempos en ellas)
+NoAssignedTasks=Sin tareas asignadas ( Asigne proyectos/tareas al usuario actual desde el selector superior  para indicar tiempos en ellas)
 # Comments trans
 AllowCommentOnTask=Permitir comentarios de los usuarios sobre las tareas
 AllowCommentOnProject=Permitir comentarios de los usuarios en los proyectos
-
+DontHavePermissionForCloseProject=No tienes permisos para cerrar el proyecto %s
+DontHaveTheValidateStatus=El proyecto %s debe estar abierto para ser cerrado
+RecordsClosed=%s proyecto(s) cerrado(s)
+SendProjectRef=About project %s
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index 8d19067740c..c7ae4e40876 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Firmado (a facturar)
 PropalStatusNotSigned=No firmado (cerrado)
 PropalStatusBilled=Facturado
 PropalStatusDraftShort=Borrador
+PropalStatusValidatedShort=Validado
 PropalStatusClosedShort=Cerrado
 PropalStatusSignedShort=Firmado
 PropalStatusNotSignedShort=No firmado
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index c4b8eaf2577..194db205b01 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Este valor puede ser usado para calcular los costos de tiempo con
 TJMDescription=Este valor actualmente es informativo y no se utiliza para realizar cualquier tipo de cálculo
 LastSalaries=Últimos %s pagos salariales
 AllSalaries=Todos los pagos salariales
+SalariesStatistics=Estadísticas de salarios
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 9912a41c84a..9d11fd501e0 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Edición almacén
 MenuNewWarehouse=Nuevo almacén
 WarehouseSource=Almacén origen
 WarehouseSourceNotDefined=Sin almacenes definidos,
+AddWarehouse=Create warehouse
 AddOne=Añadir uno
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Almacén destino
 ValidateSending=Validar envío
 CancelSending=Anular envío
@@ -22,6 +24,7 @@ Movements=Movimientos
 ErrorWarehouseRefRequired=El nombre de referencia del almacén es obligatorio
 ListOfWarehouses=Listado de almacenes
 ListOfStockMovements=Listado de movimientos de stock
+ListOfInventories=List of inventories
 MovementId=ID movimiento
 StockMovementForId=ID movimiento %d
 ListMouvementStockProject=Listado de movimientos de stock asociados al proyecto
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index 36b58efe61e..36618376145 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=Nuevo pago de Stripe recibido
 NewStripePaymentFailed=Nuevo pago de Stripe intentado, pero ha fallado
 STRIPE_TEST_SECRET_KEY=Clave secreta test
 STRIPE_TEST_PUBLISHABLE_KEY=Clave de test publicable
+STRIPE_TEST_WEBHOOK_KEY=Clave de prueba Webhook
 STRIPE_LIVE_SECRET_KEY=Clave
 STRIPE_LIVE_PUBLISHABLE_KEY=Clave publicable
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock para usar para la disminución de stock cuando se realiza el pago en línea <br> (TODO Cuando la opción para disminuir stock se realiza en una acción en la factura y el pago en línea se genera la factura?)
 StripeLiveEnabled=Stripe live activado (de lo contrario en modo test/sandbox)
+StripeImportPayment=Importar pagos Stripe
+ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para pruebas: %s(válido),%s (error CVC), %s (caducada), %s (la carga falla)
+StripeGateways=Pasarelas de Stripe
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca _...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca _...)
+BankAccountForBankTransfer=Cuenta bancaria para transferencias
+StripeAccount=Cuenta Stripe
+StripeChargeList=Listado de gastos de Stripe
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Id de cliente de Stripe
+StripePaymentModes=Modos de pago de Stripe
+LocalID=ID local
+StripeID=ID Stripe
+NameOnCard=Nombre en la tarjeta
+CardNumber=Número de tarjeta
+ExpiryDate=Fecha de caducidad
+CVN=CVN
+DeleteACard=Eliminar registro de tarjeta
+ConfirmDeleteCard=¿Está seguro de querer eliminar este registro de tarjeta?
+CreateCustomerOnStripe=Crear cliente en Stripe
+CreateCardOnStripe=Crea una tarjeta en Stripe
+ShowInStripe=Mostrar en Stripe
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index 1e7b63c5543..b69dfdc8d54 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Ver informe de gastos
 NewTrip=Nuevo gasto
 LastExpenseReports=Últimos %s informes de gastos
 AllExpenseReports=Todos los informes de gastos
-CompanyVisited=Empresa/institución visitada
+CompanyVisited=Empresa/organización visitada
 FeesKilometersOrAmout=Importe o kilómetros
 DeleteTrip=Eliminar gasto
 ConfirmDeleteTrip=¿Está seguro de querer eliminar este gasto?
@@ -21,17 +21,17 @@ ListToApprove=En espera de aprobación
 ExpensesArea=Área de gastos
 ClassifyRefunded=Clasificar 'Reembolsado'
 ExpenseReportWaitingForApproval=Se ha enviado un nuevo gasto para ser aprobado
-ExpenseReportWaitingForApprovalMessage=Se ha enviado un nuevo gasto y está a la espera para ser aprobado.\n- Usuario: %s\n- Periodo. %s\nHaga clic aquí para validarlo: %s
+ExpenseReportWaitingForApprovalMessage=Se ha enviado un nuevo gasto y está a la espera para ser aprobado.<br>- Usuario: %s<br>- Periodo. %s<br>Haga clic aquí para validarlo: %s
 ExpenseReportWaitingForReApproval=Se ha enviado un nuevo gasto para reaprobalo
-ExpenseReportWaitingForReApprovalMessage=Se ha enviado un nuevo gasto y está a la espera para ser reaprobado.\nEl %s, rechazó su aprobación por esta razón: %s\nSe a propuesto una nueva versión y espera su aprobación\n- Usuario: %s\n- Periodo. %s\nHaga clic aquí para validarlo: %s
+ExpenseReportWaitingForReApprovalMessage=Se ha enviado un nuevo gasto y está a la espera para ser reaprobado.<br>El %s, rechazó su aprobación por esta razón: %s<br>Se a propuesto una nueva versión y espera su aprobación.<br>- Usuario: %s<br>- Periodo. %s<br>Haga clic aquí para validarlo: %s
 ExpenseReportApproved=Un nuevo gasto se ha aprobado
-ExpenseReportApprovedMessage=El gasto %s ha sido aprobado.\n- Usuario: %s\n- Aprobado por: %s\nHaga clic aquí para validarlo: %s
+ExpenseReportApprovedMessage=El gasto %s ha sido aprobado.<br>- Usuario: %s<br>- Aprobado por: %s<br>Haga clic aquí para validarlo: %s
 ExpenseReportRefused=Un gasto ha sido rechazado
-ExpenseReportRefusedMessage=El gasto %s ha sido rechazado.\n- Usuario: %s\n- Rechazado por: %s\n- Motivo del rechazo: %s\nHaga clic aquí ver el gasto: %s
+ExpenseReportRefusedMessage=El gasto %s ha sido rechazado.<br>- Usuario: %s<br>- Rechazado por: %s<br>- Motivo del rechazo: %s<br>Haga clic aquí ver el gasto: %s
 ExpenseReportCanceled=Un gasto ha sido cancelado
-ExpenseReportCanceledMessage=El gasto %s ha sido cancelado.\n- Usuario: %s\n- Cancelado por: %s\n- Motivo de la cancelación: %s\nHaga clic aquí ver el gasto: %s
+ExpenseReportCanceledMessage=El gasto %s ha sido cancelado.<br>- Usuario: %s<br>- Cancelado por: %s<br>- Motivo de la cancelación: %s<br>Haga clic aquí ver el gasto: %s
 ExpenseReportPaid=Un gasto ha sido pagado
-ExpenseReportPaidMessage=El gasto %s ha sido pagado.\n- Usuario: %s\n- Pagado por: %s\nHaga clic aquí ver el gasto: %s
+ExpenseReportPaidMessage=El gasto %s ha sido pagado.<br>- Usuario: %s<br>- Pagado por: %s<br>Haga clic aquí ver el gasto: %s
 TripId=Id de gasto
 AnyOtherInThisListCanValidate=Persona a informar para la validación
 TripSociete=Información de la empresa
@@ -74,6 +74,7 @@ EX_CAM_VP=Mantenimiento y reparaciones
 DefaultCategoryCar=Modo de transporte predeterminado
 DefaultRangeNumber=Número de rango predeterminado
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, no se ha definido regla de numeración del informe de gastos en la configuración del módulo 'Informe de gastos'
 ErrorDoubleDeclaration=Ha declarado otro gasto en un rango similar de fechas.
 AucuneLigne=No hay gastos declarados
 
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index 68d7a47bae2..9cdfbc6fe4f 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -69,8 +69,8 @@ InternalUser=Usuario interno
 ExportDataset_user_1=Usuarios Dolibarr y campos adicionales
 DomainUser=Usuario de dominio
 Reactivate=Reactivar
-CreateInternalUserDesc=Este formulario le permite crear un usuario interno para su empresa/asociación. Para crear un usuario externo (cliente, proveedor, etc), use el botón "Crear una cuenta de usuario" desde una ficha de un contacto del tercero.
-InternalExternalDesc=Un usuario <b>interno</b> es un usuario que pertenece a su empresa/institución.<br>Un usuario <b>externo</b> es un usuario cliente, proveedor u otro.<br><br>En los 2 casos, los permisos de usuarios definen los derechos de acceso, pero el usuario externo puede además tener  un gestor de menús diferente al usuario interno (véase Inicio - Configuración - Visualización)
+CreateInternalUserDesc=Este formulario le permite crear un usuario interno para su empresa/organización. Para crear un usuario externo (cliente, proveedor, etc), use el botón "Crear una cuenta de usuario" desde una ficha de un contacto del tercero.
+InternalExternalDesc=Un usuario <b>interno</b> es un usuario que pertenece a su empresa/organización.<br>Un usuario <b>externo</b> es un usuario cliente, proveedor u otro.<br><br>En los 2 casos, los permisos de usuarios definen los derechos de acceso, pero el usuario externo puede además tener  un gestor de menús diferente al usuario interno (véase Inicio - Configuración - Entorno)
 PermissionInheritedFromAGroup=El permiso se concede ya que lo hereda de un grupo al cual pertenece el usuario.
 Inherited=Heredado
 UserWillBeInternalUser=El usuario creado será un usuario interno (ya que no está ligado a un tercero en particular)
@@ -93,6 +93,7 @@ NameToCreate=Nombre del tercero a crear
 YourRole=Sus roles
 YourQuotaOfUsersIsReached=¡Ha llegado a su cuota de usuarios activos!
 NbOfUsers=Nº de usuarios
+NbOfPermissions=Nº de permisos
 DontDowngradeSuperAdmin=Sólo un superadmin puede degradar un superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Vista jerárquica
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 14f1f3c2083..f1698c7689f 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Cree aquí tanto la entrada como el número de diferentes sitio
 DeleteWebsite=Eliminar sitio web
 ConfirmDeleteWebsite=¿Está seguro de querer eliminar este sitio web? Todas las páginas y contenido también sera eliminado
 WEBSITE_TYPE_CONTAINER=Tipo de página/contenedor
+WEBSITE_PAGE_EXAMPLE=Página web para usar como ejemplo
 WEBSITE_PAGENAME=Nombre/alias página
+WEBSITE_ALIASALT=Nombres de página/alias alternativos
 WEBSITE_CSS_URL=URL del fichero CSS externo
 WEBSITE_CSS_INLINE=Contenido del archivo CSS (común a todas las páginas)
 WEBSITE_JS_INLINE=Contenido del archivo Javascript (común a todas las páginas)
@@ -34,9 +36,13 @@ ViewPageInNewTab=Ver página en una pestaña nueva
 SetAsHomePage=Establecer como Página de inicio
 RealURL=URL Real
 ViewWebsiteInProduction=Ver sitio web usando la URL de inicio
-SetHereVirtualHost=Si tu puedes crear, en tu servidor web (Apache, Nginx...), un Host Virtual con PHP activado y un directorio Root en <strong>%s</strong><br> introduce aquí el nombre del host virtual que has creado, así que la previsualización puede verse usando este acceso directo al servidor, y no solo usando el servidor de Dolibarr
-PreviewSiteServedByWebServer=Vista previa de %s en una nueva pestaña. <br><br>%s será servido por un servidor web externo (como Apache, Nginx, IIS). Antes debe instalar y configurar este servidor URL de <br><strong>%s</strong><br> servido por el servidor externo: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Vista previa %s en una nueva pestaña <br> <br> El %s será servido por el servidor de Dolibarr por lo que no necesita instalar ningún servidor web extra (como Apache, Nginx, IIS). <br> El inconveniente es que la URL de las páginas no amigables y comienzan con la ruta de su Dolibarr. <br> URL que sirve Dolibarr: <br><strong>%s</strong>   <br> <br>Para utilizar su propio servidor web externo para servir esta web, cree un host virtual en su servidor web que apunte al directorio<br> <strong>%s</strong><br> luego escriba el nombre de este servidor virtual y haga clic en el otro botón de vista previa.
+SetHereVirtualHost=Si tu puedes crear, en tu servidor web (Apache, Nginx...), un Host Virtual con PHP activado y un directorio Root en <br><strong>%s</strong> <br>introduce aquí el nombre del host virtual que has creado, así que la previsualización puede verse usando este acceso directo al servidor, y no solo usando el servidor de Dolibarr
+YouCanAlsoTestWithPHPS=En el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web incrustado de PHP (se requiere PHP 5.5) ejecutando <br><strong> php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Leido
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Vista previa de %s en una nueva pestaña.</u> <br><br>%s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio:<br><strong>%s</strong><br> URL servida por el servidor externo: <br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Vista previa %s en una nueva pestaña.</u> <br> <br> El %s será servido por el servidor de Dolibarr por lo que no necesita instalar ningún servidor web extra (como Apache, Nginx, IIS). <br> El inconveniente es que la URL de las páginas no amigables y comienzan con la ruta de su Dolibarr. <br> URL que sirve Dolibarr: <br><strong>%s</strong>   <br> <br>Para utilizar su propio servidor web externo para servir esta web, cree un host virtual en su servidor web que apunte al directorio<br> <strong>%s</strong><br> luego escriba el nombre de este servidor virtual y haga clic en el otro botón de vista previa.
 VirtualHostUrlNotDefined=URL del Host Virtual servido por un servidor externo no definido
 NoPageYet=No hay páginas todavía
 SyntaxHelp=Ayuda en la sintaxis del código
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=O crear una página vacía desde cero ...
 FetchAndCreate=Buscar y crear
 ExportSite=Exportar sitio
 IDOfPage=Id de la página
-Banner=Anuncio
+Banner=Banner
 BlogPost=Entrada en el blog
 WebsiteAccount=Cuenta del sitio web
 WebsiteAccounts=Cuentas del sitio web
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Volver a la lista de Terceros
 DisableSiteFirst=Deshabilite primero el sitio web
 MyContainerTitle=Título de mi sitio web
 AnotherContainer=Otro contenedor
+WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar tabla de cuentas del sitio web
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilitar tabla para almacenar cuentas del sitio web (inicio de sesión/contraseña) para cada sitio web/tercero
+YouMustDefineTheHomePage=Antes debe definir la página de inicio por defecto
+OnlyEditionOfSourceForGrabbedContentFuture=Nota: solo será posible editar una fuente HTML cuando el contenido de una página se integre utilizando una página externa (el editor WYSIWYG no estará disponible)
+OnlyEditionOfSourceForGrabbedContent=Nota: solo será posible editar una fuente HTML cuando el contenido de una página se integre utilizando una página externa
+GrabImagesInto=Obtener también imágenes encontradas en css y página.
+ImagesShouldBeSavedInto=Las imágenes deben guardarse en el directorio
+WebsiteRootOfImages=Directorio para las imágenes de la web
+SubdirOfPage=Sub-directorio dedicado a la página
+AliasPageAlreadyExists=Ya existe el alias de página <strong>%s</strong>
+CorporateHomePage=Página de inicio corporativa
+EmptyPage=Página vacía
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 355380794e6..6887cc0dc10 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Área domiciliaciones
 SuppliersStandingOrdersArea=Área domiciliaciones
-StandingOrders=Domiciliaciones
-StandingOrder=Domiciliación
+StandingOrdersPayment=Domiciliaciones
+StandingOrderPayment=Domiciliación
 NewStandingOrder=Nueva domiciliación
 StandingOrderToProcess=A procesar
 WithdrawalsReceipts=Domiciliaciones
@@ -98,6 +98,10 @@ ModeFRST=Pago único
 PleaseCheckOne=Escoja solamente uno
 DirectDebitOrderCreated=Domiciliación %s creada
 AmountRequested=Importe solicitado
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Fecha de ejecución
+CreateForSepa=Crear archivo SEPA
 
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco
diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
index a135bc3cd70..a62c3f387af 100644
--- a/htdocs/langs/es_HN/compta.lang
+++ b/htdocs/langs/es_HN/compta.lang
@@ -12,8 +12,6 @@ ShowVatPayment=Ver pagos ISV
 RulesResultDue=- Los importes mostrados son importes totales<br>- Incluye las facturas, cargas e ISV debidos, que estén pagadas o no.<br>- Se basa en la fecha de validación para las facturas y el ISV y en la fecha de vencimiento para las cargas.<br>
 RulesResultInOut=- Los importes mostrados son importes totales<br>- Incluye los pagos realizados para las facturas, cargas e ISV.<br>- Se basa en la fecha de pago de las mismas.<br>
 VATReportByCustomersInInputOutputMode=Informe por cliente del ISV repercutido y pagado (ISV pagado)
-VATReportByCustomersInDueDebtMode=Informe por cliente del ISV repercutido y pagado (ISV debido)
 VATReportByQuartersInInputOutputMode=Informe por tasa del ISV repercutido y pagado (ISV pagado)
-VATReportByQuartersInDueDebtMode=Informe por tasa del ISV repercutido y pagado (ISV debido)
 SeeVATReportInInputOutputMode=Ver el informe <b>%sISV pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver el informe <b>%sISV debido%s</b> para un modo de cálculo con la opción sobre lo debido
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 845cd70b1fe..19eb4bb13c3 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -46,7 +46,6 @@ LabelAccount=Descripción de la cuenta
 Sens=Significado
 DelYear=Año a borrar
 DelJournal=Diario a borrar
-DelBookKeeping=Eliminar registro del libro mayor
 DescFinanceJournal=Diario financiero incluyendo todos los tipos de pagos por cuenta bancaria
 NewAccountingMvt=Nueva transacción
 NumMvts=Número de transacción
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 90bf6e71598..bd9f0e85b94 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -124,9 +124,8 @@ ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<
 WarningSettingSortOrder=Advertencia, establecer un orden predeterminado puede resultar en un error técnico al pasar a la página de lista si "campo" es un campo desconocido. Si experimenta un error de este tipo, vuelva a esta página para eliminar el orden predeterminado y restaurar el comportamiento predeterminado.
 Module20Name=Propuestas
 Module30Name=Facturas
-Module50Name=productos
 Module770Name=Reporte de gastos
-Module3200Desc=Active el registro de algunos eventos empresariales en un registro no reversible. Los eventos se archivan en tiempo real. El registro es una tabla de sucesos encadenados que se pueden leer y exportar. Este módulo puede ser obligatorio para algunos países.
+Module62000Desc=Añadir característica(s) para administrar Incoterm
 DictionaryCanton=Estado/Provincia
 DictionaryAccountancyJournal=Diarios de contabilidad
 Upgrade=Actualizar
diff --git a/htdocs/langs/es_MX/agenda.lang b/htdocs/langs/es_MX/agenda.lang
index 9cca9554312..2a764b0124f 100644
--- a/htdocs/langs/es_MX/agenda.lang
+++ b/htdocs/langs/es_MX/agenda.lang
@@ -41,13 +41,11 @@ AgendaUrlOptions1=También puede agregar los siguientes parámetros para filtrar
 AgendaUrlOptions3=<b>logina=%s</b> para restringir la salida a las acciones propiedad del usuario <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<B> logina =!%s </b> para restringir la salida a acciones que no pertenecen al usuario <b> %s </b>.
 AgendaUrlOptions4=<b>logint=%s</b> para restringir la salida a acciones asignadas al usuario <b>%s</b>.
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir la salida a acciones asociadas al proyecto <b>PROJECT_ID</b>.
 ExportDataset_event1=Lista de eventos de la agenda
 DefaultWorkingDays=Rango de días laborales por defecto en una semana (Example: 1-5, 1-6)
 DefaultWorkingHours=Horas laborales por defecto en un día (Ejemplo: 9-18)
 ExtSites=Importar calendarios externos
 ExtSitesEnableThisTool=Mostrar calendarios externos (definidos en la configuración global) en la agenda. No afecta a los calendarios externos definidos por los usuarios.
-AgendaExtNb=Número de calendario %s
 ExtSiteUrlAgenda=URL para acceder al archivo .iCal
 DateActionBegin=Fecha inicial del evento
 DateStartPlusOne=Fecha de inicio + 1 hr
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 7758cb9926c..559b3eb9c73 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -20,7 +20,6 @@ ThirdPartyName=Nombre de tercero
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
 ToCreateContactWithSameName=Creará automáticamente un contacto/dirección con la misma información en tercero. En la mayoría de los casos, incluso si su tercero es una persona física, la creación de un tercero solo es suficiente.
 ParentCompany=Empresa matriz
-ReportByCustomers=Reporte por clientes
 ReportByQuarter=Reporte por tasa
 CivilityCode=Código de civilidad
 RegisteredOffice=Oficina registrada
@@ -96,9 +95,6 @@ ProfId4MA=ID Prof. 4 (C.N.S.S.)
 ProfId5MA=ID. prof. 5 (I.C.E.)
 ProfId2MX=R.P. IMSS
 ProfId3PT=Prof Id 3 (número de registro comercial)
-ProfId1US=Prof ID
-VATIntra=Número de IVA
-VATIntraShort=Número de IVA
 VATIntraSyntaxIsValid=La sintaxis es válida
 ProspectCustomer=Cliente potencial / Cliente
 CustomerCard=Ficha del cliente
@@ -109,8 +105,6 @@ CompanyHasNoRelativeDiscount=Este cliente no tiene ningún descuento relativo po
 CompanyHasAbsoluteDiscount=Este cliente tiene descuento disponible (notas de crédito o anticipos) para <b> %s </b> %s
 CompanyHasCreditNote=Este cliente aún tiene notas de crédito por <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=Este cliente no tiene descuentos fijos disponibles
-CustomerAbsoluteDiscountAllUsers=Descuentos absolutos (otorgados por todos los usuarios)
-CustomerAbsoluteDiscountMy=Descuentos absolutos (otorgados por ti mismo)
 DiscountNone=Ninguno
 ContactId=ID de contacto
 NoContactDefinedForThirdParty=No se ha definido un contacto para este tercero
@@ -156,9 +150,6 @@ DolibarrLogin=Login de usuario
 ExportDataset_company_1=Terceros (Empresas / fundaciones / personas físicas) y propiedades
 ExportDataset_company_2=Contactos y propiedades
 ImportDataset_company_1=Terceros (Empresas / fundaciones / personas físicas) y propiedades
-ImportDataset_company_2=Contactos/Direciones (de terceros o no) y atributos
-ImportDataset_company_3=Datos bancarios
-ImportDataset_company_4=Terceros/Representantes de ventas (Afecta los usuarios representantes de ventas a empresas)
 DeleteFile=Borrar archivo
 ConfirmDeleteFile=¿Seguro que quieres borrar este archivo?
 AllocateCommercial=Asignado al representante de ventas
@@ -179,9 +170,7 @@ ManagingDirectors=Administrador(es) (CEO, Director, Presidente...)
 MergeOriginThirdparty=Tercero duplicado (tercero que deseas eliminar)
 MergeThirdparties=Combinar terceros
 ConfirmMergeThirdparties=¿Está seguro de que desea combinar este tercero en el actual? Todos los objetos enlazados (facturas, pedidos, ...) se moverán a terceros actuales, y luego se eliminará el tercero.
-ThirdpartiesMergeSuccess=Los terceros han sido combinados.
 SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
 SaleRepresentativeLastname=Apellido del representante de ventas
-ErrorThirdpartiesMerge=Hubo un error al eliminar los terceros. Por favor compruebe el log. Los cambios han sido revertidos.
 NewCustomerSupplierCodeProposed=Nuevo código de cliente o proveedor sugerido en código duplicado
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index b081addd6ea..72cb06a152d 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -123,6 +123,7 @@ AddressesForCompany=Direcciones para este tercero
 ActionsOnCompany=Eventos relacionados a este tercero
 ActionsOnMember=Eventos relacionados a éste miembro
 NActionsLate=%s tarde
+ToDo=Por hacer
 Filter=Filtrar
 FilterOnInto=Criterios de búsqueda '<strong>%s</strong>' en los campos %s
 RemoveFilter=Remover filtro
@@ -229,6 +230,7 @@ ValidateBefore=La tarjeta debe ser validada antes de usar esta característica
 Hidden=Oculto
 Source=Fuente
 Before=Antes de
+NewAttribute=Nuevo atributo
 AttributeCode=Código de atributo
 URLPhoto=URL de la foto/logotipo
 SetToDraft=Regresar a borrador
@@ -293,3 +295,4 @@ SearchIntoCustomerProposals=Propuestas de clientes
 SearchIntoSupplierProposals=Propuestas de proveedores
 SearchIntoExpenseReports=Reporte de gastos
 SearchIntoLeaves=Licencias
+AssignedTo=Asignado a
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index b1df43fc96a..a698f2a951a 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -46,7 +46,6 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta de contabilidad por defecto para los productos comprados (Usados sin no están en la hoja de producto)
 Sens=Significado
 Codejournal=Periódico
-DelBookKeeping=Eliminar registro del libro mayor
 FinanceJournal=Periodo Financiero
 TotalMarge=Margen total de ventas
 Modelcsv_CEGID=Exportar hacia CEGID Experto contable
diff --git a/htdocs/langs/es_PE/companies.lang b/htdocs/langs/es_PE/companies.lang
index 29e8843fc1e..a2e27a2a94f 100644
--- a/htdocs/langs/es_PE/companies.lang
+++ b/htdocs/langs/es_PE/companies.lang
@@ -1,6 +1,2 @@
 # Dolibarr language file - Source file is en_US - companies
-VATIsUsed=Sujeto a IGV
-VATIsNotUsed=No sujeto a IGV
-VATIntra=RUC
-VATIntraShort=RUC
 InActivity=Abrir
diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang
index a6c23feec21..01bcc7885de 100644
--- a/htdocs/langs/es_PE/compta.lang
+++ b/htdocs/langs/es_PE/compta.lang
@@ -1,11 +1,7 @@
 # Dolibarr language file - Source file is en_US - compta
-VATToPay=IGV ventas
 VATCollected=IGV recuperado
 PaymentVat=Pago IGV
 ShowVatPayment=Ver pagos IGV
 VATReportByCustomersInInputOutputMode=Informe por cliente del IGV repercutido y pagado (IGV pagado)
-VATReportByCustomersInDueDebtMode=Informe por cliente del IGV repercutido y pagado (IGV debido)
-VATReportByQuartersInInputOutputMode=Informe por tasa del IGV repercutido y pagado (IGV pagado)
-VATReportByQuartersInDueDebtMode=Informe por tasa del IGV repercutido y pagado (IGV debido)
 SeeVATReportInInputOutputMode=Ver el informe <b>%sIGV pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver el informe <b>%sIGV debido%s</b> para un modo de cálculo con la opción sobre lo debido
diff --git a/htdocs/langs/es_PR/compta.lang b/htdocs/langs/es_PR/compta.lang
index f4ba09c82b3..73de7873dd3 100644
--- a/htdocs/langs/es_PR/compta.lang
+++ b/htdocs/langs/es_PR/compta.lang
@@ -12,8 +12,6 @@ ShowVatPayment=Ver pagos IVU
 RulesResultDue=- Los importes mostrados son importes totales<br>- Incluye las facturas, cargas e IVU debidos, que estén pagadas o no.<br>- Se basa en la fecha de validación para las facturas y el IVU y en la fecha de vencimiento para las cargas.<br>
 RulesResultInOut=- Los importes mostrados son importes totales<br>- Incluye los pagos realizados para las facturas, cargas e IVU.<br>- Se basa en la fecha de pago de las mismas.<br>
 VATReportByCustomersInInputOutputMode=Informe por cliente del IVU repercutido y pagado (IVU pagado)
-VATReportByCustomersInDueDebtMode=Informe por cliente del IVU repercutido y pagado (IVU debido)
 VATReportByQuartersInInputOutputMode=Informe por tasa del IVU repercutido y pagado (IVU pagado)
-VATReportByQuartersInDueDebtMode=Informe por tasa del IVU repercutido y pagado (IVU debido)
 SeeVATReportInInputOutputMode=Ver el informe <b>%sIVU pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver el informe <b>%sIVU debido%s</b> para un modo de cálculo con la opción sobre lo debido
diff --git a/htdocs/langs/es_PY/companies.lang b/htdocs/langs/es_PY/companies.lang
deleted file mode 100644
index f99446d8dc2..00000000000
--- a/htdocs/langs/es_PY/companies.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-VATIntra=RUC
-VATIntraShort=RUC
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 6079989953b..9d2f86e0ae9 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -1,15 +1,39 @@
 # Dolibarr language file - Source file is en_US - admin
+VersionLastInstall=Versión de instalación inicial
+VersionLastUpgrade=Última actualización de la versión
+ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto desconectará a todos los usuarios (excepto a usted).
+NotConfigured=Módulo / Aplicación no configurada
 ModuleFamilyCrm=Gestión cliente (CRM)
 Module2660Desc=Habilitar los servicios web cliente de Dolibarr (puede ser utilizado para grabar datos/solicitudes de servidores externos. De momento solo se soporta pedidos a proveedor)
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
-Permission20002=Crear/modificar sus días retribuidos
+Permission1236=Exportar facturas de proveedores, atributos y pagos
+Permission1321=Exportar facturas a clientes, atributos y cobros
+Permission1421=Exportar pedidos de clientes y atributos
 Permission20003=Eliminar peticiones de días libres retribuidos
 Permission2402=Crear/eliminar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta
+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=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)
+ExtraFieldsMemberType=Atributos adicionales  (tipos de miembros)
+ExtraFieldsCustomerInvoices=Atributos adicionales (facturas a clientes)
+ExtraFieldsSupplierOrders=Atributos adicionales (pedidos a proveedores)
+ExtraFieldsSupplierInvoices=Atributos adicionales (facturas)
+ExtraFieldsProject=Atributos adicionales (proyectos)
+ExtraFieldsProjectTask=Atributos adicionales (tareas)
+ExtraFieldHasWrongValue=El atributo %s tiene un valor no válido
 SupplierProposalSetup=Configuración del módulo Solicitudes a proveedor
 SupplierProposalNumberingModules=Modelos de numeración de solicitud de precios a proveedor
 SupplierProposalPDFModules=Modelos de documentos de solicitud de precios a proveedores
 FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios a proveedores
 WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
+LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
+LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
+LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
diff --git a/htdocs/langs/es_VE/companies.lang b/htdocs/langs/es_VE/companies.lang
index 3700267ad16..b39081379b2 100644
--- a/htdocs/langs/es_VE/companies.lang
+++ b/htdocs/langs/es_VE/companies.lang
@@ -18,12 +18,11 @@ ProfId3GB=-
 ProfId1HN=-
 ProfId2MX=Registro Patronal IVSS
 ProfId3MX=-
-VATIntra=RIF
-VATIntraShort=RIF
 CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> anticipos disponibles
 VATIntraCheckDesc=El link <b>%s</b> permite consultar al SENIAT el RIF. Se requiere acceso a internet para que el servicio funcione
 VATIntraCheckURL=http://contribuyente.seniat.gob.ve/BuscaRif/BuscaRif.jsp
 VATIntraCheckableOnEUSite=Verificar en la web del SENIAT
 VATIntraManualCheck=Puede también realizar una verificación manual en la página del SENIAT <a href="%s" target="_blank">%s</a>
 ContactOthers=Otra
+ExportDataset_company_2=Contactos de terceros y atributos
 InActivity=Abierta
diff --git a/htdocs/langs/es_VE/compta.lang b/htdocs/langs/es_VE/compta.lang
index 5c2fb3f4e77..b94bc90d190 100644
--- a/htdocs/langs/es_VE/compta.lang
+++ b/htdocs/langs/es_VE/compta.lang
@@ -20,9 +20,7 @@ CalcModeLT1Rec=-
 CalcModeLT2=Modo <b>%sISLR en facturas a clientes - facturas de proveedores%s</b>
 CalcModeLT2Debt=Modo <b>%sISLR en facturas a clientes%s</b>
 CalcModeLT2Rec=Modo <b>%sISLR en facturas de proveedores%s</b>
-LT2ReportByCustomersInInputOutputModeES=Informe por tercero del ISLR
-LT1ReportByCustomersInInputOutputModeES=-
-LT1ReportByQuartersInInputOutputMode=-
-LT2ReportByQuartersInInputOutputMode=Informe de ISLR por tasa
-LT1ReportByQuartersInDueDebtMode=-
-LT2ReportByQuartersInDueDebtMode=Informe de ISLR por tasa
+LT1ReportByCustomersES=-
+LT2ReportByCustomersES=Informe por tercero del ISLR
+LT1ReportByQuartersES=-
+LT2ReportByQuartersES=Informe de ISLR por tasa
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index e7a0feae542..d37320995a8 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -28,6 +28,8 @@ LT1ES=Retención
 LT2ES=ISLR
 Opened=Abierta
 FindBug=Señalar un bug
+NewAttribute=Nuevo atributo
+AttributeCode=Código atributo
 LinkToOrder=Enlazar a un pedido
 Progress=Progresión
 Export=Exportación
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index d1dda54c0b9..7c5fda8bea0 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - products
 TMenuProducts=Productos y servicios
 ProductStatusNotOnBuyShort=Fuera compra
+PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como <b>#extrafield_myextrafieldkey#</b> y variables globales con <b>#global_mycode#</b>
diff --git a/htdocs/langs/es_VE/propal.lang b/htdocs/langs/es_VE/propal.lang
index f3e7695176c..fa7b05c6710 100644
--- a/htdocs/langs/es_VE/propal.lang
+++ b/htdocs/langs/es_VE/propal.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - propal
 PropalsOpened=Abierta
+PropalStatusValidatedShort=Validada
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 0ab54681bf1..2d98bec9264 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Kontoplaan
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Dokumendi tüüp
 Docdate=Kuupäev
 Docref=Viide
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Loomus
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Müügid
 AccountingJournalType3=Ostud
 AccountingJournalType4=Pank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 6aaa3f4b927..a3bbabd58af 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -4,7 +4,7 @@ Version=Versioon
 Publisher=Publisher
 VersionProgram=Programmi versioon
 VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastUpgrade=Viimane versiooniuuendus
 VersionExperimental=Eksperimentaalne
 VersionDevelopment=Arendusversioon
 VersionUnknown=Teadmata
@@ -107,7 +107,7 @@ MenuIdParent=Emamenüü ID
 DetailMenuIdParent=Emamenüü ID (juurmenüü korral tühi)
 DetailPosition=Järjekorranumber menüü asukoha määratlemiseks
 AllMenus=Kõik
-NotConfigured=Module/Application not configured
+NotConfigured=Moodul/Rakendus pole veel seadistatud
 Active=Aktiivne
 SetupShort=Seadistamine
 OtherOptions=Muud seaded
@@ -145,15 +145,15 @@ SystemToolsAreaDesc=Selles alas on administreerimise vahendid. Kasuta menüüd,
 Purge=Tühjenda
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Kustuta kõik ajutised failid (andmekao riski pole)
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Kustuta kõik failid kataloogis <b>%s</b>. Kustutatakse ajutised failid, andmebaasi varukoopiad, elementidega (kolmandad isikud, arved, ...) seotud failid ning dokumendihaldusse üles laetud failid.
 PurgeRunNow=Tühjenda nüüd
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=Pole ühtki faili ega kausta, mida kustutada.
 PurgeNDirectoriesDeleted=<b>%s</b> faili või kataloogi kustutatud.
 PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
 PurgeAuditEvents=Tühjenda kõik turvalisusega seotud sündmused
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=Kas oled kindel, et soovid turvalisusega seotud sündmuste tühjendamise? Kõik turvalogid kustutatakse, muud andmed jäetakse puutumata.
 GenerateBackup=Loo varukoopia
 Backup=Varunda
 Restore=Taasta
@@ -187,16 +187,16 @@ ExtendedInsert=Laiendatud INSERT
 NoLockBeforeInsert=Ära ümbritse INSERT käsku lukustuskäskudega
 DelayedInsert=Viivitustega sisestamine
 EncodeBinariesInHexa=Kodeeri binaarsed andmed kuueteistkümnendsüsteemis
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+IgnoreDuplicateRecords=Ignoreeri duplikaatkirjete põhjustatud vead (INSERT IGNORE)
 AutoDetectLang=Tuvasta automaatselt (brauseri keel)
 FeatureDisabledInDemo=Demoversioonis blokeeritud funktsionaalsus
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
+BoxesDesc=Kastid on ekraani ala, mis näitavad mõnedel lehekülgedel mingit infot. Kasti näitamise saab sisse või välja lülitada, valides soovitud lehe ning klõpsates nupul 'Aktiveeri' või klõpsates prügikastil selle välja lülitamiseks.
 OnlyActiveElementsAreShown=Näidatakse ainult elemente <a href="%s">sisse lülitatud moodulitest</a>.
-ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDesc=Dolibarri moodulid määravad, millist funktsionaalsust tarkvara võimaldab. Mõned moodulite puhul tuleb pärast mooduli sisse lülitamist lubada kasutajatele nende kasutamine. Klõpsa sisse/välja nupul "Staatus" veerus, et moodulit/funktsionaalsust sisse lülitada.
+ModulesMarketPlaceDesc=Alla laadimiseks leiad rohkem mooduleid Internetist.
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
+ModulesMarketPlaces=Otsi katsetuskärgus rakendusi/mooduleid
 ModulesDevelopYourModule=Develop your own app/modules
 ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
@@ -260,8 +260,8 @@ FontSize=Font size
 Content=Content
 NoticePeriod=Notice period
 NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
+Emails=E-postid
+EMailsSetup=E-posti seadistamine
 EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
 EmailSenderProfiles=Emails sender profiles
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS port (vaikimisi php.ini failis: <b>%s</b>)
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Viga: ei saa kasutada seadet @ iga aasta alguses l
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Viga: ei saa kasutada võimalust @, kui maskis ei sisaldu jada {yy} {mm} või {yyyy} {mm}.
 UMask=Umask parameeter uute failide loomiseks Unix/Linux/BSD/Mac failisüsteemidel.
 UMaskExplanation=See parameeter võimaldab määratleda Dolibarri poolt loodud failide vaikimise õigused (näiteks üleslaadimise ajal)<br> See peab olema kaheksandsüsteemi väärtus (nt 0666 tähendab lubada kõigile lugemise ja kirjutamise õigused)<br>Windows serveris seda parameetrit ei kasutata.
-SeeWikiForAllTeam=Vaata wiki lehte kõigi osaliste ja nende organisatsioonide täieliku nimekirja leidmiseks
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Eksportimise vastuse vahemällu salvestamise viivitus (0 või tühi vahemälu mitte kasutamiseks)
 DisableLinkToHelpCenter=Peida link "<b>Vajad abi või tuge</b>" sisselogimise lehel
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Muuda hindadel, mille baasväärtus on defineeritud kui
 MassConvert=Käivita massitöötlus
 String=Sõne
 TextLong=Pikk tekst
+HtmlText=Html text
 Int=Täisarv
 Float=Ujukomaarv
 DateAndTime=Kuupäev ja tund
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Hoiatus: <b>conf.php</b> sisaldab direktiivi <b>dolibarr_pdf_force_fpdf=1</b>. See tähendab, et PDF failide loomiseks kasutatakse FPDF teeki. FPDF teek on vananenud ja ei toeta paljusid võimalusi (Unicode, läbipaistvad pildid, kirillitsa, araabia ja aasia märgistikke jne), seega võib PDFi loomise ajal tekkida vigu.<br>Probleemide vältimiseks ja täieliku PDFi loomise toe jaoks palun lae alla <a href="http://www.tcpdf.org/" target="_blank">TCPDF teek</a> ning seejärel kommenteeri välja või kustuta rida <b>$dolibarr_pdf_force_fpdf=1</b> ja lisa rida <b>$dolibarr_lib_TCPDF_PATH='TCPDF_kausta_rada'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Sisesta telefoninumber, millele kasutaja helistab ClickToDial nupu testimisel <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Kasutajad ja grupid
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Marginaalid
 Module59000Desc=Marginaalide haldamise moodu
 Module60000Name=Komisjonitasu
 Module60000Desc=Komisjonitasude haldamise moodu
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Ressursid
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Müügiarvete vaatamine
@@ -833,11 +838,11 @@ Permission1251=Väliste andmete massiline import andmebaasi (andmete laadimine)
 Permission1321=Müügiarvete, atribuutide ja maksete eksport
 Permission1322=Reopen a paid bill
 Permission1421=Müügitellimuste ja atribuutide eksport
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Maksumärkide kogus
 DictionaryPaymentConditions=Maksetingimused
 DictionaryPaymentModes=Maksmine režiimid
 DictionaryTypeContact=Kontakti/Aadressi tüübid
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ökomaks (WEEE)
 DictionaryPaperFormat=Paberiformaadid
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Käibemaksu haldamine
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Vaikimisi pakutakse käibemaksumääraks 0, mida kasutavad näiteks mittetulundusühingud, eraisikud või väikesed ettevõtted.
-VATIsUsedExampleFR=Prantsusmaa juhul tähendab see ettevõtteid või organisatsioone, mis kasutavad real fiscal süsteemi (simplified real või normal real), ehk süsteemi, kus deklareeritakse käibemaks.
-VATIsNotUsedExampleFR=Prantsusmaal tähendab see ühendusi, mis ei ole käibemaksukohuslased, või ettevõtteid, organisatsioone või kutsetegevuse vallas tegutsejaid, kes kasutavad mikroettevõtte fiskaalsüsteemi (frantsiisi käibemaks) ning maksavad frantsiisi käibemaksu ise käibemaksu deklareerimata. See valik näitab arvetel viidet "Non applicable VAT - art-293B of CGI".
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Määr
 LocalTax1IsNotUsed=Ära kasuta teist maksu
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Draiveri tüüp
 SummarySystem=Süsteemiinfo kokkuvõte
 SummaryConst=Kõikide Dolibarri seadistusparameetrite nimekiri
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standardne menüü haldaja
 DefaultMenuSmartphoneManager=Nutitelefoni menüü haldaja
 Skin=Kesta kujundus
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Vasakus menüüs on alati otsingu vorm
 DefaultLanguage=Vaikimisi kasutatav keel (keele kood)
 EnableMultilangInterface=Luba mitmekeelne liides
 EnableShowLogo=Näita vasakul menüüs logo
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Nimi
 CompanyAddress=Aadress
 CompanyZip=Postiindeks
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Süsteemi info sisaldab mitmesugust tehnilist infot, mida ei saa muuta ning mis on nähtav vaid administraatoritele.
 SystemAreaForAdminOnly=Sellele alale saavad ligi ainult administraatorid. Ükski Dolibarri õigus ei saa seda piirangut eemaldada.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Siit saab muuta iga parameetrit, mis on seotud Dolibarri kujundusega
 AvailableModules=Available app/modules
 ToActivateModule=Moodulite aktiveerimiseks mine süsteemi seadistusesse (Kodu->Seadistamine->Moodulid).
@@ -1441,6 +1448,9 @@ SyslogFilename=Faili nimi ja rada
 YouCanUseDOL_DATA_ROOT=Võid kasutada DOL_DATA_ROOT/dolibarr.log Dolibarri "documents" kausta faili salvestamiseks, aga logifaili salvestamiseks võib ka mõnda muud rada kasutada.
 ErrorUnknownSyslogConstant=Konstant %s ei ole tuntud Syslogi konstant
 OnlyWindowsLOG_USER=Windows toetab vaid LOG_USER direktiivi
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Annetuste mooduli seadistamine
 DonationsReceiptModel=Annetuse kviitungi mall
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=KM kuupäev
-OptionVATDefault=Kassapõhine
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Tekkepõhine
 OptionVatDefaultDesc=KM on tingitud:<br>- kaupade üleandmisel (arve kuupäev)<br>- teenuste eest maksmisel
 OptionVatDebitOptionDesc=KM on tingitud:<br>- kaupade üleandmisel (arve kuupäev)<br>- arve esitamisel (deebet) teenuste eest
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Käibemaksu kõlbulikuks arvestamise vaikimisi aeg vastavalt määratletud seadetele:
 OnDelivery=Üleandmisel
 OnPayment=Maksmisel
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Kasutatakse arve kuupäeva
 Buy=Ost
 Sell=Müük
 InvoiceDateUsed=Kasutatakse arve kuupäeva
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Müügikonto kood
 AccountancyCodeBuy=Ostukonto kood
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 0511df23ff0..0296e8fb6d7 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Otsingutulemuste piiramiseks võib kasutada ka järgmisi param
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Hõivatud
@@ -109,7 +112,7 @@ ExportCal=Ekspordi kalender
 ExtSites=Impordi väline kalender
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Kalendrite arv
-AgendaExtNb=Kalendreid: %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL .ical failile ligi pääsemiseks
 ExtSiteNoLabel=Kirjeldus puudub
 VisibleTimeRange=Nähtav ajavahemik
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 32c8982b4b4..5448d580972 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Tagasi makstud
 DeletePayment=Kustuta makse
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Hankijate maksed
 ReceivedPayments=Laekunud maksed
 ReceivedCustomersPayments=Klientidelt laekunud maksed
@@ -91,7 +92,7 @@ PaymentAmount=Makse summa
 ValidatePayment=Kinnita makse
 PaymentHigherThanReminderToPay=Makse on suurem, kui makstava summa jääk
 HelpPaymentHigherThanReminderToPay=Tähelepanu, ühe või rohkema arve makse summa on kõrgem kui makstava summa jääk.<br>Muuda oma kannet või muul juhul kinnita see ja mõtle iga enammakstud arvega seotud kreeditarve loomisele.
-HelpPaymentHigherThanReminderToPaySupplier=Tähelepanu: ühe või enama makse summa on kõrgem kui makstava summa jääk.<br> Muuda oma kannet või kinnita see.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Liigita 'Makstud'
 ClassifyPaidPartially=Liigita 'Osaliselt makstud'
 ClassifyCanceled=Liigita 'Hüljatud'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Teisenda tuleviku allahindluseks
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Sisesta kliendilt saadud makse
 EnterPaymentDueToCustomer=Soorita kliendile makse
 DisabledBecauseRemainderToPayIsZero=Keelatud, sest järele jäänud maksmata on null
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Mustand (kinnitada)
 BillStatusPaid=Makstud
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Makstud (valmis lõpparveks)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Hüljatud
 BillStatusValidated=Kinnitatud (vajab maksmist)
 BillStatusStarted=Alustatud
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Ootel
 AmountExpected=Väidetav väärtus
 ExcessReceived=Liigne saadud
+ExcessPaid=Excess paid
 EscompteOffered=Soodustus pakutud (makse enne tähtaega)
 EscompteOfferedShort=Allahindlus
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Allahindlus kreeditarvelt %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Seda liiki krediiti saab kasutada arvel enne selle kinnitamist
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Uus summaline allahindlus
 NewRelativeDiscount=Uus protsentuaalne allahindlus
+DiscountType=Discount type
 NoteReason=Märkus/põhjus
 ReasonDiscount=Põhjus
 DiscountOfferedBy=Andis
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Arve aadress
 HelpEscompte=Kliendile anti see soodustus, kuna ta maksis enne tähtaega.
 HelpAbandonBadCustomer=Sellest summast on loobutud (kuna tegu olevat halva kliendiga) ning on loetud erandlikuks kaotuseks.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index a31d78c907c..b852ea4faba 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -43,7 +43,8 @@ Individual=Eraisik
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Emaettevõte
 Subsidiaries=Tütarettevõtted
-ReportByCustomers=Aruanne klientide alusel
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Aruanne määra alusel
 CivilityCode=Sisekorraeeskiri
 RegisteredOffice=Peakontor
@@ -75,10 +76,12 @@ Town=Linn
 Web=Veeb
 Poste= Ametikoht
 DefaultLang=Vaikimisi keel
-VATIsUsed=Käibemaksuga
-VATIsNotUsed=Käibemaksuta
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Pakkumised
 OverAllOrders=Tellimused
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=KMKR number
-VATIntraShort=KMKR number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Süntaks on kehtiv
+VATReturn=VAT return
 ProspectCustomer=Huviline/klient
 Prospect=Huviline
 CustomerCard=Kliendikaart
 Customer=Klient
 CustomerRelativeDiscount=Protsentuaalne kliendi allahindlus
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Protsentuaalne allahindlus
 CustomerAbsoluteDiscountShort=Summaline allahindlus
 CompanyHasRelativeDiscount=Sellel kliendil on vaikimisi allahindlus <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Sellel kliendil pole vaikimisi allahindlust
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Kliendil on kreeditarveid <b>%s %s</b> väärtuses
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Kliendil pole allahindluse krediiti
-CustomerAbsoluteDiscountAllUsers=Summalised allahindlused (antud kõigi kasutajate poolt)
-CustomerAbsoluteDiscountMy=Summalised allahindlused (antud minu poolt)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Pole
 Supplier=Hankija
 AddContact=Uus kontakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Dolibarri ligipääs puudub
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontaktid ja omadused
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontaktid/aadressid (k.a kolmandad isikud) ja nende atribuudid
-ImportDataset_company_3=Pangarekvisiidid
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Hinnatase
 DeliveryAddress=Tarneaadress
 AddAddress=Lisa aadress
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Hetkel maksmata summa
 OutstandingBill=Suurim võimalik maksmata arve
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Tagasta arv formaadiga %syymm-nnnn kliendikoodi jaoks ja %syymm-nnnn hankija koodi jaoks, kus yy on aasta, mm on kuu ja nnnn on katkestuseta jada, mille väärtus pole kunagi 0.
 LeopardNumRefModelDesc=Kood on vaba, seda saab igal ajal muuta.
 ManagingDirectors=Haldaja(te) nimi (CEO, direktor, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index d98301338bd..5d720ed98ec 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -31,7 +31,7 @@ Credit=Kreedit
 Piece=Konto dok.
 AmountHTVATRealReceived=Kogutud neto
 AmountHTVATRealPaid=Makstud neto
-VATToPay=KM müük
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF maksed
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näita käibemaksu makset
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- See sisaldab kõiki klientidelt laekunud jõustunud arvete maksmisi.<br> - See põhineb nende arvete maksekuupäevadel<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Kolmandate isikute IRPFi aruanne
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Kolmandate isikute IRPFi aruanne
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Sisend- ja väljundkäibemaks kliendi alusel
-VATReportByCustomersInDueDebtMode=Sisend- ja väljundkäibemaks kliendi alusel
-VATReportByQuartersInInputOutputMode=Sisend- ja väljundkäibemaks käibemaksumäärade järgi
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Sisend- ja väljundkäibemaks käibemaksumäärade järgi
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Vaata aruannet <b>%sKM suletud%s</b> standardse arvutamise jaoks
 SeeVATReportInDueDebtMode=Vaata aruannet <b>%sKM voo põhjalw%s</b> voopõhise arvutamise jaoks
 RulesVATInServices=- Teenuste puhul sisaldab aruanne reaalselt saadud või makstud KM maksekuupäeva alusel
-RulesVATInProducts=- Materiaalse vara puhul sisaldab see arvete KM arve kuupäeva põhjal.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Teenuste puhul sisaldab see aruanne KM kohustust aktiivsete arvete jaoks, hoolimata nende maksmise staatusest, arve kuupäeva põhjal.
-RulesVATDueProducts=- Materiaalse vara puhul sisaldab see arvete KM arve kuupäeva põhjal.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Märkus: materiaalse vara puhul peaks see kasutama aususe huvides kohalejõudmise kuupäeva.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/arve
 NotUsedForGoods=Ei kasutata kaupadel
 ProposalStats=Pakkumiste statistika
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, <b>kassapõhist raamatupidamist</b> kasutades pole režiim oluline. See aruanne on saadaval vaid <b>tekkepõhist raamatupidamist</b> kasutades (vaata raamatupidamise mooduli seadistust).
 CalculationMode=Arvutusrežiim
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index 1c8e04cd014..edf8cd714cf 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Pole ühtki registreeritud programm
 CronPriority=Prioriteet
 CronLabel=Nimi
 CronNbRun=Käivituste arv
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Iga
 JobFinished=Tegevus käivitatud ja lõpetatud
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Kellelt
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Käsurea käsk
-CronCannotLoadClass=Klassi %s või objekti %s laadimine ebaõnnestus
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 940d0719bc9..e6e038cc4d7 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP sobitamine ei ole täielik.
 ErrorLDAPMakeManualTest=Kausta %s on loodud .ldif fail. Vigade kohta lisainfo saamiseks proovi selle käsitsi käsurealt laadimist.
 ErrorCantSaveADoneUserWithZeroPercentage=Ülesanne, mille staatuseks on 'Alustamata' ei saa salvestada, kui väli "Tegevuse teinud isik" on samuti täidetud.
 ErrorRefAlreadyExists=Loomiseks kasutatav viide on juba olemas.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Kirje %s Mailmani listi %s või SPIPi baasi lisami
 ErrorFailedToRemoveToMailmanList=Kirje %s Mailmaini listist %s või SPIPi baasist eemaldamine ebaõnnestus
 ErrorNewValueCantMatchOldValue=Uus väärtus ei saa olla vanaga võrdne
 ErrorFailedToValidatePasswordReset=Parooli uuesti initsialiseerimine ebaõnnestus. Võib-olla on uuesti initsialiseerimine juba tehtud (antud linki saab kasutada vaid ühe korra). Kui ei, siis proovi uuesti initsialiseerida.
-ErrorToConnectToMysqlCheckInstance=Ei õnnestunud andmebaasiga ühendust saada. Kontrolli, et MySQLi serveri töötab (paljudel juhtudel saad selle käivitada käsurealt käsuga 'sudo /etc/init.d/mysql start').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Kontakti lisamine ebaõnnestus
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Makseviis on seatud tüübile %s, kuid Arved mooduli seadistamine ei ole täielik ning selle makseviisi jaoks näidatav info on määratlemata.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/et_EE/loan.lang b/htdocs/langs/et_EE/loan.lang
index 221115f9311..c11a2dfc08c 100644
--- a/htdocs/langs/et_EE/loan.lang
+++ b/htdocs/langs/et_EE/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index c7f2862b3fe..c95ad08c5d7 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 53d00323c8d..f1a8ff87ef5 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameeter %s on määratlemata
 ErrorUnknown=Tundmatu viga
 ErrorSQL=SQLi viga
 ErrorLogoFileNotFound=Ei leidnud logo faili '%s'
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Kasuta selle parandamiseks 'Moodulid' halduspaneeli
 ErrorFailedToSendMail=E-kirja saatmine ebaõnnestus (saatja = %s, vastuvõtja = %s)
 ErrorFileNotUploaded=Ei õnnestunud faili üles laadida. Kontrolli järgmist: fail ei ületa lubatud suurust, serveri kettal on vaba ruumi ning sama nimega faili ei oleks samas kaustas.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Viga: riigi '%s' jaoks ei ole käibemaksum
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Viga: faili salvestamine ebaõnnestus.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Sea kuupäev
 SelectDate=Vali kuupäev
 SeeAlso=Vaata lisaks %s
 SeeHere=Vaata siia
+ClickHere=Klõpsa siia
+Here=Here
 Apply=Rakenda
 BackgroundColorByDefault=Vaikimisi taustavärv
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Seosta
 Select=Vali
 Choose=Vali
 Resize=Muuda suurust
+ResizeOrCrop=Resize or Crop
 Recenter=Tsentreeri
 Author=Autor
 User=Kasutaja
@@ -325,8 +328,10 @@ Default=Vaikimisi
 DefaultValue=Vaikeväärtus
 DefaultValues=Default values
 Price=Hind
+PriceCurrency=Price (currency)
 UnitPrice=Ühiku hind
 UnitPriceHT=Ühiku hind (neto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Ühiku hind
 PriceU=ÜH
 PriceUHT=ÜH (neto)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Arve summa
+AmountInvoiced=Amount invoiced
 AmountPayment=Makse summa
 AmountHTShort=Summa (neto)
 AmountTTCShort=Summa (koos km-ga)
@@ -353,6 +359,7 @@ AmountLT2ES=IRPF summa
 AmountTotal=Kogusumma
 AmountAverage=Keskmine summa
 PriceQtyMinHT=Koguse hind min (km-ta)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Protsent
 Total=Kokku
 SubTotal=Vahesumma
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Maksumäär
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Keskmine
 Sum=Summa
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Lõpetatud
 ActionUncomplete=Lõpuni viimata
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Selle kolmanda isikuga seotud kontaktid
 ContactsAddressesForCompany=Selle kolmanda isikuga seotud kontaktid/aadressid
 AddressesForCompany=Selle kolmanda isikuga seotud aadressid
@@ -427,6 +437,9 @@ ActionsOnCompany=Selle kolmanda isikuga seotud tegevused
 ActionsOnMember=Selle liikmega seotud tegevused
 ActionsOnProduct=Events about this product
 NActionsLate=%s hiljaks jäänud
+ToDo=Teha
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Nõue on juba salvestatud
 Filter=Filtreeri
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Hoiatus: hooldusrežiim on aktiivne, praegu on ra
 CoreErrorTitle=Süsteemi viga
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Krediitkaart
+ValidatePayment=Kinnita makse
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Väljad omadusega <b>%s</b> on kohustuslikud
 FieldsWithIsForPublic=Väljad <b>%s</b> omadusega kuvatakse avalikus liikmete nimekirjas. Kui soovid seda välja lülitada, võta märge maha "avalik" kastilt.
 AccordingToGeoIPDatabase=(vastavalt GeoIP andmebaasi teisendusele)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Liigita arve esitatud
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Klõpsa siia
 FrontOffice=Front office
 BackOffice=Keskkontor
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekt
 Projects=Projektid
 Rights=Õigused
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Esmaspäev
 Tuesday=Teisipäev
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Kolmandad isikud
 SearchIntoContacts=Kontaktid
 SearchIntoMembers=Liikmed
 SearchIntoUsers=Kasutajad
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Kõik
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Mõjutatud isik
diff --git a/htdocs/langs/et_EE/margins.lang b/htdocs/langs/et_EE/margins.lang
index c948f07fd9c..6bb758f4814 100644
--- a/htdocs/langs/et_EE/margins.lang
+++ b/htdocs/langs/et_EE/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 4126d517484..b8e9cdb78dc 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Avalike kinnitatud liikmete nimekiri
 ErrorThisMemberIsNotPublic=See liige ei ole avalik
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Mõni muu liige (nimi: <b>%s</b>, kasutajanimi: <b>%s</b>) on juba seostatud kolmanda isikuga <b>%s</b>. Esmalt eemalda see seos, kuna kolmandat isikuga ei saa siduda vaid liikmega (ja vastupidi).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Turvalisuse huvides peavad sul olema õigused muuta kõiki kasutajaid enne seda, kui oled võimeline liiget siduma kasutajaga, kes ei ole sina.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Sinu liikmekaardi sisu
 SetLinkToUser=Seosta Dolibarri kasutajaga
 SetLinkToThirdParty=Seosta Dolibarri kolmanda isikuga
 MembersCards=Liikmete visiitkaardid
@@ -108,17 +106,33 @@ PublicMemberCard=Liikme avalik kaar
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Kuva liikmelisus
-SendAnEMailToMember=Saada informatsioon e-posti teel liikmele
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Sinu liikmekaardi sisu
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Külalise automaatse liikmeks astumise puhul saadetava e-kirja teema
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Külalise automaatse liikmeks astumise puhul saadetav e-kir
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-kirja teema liikme automaatse liitumise puhul
-DescADHERENT_AUTOREGISTER_MAIL=E-kiri liikme automaatse liitumise puhul
-DescADHERENT_MAIL_VALID_SUBJECT=E-kirja teema liikme kinnitamisel
-DescADHERENT_MAIL_VALID=E-kiri liikme kinnitamisel
-DescADHERENT_MAIL_COTIS_SUBJECT=E-kirja teema liikmeks astumisel
-DescADHERENT_MAIL_COTIS=E-kiri liikmeks astumisel
-DescADHERENT_MAIL_RESIL_SUBJECT=E-kirja teema liikmelisuse tühistamisel
-DescADHERENT_MAIL_RESIL=E-kiri liikmelisuse tühistamisel
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Automaatsete e-kirjade saatja aadress
 DescADHERENT_ETIQUETTE_TYPE=Siltide lehe formaat
 DescADHERENT_ETIQUETTE_TEXT=Liikmete aadressikaartidele trükitav tekst
@@ -177,3 +191,8 @@ NoVatOnSubscription=Liikmemaksudel ei ole KM
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 71db0236d9a..4db8fc2d614 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Kinnitatud makse lehel olev sõnum
 MessageKO=Tühistatud makse lehel olev sõnum
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Seostatud objekt
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Alusta üles laadimist
 CancelUpload=Tühista üles laadimine
 FileIsTooBig=Failid on liiga suured
 PleaseBePatient=Palun ole kannatlik...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Sinu Dolibarri parooli muutmise palve on kohale jõudnud
 NewKeyIs=Uued sisselogimise tunnused
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Tiitel
 WEBSITE_DESCRIPTION=Kirjeldus
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/et_EE/paypal.lang b/htdocs/langs/et_EE/paypal.lang
index e8798db2d65..1ab35e4e17f 100644
--- a/htdocs/langs/et_EE/paypal.lang
+++ b/htdocs/langs/et_EE/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Ainult PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=See on tehingu ID: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Lisa PayPali makse URL, kui dokument saadetakse postiga
-PredefinedMailContentLink=Kui makset ei ole veel sooritatud, võid klõpsata allpool asuval lingil makse sooritamiseks (PayPal).\n\n%s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index fcf07a643cd..04162735b32 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Toode või teenus
 ProductsAndServices=Tooted ja teenused
 ProductsOrServices=Tooted või teenused
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Kas oled täiesti kindel, et soovid antud toote rea kus
 ProductSpecial=Eriline
 QtyMin=Minimaalne kogus
 PriceQtyMin=Antud min koguse hind (allahindluseta)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=KM määr (selle hankija/toote jaoks)
 DiscountQtyMin=Vaikimisi allahindlus kogusele
 NoPriceDefinedForThisSupplier=Antud hankija/toote jaoks pole määratletud hinda/kogust
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 8a372222602..780168996fc 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Projekti kontaktid
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Kõik projektid
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=See vaade esitab kõik projektid, mida sul on lubatud vaadata.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata.
 ProjectsDesc=See vaade näitab kõiki projekte (sinu kasutajaõigused annavad ligipääsu kõigele)
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Aega kulutatud
 MyTimeSpent=Minu poolt kulutatud aeg
+BillTime=Bill the time spent
 Tasks=Ülesanded
 Task=Ülesanne
 TaskDateStart=Ülesande alguse kuupäev
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Antud projektiga seotud tegevuste nimekiri
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Projekti aktiivsus sellel nädalal
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Projekti aktiivsus sellel kuul
 ActivityOnProjectThisYear=Projekti aktiivsus sellel aastal
 ChildOfProjectTask=Projekti/ülesande tütar
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Ei ole antud privaatse projekti omani
 AffectedTo=Eraldatud üksusele
 CantRemoveProject=Projekti ei saa kustutada, kuna sellele viitab mingi muu objekt (arve, leping vms). Vaata viitajate sakki
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Ülesande kuupäeva ei ole võimalik nihutada vastavalt uuele projekti alguskuupäevale
 ProjectsAndTasksLines=Projektid ja ülesanded
 ProjectCreatedInDolibarr=Projekt %s on loodud
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Ülesanne %s on loodud
 TaskModifiedInDolibarr=Ülesannet %s on muudetud
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/et_EE/propal.lang b/htdocs/langs/et_EE/propal.lang
index c174f858918..91191d2e5f7 100644
--- a/htdocs/langs/et_EE/propal.lang
+++ b/htdocs/langs/et_EE/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Allkirjastatud (vaja arve esitada)
 PropalStatusNotSigned=Allkirjastamata (suletud)
 PropalStatusBilled=Arve esitatud
 PropalStatusDraftShort=Mustand
+PropalStatusValidatedShort=Kinnitatud
 PropalStatusClosedShort=Suletud
 PropalStatusSignedShort=Allkirjastatud
 PropalStatusNotSignedShort=Allkirjastamata
diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
index fd159ea6046..d0f6afeb0a5 100644
--- a/htdocs/langs/et_EE/salaries.lang
+++ b/htdocs/langs/et_EE/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index c4c48a4b061..2d0caee5fed 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Muuda ladu
 MenuNewWarehouse=Uus ladu
 WarehouseSource=Lähteladu
 WarehouseSourceNotDefined=Ühtki ladu pole määratletud.
+AddWarehouse=Create warehouse
 AddOne=Lisa üks
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Sihtladu
 ValidateSending=Kustuta saatmine
 CancelSending=Tühista saatmine
@@ -22,6 +24,7 @@ Movements=Liikumised
 ErrorWarehouseRefRequired=Lao viide on nõutud
 ListOfWarehouses=Ladude nimekiri
 ListOfStockMovements=Laojääkide nimekiri
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/et_EE/stripe.lang b/htdocs/langs/et_EE/stripe.lang
index e458eb0f6ab..638d5134b67 100644
--- a/htdocs/langs/et_EE/stripe.lang
+++ b/htdocs/langs/et_EE/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
index d54a03ccd95..b766555ace6 100644
--- a/htdocs/langs/et_EE/trips.lang
+++ b/htdocs/langs/et_EE/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Summa või kilomeetrites
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index c98b06b47bc..2f7ce90a257 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -69,8 +69,8 @@ InternalUser=Sisemine kasutaja
 ExportDataset_user_1=Dolibarr kasutajad ja omadused
 DomainUser=Domeeni kasutaja %s
 Reactivate=Aktiveeri uuesti
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Õigus on antud, kuna see pärineb mõnest grupist, kuhu kasutaja kuulub
 Inherited=Päritud
 UserWillBeInternalUser=Loodav kasutaja on sisemine kasutaja (kuna ei ole seotud mõne kolmanda isikuga)
@@ -93,6 +93,7 @@ NameToCreate=Loodava kolmanda isiku nimi
 YourRole=Sinu rollid
 YourQuotaOfUsersIsReached=Sinu aktiivsete kasutajate kvoot on täis!
 NbOfUsers=Kasutajaid
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Ainult superadministraator saab ära võtta superadministraatori õigusi
 HierarchicalResponsible=Supervisor
 HierarchicView=Struktuuri vaade
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index cc369c00dfe..bb3decc822f 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Loe
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 82819162b79..0636e5a468c 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Töödelda
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Kolmanda isiku pangakood
-NoInvoiceCouldBeWithdrawed=Ei õnnestunud ühegi arvega seotud väljamakset teha. Kontrolli, et arve on seotud kehtiva BANiga ettevõttega.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Määra krediteerituks
 ClassCreditedConfirm=Kas oled kindel, et soovid selle väljamakse kviitungi liigitada pangakontole krediteerituks?
 TransData=Saatmise kuupäev
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 90b81a63666..9234fa9e405 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=Katea
 TextLong=Testu luzea
+HtmlText=Html text
 Int=Zenbaki osoa
 Float=Zenbaki hamartarra
 DateAndTime=Data eta ordua
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Erabiltzaileak & Taldeak
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Marjinak
 Module59000Desc=Marjinak kudeatzeko modulua
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Bezeroen fakturak ikusi
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=BEZ-a kudeatzea
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Izena
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=Fitxategiaren izena eta kokapena
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=%s konstantea ez da Syslog-eko konstante ezaguna
 OnlyWindowsLOG_USER=Windows-ek LOG_USER soilik jasaten du
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index e2014086e5a..ba46a5ae18a 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 89329a0e1ab..fa5fcddcf05 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Ordainketa ezabatu
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Hornitzaileei ordainketak
 ReceivedPayments=Jasotako ordainketak
 ReceivedCustomersPayments=Bezeroen jasotako ordainketak
@@ -91,7 +92,7 @@ PaymentAmount=Ordainketaren zenbatekoa
 ValidatePayment=Ordainketak balioztatu
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index a79936ea3bf..9dc9e6d8420 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Posizioa
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposamenak
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=BEZ zenbakia
-VATIntraShort=BEZ zenbakia
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Bezeroa
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Hornitzailea
 AddContact=Kontaktua sortu
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index fbdf40a63a6..1f50554a2d9 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index 884e077b96e..d2da7ded67e 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/eu_ES/loan.lang b/htdocs/langs/eu_ES/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/eu_ES/loan.lang
+++ b/htdocs/langs/eu_ES/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 10bc964d2d1..7fb75aa5175 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index e9c4dee6169..26c1565229e 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Esteka
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=Erabiltzailea
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Prezioa
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Ordainketaren zenbatekoa
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Iragazia
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Ordainketak balioztatu
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Proiektuak
 Rights=Baimenak
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Kontratuak
 SearchIntoMembers=Kideak
 SearchIntoUsers=Erabiltzaileak
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/eu_ES/margins.lang b/htdocs/langs/eu_ES/margins.lang
index 62df6d644a4..7d5506f6880 100644
--- a/htdocs/langs/eu_ES/margins.lang
+++ b/htdocs/langs/eu_ES/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 53b15c38d77..4df74aea9c3 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index c3b728c9931..bae24449fa4 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Deskribapena
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/eu_ES/paypal.lang b/htdocs/langs/eu_ES/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/eu_ES/paypal.lang
+++ b/htdocs/langs/eu_ES/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index c00526a519e..df077e0d5a8 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index ae7bfdb824a..70e1457a0ee 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/eu_ES/propal.lang b/htdocs/langs/eu_ES/propal.lang
index 5f3c441bb0d..04941e4c650 100644
--- a/htdocs/langs/eu_ES/propal.lang
+++ b/htdocs/langs/eu_ES/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index abd106f1da7..1d4ebd7f54f 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 909ab7d9603..6fd65070e8c 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/eu_ES/stripe.lang b/htdocs/langs/eu_ES/stripe.lang
index 34420a57467..c8cf25aa87d 100644
--- a/htdocs/langs/eu_ES/stripe.lang
+++ b/htdocs/langs/eu_ES/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
index c90e92661df..85bfa669138 100644
--- a/htdocs/langs/eu_ES/trips.lang
+++ b/htdocs/langs/eu_ES/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index 33b29d8dfc5..8bd8fb5f88d 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -69,8 +69,8 @@ InternalUser=Barneko erabiltzailea
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index 0b56dc760b0..a2baa7dcf07 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 7cfb9e9c178..61889177e87 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=نمودار حساب ها
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=نوع سند
 Docdate=تاریخ
 Docref=مرجع
-Code_tiers=Thirdparty
 LabelAccount=برچسب حساب
 LabelOperation=Label operation
 Sens=SENS
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=پرداخت صورت حساب مشتری
-ThirdPartyAccount=حساب Thirdparty
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=طبیعت
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=فروش
 AccountingJournalType3=خرید
 AccountingJournalType4=بانک
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 31c2050f43e..66412163c61 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=خطا، می تواند گزینه ای @ است
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خطا، می تواند گزینه ای @ استفاده کنید اگر دنباله {YY} {میلی متر} یا {تاریخ برای ورود yyyy} {میلی متر} در ماسک نیست.
 UMask=پارامتر UMask برای فایل های جدید در فایل یونیکس / لینوکس / BSD / مک سیستم.
 UMaskExplanation=این پارامتر به شما اجازه تعریف اجازه انتخاب به طور پیش فرض بر روی فایل های ایجاد شده توسط Dolibarr بر روی سرور (در آپلود به عنوان مثال). <br> باید آن را به ارزش هشت هشتی (به عنوان مثال، 0666 به معنای خواندن و نوشتن برای همه) باشد. <br> این پارامتر در سرور ویندوز بی فایده است.
-SeeWikiForAllTeam=نگاهی به صفحه ویکی برای لیست کامل از تمام بازیگران و سازمان خود را
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= تاخیر برای ذخیره پاسخ صادرات در ثانیه (0 یا خالی بدون هیچ کش)
 DisableLinkToHelpCenter=مخفی کردن لینک <b>"آیا نیازمند کمک و یا حمایت"</b> در صفحه ورود
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=تغییر در قیمت با ارزش پایه مرجع 
 MassConvert=راه اندازی توده تبدیل
 String=رشته
 TextLong=متن طولانی
+HtmlText=Html text
 Int=عدد صحیح
 Float=شناور
 DateAndTime=تاریخ و ساعت
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=اخطار: <b>conf.php</b> شما شامل <b>dolibarr_pdf_force_fpdf</b> بخشنامه <b>= 1.</b> این به این معنی شما استفاده از کتابخانه FPDF برای تولید فایل های PDF. این کتابخانه قدیمی است و بسیاری از ویژگی های (یونیکد، شفافیت تصویر، زبان سیریلیک، عربی و آسیایی، ...) را پشتیبانی نمی کند، بنابراین شما ممکن است خطا در PDF نسل را تجربه کنند. <br> برای حل این و دارای پشتیبانی کامل از PDF نسل، لطفا دانلود کنید <a href="http://www.tcpdf.org/" target="_blank">کتابخانه TCPDF</a> ، پس از آن اظهار نظر و یا حذف خط <b>$ dolibarr_pdf_force_fpdf = 1،</b> و اضافه کردن به جای <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=شماره تلفن را وارد کنید تماس بگیرید برای نشان دادن یک لینک برای تست آدرس ClickToDial برای <strong>کاربر٪ s را</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=کاربران و گروه های
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=حاشیه
 Module59000Desc=ماژول برای مدیریت حاشیه
 Module60000Name=کمیسیون ها
 Module60000Desc=ماژول برای مدیریت کمیسیون
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=منابع
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=خوانده شده فاکتورها مشتری
@@ -833,11 +838,11 @@ Permission1251=اجرای واردات انبوه از داده های خارج
 Permission1321=فاکتورها صادرات به مشتریان، ویژگی ها و پرداخت ها
 Permission1322=Reopen a paid bill
 Permission1421=سفارشات صادرات مشتری و ویژگی های
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=مقدار تمبر درآمد
 DictionaryPaymentConditions=شرایط پرداخت
 DictionaryPaymentModes=حالت های پرداخت
 DictionaryTypeContact=انواع تماس / آدرس
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=فرمت مقاله
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=مدیریت مالیات بر ارزش افزوده
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=به طور پیش فرض مالیات بر ارزش افزوده ارائه شده است 0 که می تواند برای موارد مانند ارتباط استفاده می شود، افراد عضو جدید می توانید شرکت های کوچک است.
-VATIsUsedExampleFR=در فرانسه، به این معنی شرکت و یا سازمان داشتن یک سیستم مالی واقعی (ساده شده واقعی یا عادی واقعی). یک سیستم است که در آن مالیات بر ارزش افزوده اعلام شده است.
-VATIsNotUsedExampleFR=در فرانسه، به این معنی انجمن هایی که بدون مالیات بر ارزش افزوده اعلام کرد و شرکت ها، سازمان ها و یا حرفه های لیبرال که انتخاب کرده اند سیستم میکرو به شرکت های مالی (مالیات بر ارزش افزوده در حق رای دادن) و بدون اعلان مالیات بر ارزش افزوده پرداخت مالیات بر ارزش افزوده حق رای دادن. در فاکتورها - این انتخاب خواهد شد مرجع "هنر 293B از CGI مالیات بر ارزش افزوده قابل اعمال غیر" نشان می دهد.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=نرخ
 LocalTax1IsNotUsed=آیا مالیات دوم استفاده نکنید
@@ -977,7 +983,7 @@ Host=سرور
 DriverType=نوع درایور
 SummarySystem=سیستم خلاصه اطلاعات
 SummaryConst=فهرست تمام پارامترهای راه اندازی Dolibarr
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= مدیر منوی استاندارد
 DefaultMenuSmartphoneManager=مدیر منو گوشی های هوشمند
 Skin=تم پوست
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=فرم جستجو دائمی در منوی سمت چپ
 DefaultLanguage=زبان پیش فرض برای استفاده از (زبان)
 EnableMultilangInterface=فعال کردن رابط کاربری چند زبانه
 EnableShowLogo=نمایش لوگو را در منوی سمت چپ
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=نام
 CompanyAddress=نشانی
 CompanyZip=زیپ
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=اطلاعات سیستم اطلاعات فنی موارد دیگر شما در حالت فقط خواندنی و قابل مشاهده فقط برای مدیران دریافت می باشد.
 SystemAreaForAdminOnly=این منطقه در دسترس است فقط برای کاربران مدیر سیستم باشد. هیچ یک از مجوز Dolibarr می تواند از این حد کاهش دهد.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=شما می توانید هر پارامتر مربوط به نگاه Dolibarr را انتخاب کنید و احساس می کنید در اینجا
 AvailableModules=Available app/modules
 ToActivateModule=برای فعال کردن ماژول ها، رفتن در منطقه راه اندازی (صفحه اصلی> راه اندازی-> ماژول).
@@ -1441,6 +1448,9 @@ SyslogFilename=نام فایل و مسیر
 YouCanUseDOL_DATA_ROOT=شما می توانید DOL_DATA_ROOT / dolibarr.log برای یک فایل در "اسناد" Dolibarr دایرکتوری استفاده کنید. شما می توانید راه های مختلفی را برای ذخیره این فایل را.
 ErrorUnknownSyslogConstant=٪ ثابت است ثابت های Syslog شناخته نشده است
 OnlyWindowsLOG_USER=ویندوز تنها پشتیبانی از LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=راه اندازی ماژول کمک مالی
 DonationsReceiptModel=الگو از دریافت کمک مالی
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=مالیات بر ارزش افزوده به دلیل
-OptionVATDefault=مبنای نقدی
+OptionVATDefault=Standard basis
 OptionVATDebitOption=مبنای تعهدی
 OptionVatDefaultDesc=مالیات بر ارزش افزوده است به دلیل: <br> - تحویل کالا (ما استفاده از تاریخ فاکتور) <br> - در پرداختهای مربوط به خدمات
 OptionVatDebitOptionDesc=مالیات بر ارزش افزوده است به دلیل: <br> - تحویل کالا (ما استفاده از تاریخ فاکتور) <br> - در فاکتور (بدهی) برای خدمات
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=زمان exigibility مالیات بر ارزش افزوده به طور پیش فرض با توجه به گزینه انتخاب شده:
 OnDelivery=در هنگام تحویل
 OnPayment=در پرداخت
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=تاریخ فاکتور استفاده می شود
 Buy=خرید
 Sell=فروش
 InvoiceDateUsed=تاریخ فاکتور استفاده می شود
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=حساب فروش. رمز
 AccountancyCodeBuy=خرید حساب. رمز
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index de771440507..cc4818752e5 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=شما همچنین می توانید پارامترهای ز
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=مشغول
@@ -109,7 +112,7 @@ ExportCal=تقویم صادرات
 ExtSites=واردات تقویم خارجی
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=شماره تقویم
-AgendaExtNb=تقویم توجه از٪ s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=فایل مقرون URL برای دسترسی به.
 ExtSiteNoLabel=بدون شرح
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 42fbad4185b..25f4f69129f 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -67,6 +67,7 @@ PaidBack=پرداخت به عقب
 DeletePayment=حذف پرداخت
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=تولید کنندگان پرداخت
 ReceivedPayments=دریافت پرداخت
 ReceivedCustomersPayments=پرداخت دریافت از مشتریان
@@ -91,7 +92,7 @@ PaymentAmount=مقدار پرداخت
 ValidatePayment=اعتبار پرداخت
 PaymentHigherThanReminderToPay=پرداخت بالاتر از یادآوری به پرداخت
 HelpPaymentHigherThanReminderToPay=توجه، مقدار پرداخت یک یا چند صورت حساب بالاتر از بقیه به پرداخت است. <br> ویرایش ورود خود را، در غیر این صورت تایید و فکر می کنم در مورد ایجاد توجه داشته باشید اعتباری بیش از حد دریافت شده در هر فاکتورها پرداخت.
-HelpPaymentHigherThanReminderToPaySupplier=توجه، مقدار پرداخت یک یا چند صورت حساب بالاتر از بقیه به پرداخت است. <br> ویرایش ورود خود را، در غیر این صورت تایید.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=طبقه بندی 'پرداخت'
 ClassifyPaidPartially=طبقه بندی 'پرداخت تا حدی'
 ClassifyCanceled=طبقه بندی 'رها'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=تبدیل به تخفیف آینده
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=پرداخت های دریافت شده از مشتری را وارد کنید
 EnterPaymentDueToCustomer=پرداخت با توجه به مشتری
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=پیش نویس (نیاز به تایید می شود)
 BillStatusPaid=پرداخت
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=پرداخت (آماده برای فاکتور نهایی)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=متروک
 BillStatusValidated=اعتبار (نیاز به پرداخت می شود)
 BillStatusStarted=آغاز شده
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=در انتظار
 AmountExpected=مقدار ادعا
 ExcessReceived=اضافی دریافت
+ExcessPaid=Excess paid
 EscompteOffered=تخفیف ارائه شده (پرداخت قبل از ترم)
 EscompteOfferedShort=تخفیف
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=تخفیف از اعتبار توجه داشته باشید از٪ s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=این نوع از اعتبار را می توان در صورتحساب قبل از اعتبار آن استفاده می شود
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=تخفیف های جدید مطلق
 NewRelativeDiscount=تخفیف نسبی جدید
+DiscountType=Discount type
 NoteReason=توجه داشته باشید / عقل
 ReasonDiscount=دلیل
 DiscountOfferedBy=اعطا شده از
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=آدرس بیل
 HelpEscompte=این تخفیف تخفیف اعطا شده به مشتری است، زیرا پرداخت آن قبل از واژه ساخته شده است.
 HelpAbandonBadCustomer=این مقدار متوقف شده (مشتری گفته می شود یک مشتری بد) است و به عنوان یک شل استثنایی در نظر گرفته.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 2030fbac785..e34a7cbde5e 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -43,7 +43,8 @@ Individual=فردی خصوصی
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=شرکت مادر
 Subsidiaries=شرکتهای تابعه
-ReportByCustomers=گزارش های مشتریان
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=گزارش های نرخ
 CivilityCode=کد تمدن
 RegisteredOffice=دفتر ثبت نام
@@ -75,10 +76,12 @@ Town=شهرستان
 Web=وب سایت
 Poste= درجه
 DefaultLang=زبان پیش فرض
-VATIsUsed=مالیات بر ارزش افزوده استفاده شده است
-VATIsNotUsed=مالیات بر ارزش افزوده استفاده نمی شود
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=پیشنهادات
 OverAllOrders=سفارشات
@@ -239,7 +242,7 @@ ProfId3TN=پروفسور کد 3 (کد Douane)
 ProfId4TN=پروفسور کد 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=تعداد مالیات بر ارزش افزوده
-VATIntraShort=تعداد مالیات بر ارزش افزوده
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=نحو معتبر است
+VATReturn=VAT return
 ProspectCustomer=چشم انداز / مشتریان
 Prospect=چشم انداز
 CustomerCard=کارت به مشتری
 Customer=مشتریان
 CustomerRelativeDiscount=تخفیف به مشتریان نسبی
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=تخفیف نسبی
 CustomerAbsoluteDiscountShort=تخفیف مطلق
 CompanyHasRelativeDiscount=این مشتری است تخفیف به طور پیش فرض <b>از٪ s٪٪</b>
 CompanyHasNoRelativeDiscount=این مشتری ندارد تخفیف نسبی به طور پیش فرض
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=این مشتری هنوز یادداشت های اعتباری <b>برای٪ s٪</b> s را
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=این مشتری است هیچ اعتباری تخفیف در دسترس
-CustomerAbsoluteDiscountAllUsers=تخفیف مطلق (اعطا شده توسط همه کاربران)
-CustomerAbsoluteDiscountMy=تخفیف مطلق (اعطا شده توسط خودتان)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=هیچ یک
 Supplier=تامین کننده
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=بدون دسترسی Dolibarr
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=اطلاعات تماس و خواص
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=تماس / آدرس (از thirdparties یا نه) و ویژگی
-ImportDataset_company_3=جزئیات بانک
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=سطح قیمت
 DeliveryAddress=آدرس تحویل
 AddAddress=اضافه کردن آدرس
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=لایحه برجسته کنونی
 OutstandingBill=حداکثر. برای لایحه برجسته
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=numero بازگشت با فرمت syymm-NNNN برای کد مشتری و٪ syymm-NNNN برای کد منبع که در آن YY سال است٪، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است.
 LeopardNumRefModelDesc=کد آزاد است. این کد را می توان در هر زمان تغییر یافتهاست.
 ManagingDirectors=مدیر (بازدید کنندگان) نام (مدیر عامل شرکت، مدیر، رئيس جمهور ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index ba7d32c0779..1906c78c042 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -31,7 +31,7 @@ Credit=اعتبار
 Piece=حسابداری توضیحات.
 AmountHTVATRealReceived=شبکه جمع آوری
 AmountHTVATRealPaid=خالص پرداخت می شود
-VATToPay=مالیات بر ارزش افزوده به فروش می رساند
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF پرداخت
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=نمایش پرداخت مالیات بر ارزش افزوده
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- این شامل تمام پرداخت های موثر از فاکتورها دریافت شده از مشتریان. <br> - این است که در روز پرداخت از این فاکتورها بر اساس <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=گزارش شده توسط شخص ثالث IRPF
-LT1ReportByCustomersInInputOutputModeES=گزارش شده توسط شخص ثالث RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=گزارش شده توسط شخص ثالث RE
+LT2ReportByCustomersES=گزارش شده توسط شخص ثالث IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=گزارش های مالیات بر ارزش افزوده مشتری جمع آوری و پرداخت
-VATReportByCustomersInDueDebtMode=گزارش های مالیات بر ارزش افزوده مشتری جمع آوری و پرداخت
-VATReportByQuartersInInputOutputMode=گزارش های نرخ مالیات بر ارزش افزوده جمع آوری و پرداخت
-LT1ReportByQuartersInInputOutputMode=گزارش های نرخ RE
-LT2ReportByQuartersInInputOutputMode=گزارش های نرخ IRPF
-VATReportByQuartersInDueDebtMode=گزارش های نرخ مالیات بر ارزش افزوده جمع آوری و پرداخت
-LT1ReportByQuartersInDueDebtMode=گزارش های نرخ RE
-LT2ReportByQuartersInDueDebtMode=گزارش های نرخ IRPF
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=گزارش های نرخ RE
+LT2ReportByQuartersES=گزارش های نرخ IRPF
 SeeVATReportInInputOutputMode=<b>گزارش٪ SVAT قفسه٪ برای</b> محاسبه های استاندارد مشاهده
 SeeVATReportInDueDebtMode=<b>گزارش٪ SVAT در جریان٪ برای</b> محاسبه با گزینه ای در جریان مشاهده
 RulesVATInServices=- برای خدمات، این گزارش شامل مقررات مالیات بر ارزش افزوده در واقع دریافت و یا صادر شده بر اساس تاریخ پرداخت.
-RulesVATInProducts=- برای دارایی های مادی، آن را شامل فاکتورها مالیات بر ارزش افزوده بر اساس تاریخ فاکتور.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- برای خدمات، این گزارش شامل فاکتور مالیات بر ارزش افزوده به علت، پرداخت می شود یا نه، بر اساس تاریخ فاکتور.
-RulesVATDueProducts=- برای دارایی های مادی، آن را شامل فاکتورها مالیات بر ارزش افزوده، بر اساس تاریخ فاکتور.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=توجه: برای دارایی های مادی، باید از تاریخ تحویل به عادلانه تر استفاده کنید.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=٪٪ / فاکتور
 NotUsedForGoods=در محصولات استفاده نشده
 ProposalStats=آمار در طرح
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت <b>حسابداری نقدی</b> مربوط نیست. این گزارش که با استفاده از <b>تعامل</b> حالت <b>حسابداری</b> (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است.
 CalculationMode=حالت محاسبه
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index e8ca3065a04..222526b497e 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=بدون شغل ثبت نام
 CronPriority=اولویت
 CronLabel=برچسب
 CronNbRun=نیوبیوم. راه اندازی
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=هر
 JobFinished=کار راه اندازی به پایان رسید و
 #Page card
@@ -74,9 +74,10 @@ CronFrom=از
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=فرمان شل
-CronCannotLoadClass=آیا می توانم کلاس٪ s ​​را بار نیست و یا شی از٪ s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 6979cd9ffe4..7886ebadee5 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=تطبیق Dolibarr-LDAP کامل نیست.
 ErrorLDAPMakeManualTest=فایل LDIF. شده است در شاخه٪ s تولید می شود. سعی کنید به آن بار دستی از خط فرمان به کسب اطلاعات بیشتر در مورد خطا است.
 ErrorCantSaveADoneUserWithZeroPercentage=آیا می توانم اقدام با "statut آغاز شده است" اگر درست "انجام شده توسط" نیز پر را نجات دهد.
 ErrorRefAlreadyExists=کد عکس مورد استفاده برای ایجاد وجود دارد.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=می توانید ضبط را حذف کنید. این است که در حال حاضر به شی دیگر استفاده می شود و یا گنجانده شده است.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=برای اضافه کردن رکورد٪ به پ
 ErrorFailedToRemoveToMailmanList=برای حذف رکورد٪ به پستچی فهرست٪ یا پایه SPIP ناموفق
 ErrorNewValueCantMatchOldValue=ارزش های جدید را نمی توان به یکی از قدیمی برابر
 ErrorFailedToValidatePasswordReset=به راه اندازی مجدد کنتور رمز عبور شکست خورده است. ممکن است راه اندازی مجدد کنتور در حال حاضر انجام شده است (این لینک را می توان مورد استفاده فقط یک بار). اگر نه، سعی کنید به راه اندازی مجدد فرآیند راه اندازی مجدد کنتور.
-ErrorToConnectToMysqlCheckInstance=اتصال به پایگاه داده نتواند. چک کردن سرور خروجی زیر در حال اجرا است (در بیشتر موارد، شما می توانید آن را از خط فرمان با 'کد: sudo / و غیره / init.d / خروجی زیر شروع به' راه اندازی).
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=برای اضافه کردن مخاطب انجام نشد
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=حالت پرداخت به نوع٪ s را تعیین شد، اما راه اندازی فاکتور ماژول شد کامل نیست برای تعریف اطلاعات به این حالت پرداخت نشان می دهد.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/fa_IR/loan.lang b/htdocs/langs/fa_IR/loan.lang
index c6d6e62d52c..6d611d21b53 100644
--- a/htdocs/langs/fa_IR/loan.lang
+++ b/htdocs/langs/fa_IR/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 3285ab4a418..fec6ad70949 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 3c4dc6b016e..1ec4ab29da9 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=پارامتر٪ s را تعریف نشده
 ErrorUnknown=خطا مشخص نشده است
 ErrorSQL=خطا در SQL
 ErrorLogoFileNotFound=فایل لوگو '٪ s' یافت نشد
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=برو به ماژول راه اندازی به رفع این
 ErrorFailedToSendMail=برای ارسال ایمیل (فرستنده =٪ S، گیرنده =٪ بازدید کنندگان) شکست خورد
 ErrorFileNotUploaded=فایل آپلود نشد. بررسی کنید که اندازه حداکثر مجاز تجاوز نمی کند، که فضای خالی موجود بر روی دیسک است و در حال حاضر وجود دارد یک فایل با همین نام در این شاخه.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=خطا، هیچ نرخ مالیات بر 
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=خطا، موفق به صرفه جویی در فایل.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=تاریخ تنظیم
 SelectDate=یک تاریخ را انتخاب کنید
 SeeAlso=همچنین نگاه کنید به٪ s را
 SeeHere=See here
+ClickHere=اینجا را کلیک کنید
+Here=Here
 Apply=درخواست
 BackgroundColorByDefault=رنگ به طور پیش فرض پس زمینه
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=پیوند
 Select=انتخاب
 Choose=را انتخاب کنید
 Resize=تغییر اندازه
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=نویسنده
 User=کاربر
@@ -325,8 +328,10 @@ Default=پیش فرض
 DefaultValue=ارزش قرار دادی
 DefaultValues=Default values
 Price=قیمت
+PriceCurrency=Price (currency)
 UnitPrice=قیمت واحد
 UnitPriceHT=قیمت واحد (خالص)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=قیمت واحد
 PriceU=UP
 PriceUHT=UP (خالص)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=مقدار
 AmountInvoice=مقدار فاکتور
+AmountInvoiced=Amount invoiced
 AmountPayment=مقدار پرداخت
 AmountHTShort=مقدار (خالص)
 AmountTTCShort=مقدار (مالیات شرکت)
@@ -353,6 +359,7 @@ AmountLT2ES=مقدار IRPF
 AmountTotal=مقدار کل
 AmountAverage=میانگین مقدار
 PriceQtyMinHT=دقیقه مقدار قیمت. (خالص از مالیات)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=در صد
 Total=کل
 SubTotal=جمع جزء
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=نرخ مالیات
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=متوسط
 Sum=مجموع
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=در دست اجرا
 ActionUncomplete=ناقص
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=اطلاعات تماس این شخص ثالث
 ContactsAddressesForCompany=تماس / آدرس برای این شخص ثالث
 AddressesForCompany=آدرس برای این شخص ثالث
@@ -427,6 +437,9 @@ ActionsOnCompany=رویدادها در مورد این شخص ثالث
 ActionsOnMember=رویدادها در مورد این عضو
 ActionsOnProduct=Events about this product
 NActionsLate=٪ s در اواخر
+ToDo=برای انجام این کار
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=صافی
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=اخطار، شما در یک حالت تعمیر
 CoreErrorTitle=خطای سیستم
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=کارت های اعتباری
+ValidatePayment=اعتبار پرداخت
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=زمینه <b>با٪ s</b> الزامی است
 FieldsWithIsForPublic=مواردی که <b>با٪ s را</b> در لیست عمومی کاربران نشان داده شده است. اگر شما این کار را می خواهید نیست، چک کردن جعبه "عمومی".
 AccordingToGeoIPDatabase=(با توجه به تبدیل GeoIP با)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=طبقه بندی صورتحساب
+ClassifyUnbilled=Classify unbilled
 Progress=پیشرفت
-ClickHere=اینجا را کلیک کنید
 FrontOffice=Front office
 BackOffice=دفتر برگشت
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=پروژه
 Projects=پروژه ها
 Rights=مجوز
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=دوشنبه
 Tuesday=سهشنبه
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=احزاب سوم
 SearchIntoContacts=اطلاعات تماس
 SearchIntoMembers=کاربران
 SearchIntoUsers=کاربران
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=هر کسی
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=واگذار شده به
diff --git a/htdocs/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang
index 1a76d6af681..0683333589e 100644
--- a/htdocs/langs/fa_IR/margins.lang
+++ b/htdocs/langs/fa_IR/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index 4790dd1444e..ff2cd389668 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=فهرست کاربران عمومی معتبر
 ErrorThisMemberIsNotPublic=این عضو است عمومی نمی
 ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام و نام <b>خانوادگی:٪ S،</b> وارد <b>کنید:٪ s)</b> در حال حاضر به شخص <b>ثالث٪ s در</b> ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود.
 ErrorUserPermissionAllowsToLinksToItselfOnly=به دلایل امنیتی، شما باید مجوز اعطا شده به ویرایش تمام کاربران قادر به پیوند عضو به یک کاربر است که مال شما نیست.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=محتوا از کارت عضو شما
 SetLinkToUser=پیوند به یک کاربر Dolibarr
 SetLinkToThirdParty=لینک به شخص ثالث Dolibarr
 MembersCards=کاربران کارت های کسب و کار
@@ -108,17 +106,33 @@ PublicMemberCard=کاربران کارت های عمومی
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=نمایش اشتراک
-SendAnEMailToMember=ارسال ایمیل به اطلاعات به عضو
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=محتوا از کارت عضو شما
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=موضوع ایمیل را دریافت کرده در مورد خودکار کتیبه مهمان
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=فرستادن به ایمیل دریافت در صورت خودکار کتیبه مهمان
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=موضوع ایمیل برای autosubscription عضو
-DescADHERENT_AUTOREGISTER_MAIL=ایمیل برای autosubscription عضو
-DescADHERENT_MAIL_VALID_SUBJECT=موضوع ایمیل برای اعتبار سنجی کاربران
-DescADHERENT_MAIL_VALID=ایمیل برای اعتبار سنجی کاربران
-DescADHERENT_MAIL_COTIS_SUBJECT=موضوع ایمیل برای اشتراک
-DescADHERENT_MAIL_COTIS=ایمیل اشتراک
-DescADHERENT_MAIL_RESIL_SUBJECT=موضوع ایمیل برای resiliation عضو
-DescADHERENT_MAIL_RESIL=ایمیل برای resiliation عضو
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=ایمیل فرستنده برای ایمیل های خودکار
 DescADHERENT_ETIQUETTE_TYPE=فرمت صفحه برچسب ها
 DescADHERENT_ETIQUETTE_TEXT=متن چاپ شده بر روی ورق آدرس عضو
@@ -177,3 +191,8 @@ NoVatOnSubscription=بدون TVA برای اشتراک
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 87ee019f250..a16e9e0f828 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=پیام در اعتبار صفحه بازگشت پرداخت
 MessageKO=پیام در لغو صفحه بازگشت پرداخت
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=شی مرتبط
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=شروع ارسال فایل
 CancelUpload=لغو ارسال فایل
 FileIsTooBig=فایل های بیش از حد بزرگ است
 PleaseBePatient=لطفا صبور باشید ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=درخواست رمز عبور Dolibarr خود را تغییر دریافت شده است
 NewKeyIs=این کلید جدید خود را برای ورود به سایت است
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=عنوان
 WEBSITE_DESCRIPTION=توصیف
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/fa_IR/paypal.lang b/htdocs/langs/fa_IR/paypal.lang
index c7491fa85e3..2f710b3bec1 100644
--- a/htdocs/langs/fa_IR/paypal.lang
+++ b/htdocs/langs/fa_IR/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=پی پال تنها
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=این شناسه از معامله <b>است:٪ s</b>
 PAYPAL_ADD_PAYMENT_URL=اضافه کردن آدرس از پرداخت پی پال زمانی که شما یک سند ارسال از طریق پست
-PredefinedMailContentLink=شما می توانید بر روی لینک زیر کلیک کنید امن به پرداخت خود را (پی پال) اگر آن را در حال حاضر انجام می شود. از٪ s
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 959ec00e0c0..2585e68fd11 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=محصولات و خدمات
 ProductsAndServices=محصولات و خدمات
 ProductsOrServices=محصولات و خدمات
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=آیا مطمئن هستید که می خواهید ا
 ProductSpecial=ویژه
 QtyMin=حداقل تعداد
 PriceQtyMin=قیمت این دقیقه. تعداد (W / O تخفیف)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=نرخ مالیات بر ارزش افزوده (برای این عرضه کننده کالا / محصول)
 DiscountQtyMin=به طور پیش فرض تخفیف ویژه برای تعداد
 NoPriceDefinedForThisSupplier=بدون قیمت / تعداد تعریف شده برای این عرضه کننده کالا / محصول
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index a9d49fb7817..26bd37294d7 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=تماس با ما پروژه
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=همه پروژه ها
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=این دیدگاه ارائه تمام پروژه ها به شما این اجازه را بخوانید.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=این دیدگاه ارائه تمام پروژه ها و کارهای شما مجاز به خواندن.
 ProjectsDesc=این دیدگاه ارائه تمام پروژه (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=این دیدگاه ارائه تمام پروژه ها و کارهای شما مجاز به خواندن.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=زمان صرف شده
 MyTimeSpent=وقت من صرف
+BillTime=Bill the time spent
 Tasks=وظایف
 Task=کار
 TaskDateStart=تاریخ شروع کار
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=فهرست رویدادی به این پروژه
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=فعالیت در پروژه این هفته
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=فعالیت در پروژه این ماه
 ActivityOnProjectThisYear=فعالیت در پروژه سال جاری
 ChildOfProjectTask=کودکان از پروژه / کار
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=نه صاحب این پروژه خصوصی
 AffectedTo=اختصاص داده شده به
 CantRemoveProject=این پروژه نمی تواند حذف شود به عنوان آن است که توسط برخی از اشیاء دیگر (فاکتور، سفارشات و یا دیگر) اشاره شده است. تب مراجعه کنید.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=غیر ممکن است به تغییر تاریخ کار با توجه به پروژه جدید تاریخ شروع
 ProjectsAndTasksLines=پروژه ها و وظایف
 ProjectCreatedInDolibarr=پروژه٪ s را ایجاد
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=وظیفه٪ s را ایجاد
 TaskModifiedInDolibarr=وظیفه٪ s تغییر
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/fa_IR/propal.lang b/htdocs/langs/fa_IR/propal.lang
index 5ae6309a21f..e08716db9fe 100644
--- a/htdocs/langs/fa_IR/propal.lang
+++ b/htdocs/langs/fa_IR/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=امضا (نیازهای حسابداری و مدیریت)
 PropalStatusNotSigned=امضا نشده (بسته شده)
 PropalStatusBilled=ثبت شده در صورتحساب یا لیست
 PropalStatusDraftShort=پیش نویس
+PropalStatusValidatedShort=اعتبار
 PropalStatusClosedShort=بسته
 PropalStatusSignedShort=امضاء شده
 PropalStatusNotSignedShort=امضا نشده
diff --git a/htdocs/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang
index 813238dd5f6..6a70af3f955 100644
--- a/htdocs/langs/fa_IR/salaries.lang
+++ b/htdocs/langs/fa_IR/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index b6246b8a694..737f2254f05 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=اصلاح انبار
 MenuNewWarehouse=انبار جدید
 WarehouseSource=انبار منبع
 WarehouseSourceNotDefined=بدون انبار تعریف شده است،
+AddWarehouse=Create warehouse
 AddOne=اضافه کردن یک
+DefaultWarehouse=Default warehouse
 WarehouseTarget=انبار هدف
 ValidateSending=حذف ارسال
 CancelSending=لغو ارسال
@@ -22,6 +24,7 @@ Movements=جنبش
 ErrorWarehouseRefRequired=نام انبار مرجع مورد نیاز است
 ListOfWarehouses=لیست انبار
 ListOfStockMovements=فهرست جنبش های سهام
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/fa_IR/stripe.lang b/htdocs/langs/fa_IR/stripe.lang
index 8887501a61e..aabcc15b8ce 100644
--- a/htdocs/langs/fa_IR/stripe.lang
+++ b/htdocs/langs/fa_IR/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang
index b622c9a7dde..05779f9baab 100644
--- a/htdocs/langs/fa_IR/trips.lang
+++ b/htdocs/langs/fa_IR/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=مقدار و یا کیلومتر
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 1083f0b8aa1..52a006eff3f 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -69,8 +69,8 @@ InternalUser=کاربر داخلی
 ExportDataset_user_1=کاربران Dolibarr و خواص
 DomainUser=کاربر دامنه از٪ s
 Reactivate=دوباره فعال کردن
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=اجازه چرا که از یک گروه کاربر را به ارث برده.
 Inherited=به ارث برده
 UserWillBeInternalUser=کاربر های ایجاد شده خواهد بود داخلی (چون به شخص ثالث خاصی پیوند ندارد)
@@ -93,6 +93,7 @@ NameToCreate=نام و نام خانوادگی شخص ثالث برای ایجا
 YourRole=roleهای شما
 YourQuotaOfUsersIsReached=سهمیه شما از کاربران فعال رسیده است!
 NbOfUsers=NB از کاربران
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=فقط قسمت مدیریت می توانید یک قسمت مدیریت جمع و جور کردن
 HierarchicalResponsible=Supervisor
 HierarchicView=دیدگاه سلسله مراتبی
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 649c60e3080..ac4ff9a9d5a 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=خواندن
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 9603b9ac830..73ef09481b9 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=به پردازش
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=کد های بانکی شخص ثالث
-NoInvoiceCouldBeWithdrawed=بدون فاکتور با موفقیت withdrawed. بررسی کنید که فاکتور در شرکت های با BAN معتبر هستند.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=طبقه بندی اعتبار
 ClassCreditedConfirm=آیا مطمئن هستید که می خواهید برای طبقه بندی این دریافت و برداشت به عنوان در حساب بانکی شما اعتبار؟
 TransData=تاریخ انتقال
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index d9b92969f3d..6869e233c86 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_SEPARATORCSV=Sarake-erotin vientitiedostoon
+ACCOUNTING_EXPORT_DATE=Vientitiedoston päivämäärän muoto
+ACCOUNTING_EXPORT_PIECE=Vie kappaleen määrä
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Vienti järjestelmänlaajuisella tilillä
+ACCOUNTING_EXPORT_LABEL=Vienti etiketti
+ACCOUNTING_EXPORT_AMOUNT=Vientimäärä
+ACCOUNTING_EXPORT_DEVISE=Vienti valuutta
+Selectformat=Valitse tiedostomuoto
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
 ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ACCOUNTING_EXPORT_PREFIX_SPEC=Määritä tiedostonimen etuliite
 ThisService=This service
 ThisProduct=This product
 DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Moduulin kirjanpitoasiantuntijan määrittäminen
 Journalization=Journalization
-Journaux=Journals
-JournalFinancial=Financial journals
-BackToChartofaccounts=Return chart of accounts
+Journaux=Päiväkirjat
+JournalFinancial=Rahoituspäiväkirjat
+BackToChartofaccounts=Palauta tilikartta
 Chartofaccounts=Tilikartta
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -70,35 +70,35 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
+Selectchartofaccounts=Valitse aktiivinen tilikartta
 ChangeAndLoad=Change and load
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
+Addanaccount=Lisää kirjanpitotili
+AccountAccounting=Kirjanpitotili
 AccountAccountingShort=Account
 SubledgerAccount=Subledger Account
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
-AccountAccountingSuggest=Accounting account suggested
+AccountAccountingSuggest=Ehdotettu kirjanpitotili
 MenuDefaultAccounts=Oletustilit
 MenuBankAccounts=Pankkitilit
 MenuVatAccounts=Arvonlisäverotili
 MenuTaxAccounts=Verotili
 MenuExpenseReportAccounts=Kuluraportti tilit
 MenuLoanAccounts=Lainatilit
-MenuProductsAccounts=Product accounts
+MenuProductsAccounts=Tuotetilit
 ProductsBinding=Products accounts
-Ventilation=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+Ventilation=Tilien täsmäytys
+CustomersVentilation=Asiakaan laskun täsmäytys
+SuppliersVentilation=Toimittajan laskun täsmäytys
 ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
+CreateMvts=Luo uusi transaktio
+UpdateMvts=Transaktion muuttaminen
 ValidTransaction=Validate transaction
 WriteBookKeeping=Journalize transactions in Ledger
-Bookkeeping=Ledger
+Bookkeeping=Pääkirjanpito
 AccountBalance=Tilin saldo
 ObjectsRef=Source object ref
-CAHTF=Total purchase supplier before tax
+CAHTF=Kokonaisosto toimittaja ennen veroja
 TotalExpenseReport=Total expense report
 InvoiceLines=Lines of invoices to bind
 InvoiceLinesDone=Bound lines of invoices
@@ -107,20 +107,20 @@ ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
 
 
-Ventilate=Bind
+Ventilate=Sitoa
 LineId=Rivin tunniste
-Processing=Processing
-EndProcessing=Process terminated.
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
+Processing=Käsittelyssä
+EndProcessing=Prosessi päättynyt.
+SelectedLines=Valitut rivit
+Lineofinvoice=Laskun rivi
 LineOfExpenseReport=Line of expense report
 NoAccountSelected=Kirjanpitotiliä ei ole valittu
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
+VentilatedinAccount=Sidottu onnistuneesti kirjanpitotilille
+NotVentilatedinAccount=Ei sidottu kirjanpitotilille
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Sivulla esitettävien elementtien määrä (suositeltava enimmäismäärä: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -131,11 +131,11 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Myyntipäiväkirja
+ACCOUNTING_PURCHASE_JOURNAL=Ostopäiväkirja
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Sekalainenpäiväkirja
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Kuluraportti päiväkirja
+ACCOUNTING_SOCIAL_JOURNAL=Sosiaalinen päiväkirja
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -146,14 +146,13 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Code_tiers=Thirdparty
+Doctype=Asiakirjan tyyppi
+Docdate=Päiväys
+Docref=Viite
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
-Codejournal=Journal
+Codejournal=Päiväkirja
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
@@ -164,24 +163,23 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Vuoden mukaan
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Poista Pääkirjanpito rivit
 DelYear=Tuhottava vuosi
 DelJournal=Tuhottava päiväkirja
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=ALV tiliä ei ole määritelty
 ThirdpartyAccountNotDefined=Sidosryhmän tiliä ei ole määritetty
 ProductAccountNotDefined=Tuotteen tiliä ei ole määritetty
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Pankin tiliä ei ole määritetty
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
-NewAccountingMvt=New transaction
+ThirdPartyAccount=Third party account
+NewAccountingMvt=Uusi transaktio
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
@@ -216,38 +214,42 @@ DescVentilDoneExpenseReport=Consult here the list of the lines of expenses repor
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Virhe, tätä kirjanpito tiliä ei voida poistaa koska se on käytössä
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Kirjattu pääkirjanpitoon
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group
 CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Accounting journals
+AccountingJournals=Kirjanpitotilityypit
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Luonto
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Myynti
 AccountingJournalType3=Ostot
 AccountingJournalType4=Pankki
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
+Modelcsv=Vientimalli
+Selectmodelcsv=Valitse vientimalli
+Modelcsv_normal=Klassinen vienti
+Modelcsv_CEGID=Vienti kohti CEGID Expert Comptabilité
 Modelcsv_COALA=Export towards Sage Coala
 Modelcsv_bob50=Export towards Sage BOB 50
 Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
@@ -282,6 +284,8 @@ Formula=Kaava
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 816b54d85d7..9183daa85f5 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Säätiö
 Version=Versio
-Publisher=Publisher
+Publisher=Julkaisija
 VersionProgram=Ohjelmaversio
 VersionLastInstall=Alkuperäinen versio
 VersionLastUpgrade=Viimeisin versiopäivitys
@@ -18,10 +18,10 @@ GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
+FilesMissing=Puuttuvat Tiedostot
+FilesUpdated=Päivitetyt Tiedostot
+FilesModified=Muokatut Tiedostot
+FilesAdded=Lisätyt Tiedostot
 FileCheckDolibarr=Check integrity of application files
 AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
@@ -29,7 +29,7 @@ SessionId=Istunnon tunnus
 SessionSaveHandler=Handler tallentaa istuntojen
 SessionSavePath=Varasto istuntojakson localization
 PurgeSessions=Tuhoa istuntoja
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Haluatko varmasti poistii kaikki istunnot? Tämä katkaisee istunnot jokaiselta käyttäjältä (paitsi itseltäsi).
 NoSessionListWithThisHandler=Tallenna istunto handler konfiguroitu PHP ei ole mahdollista luetella kaikkia lenkkivaatteita.
 LockNewSessions=Lukitse uusia yhteyksiä
 ConfirmLockNewSessions=Oletko varma että haluat rajoittaa uusia Dolibarr yhteys itse. Vain käyttäjä <b>%s</b> voi kytkeä sen jälkeen.
@@ -51,7 +51,7 @@ InternalUsers=Sisäiset käyttäjät
 ExternalUsers=Ulkopuoliset käyttäjät
 GUISetup=Näyttö
 SetupArea=Asetusalue
-UploadNewTemplate=Upload new template(s)
+UploadNewTemplate=Päivitä uusi pohja(t)
 FormToTestFileUploadForm=Lomake testata tiedostonlähetyskiintiö (mukaan setup)
 IfModuleEnabled=Huomaa: kyllä on tehokas vain, jos <b>moduuli %s</b> on käytössä
 RemoveLock=Poista <b>tiedosto %s,</b> jos se on olemassa, jotta päivitys työkalu.
@@ -63,9 +63,9 @@ ErrorModuleRequireDolibarrVersion=Virhe Tätä moduulia edellyttää Dolibarr ve
 ErrorDecimalLargerThanAreForbidden=Virhe, tarkkuuden suurempi <b>kuin %s</b> ei ole tuettu.
 DictionarySetup=Sanakirja setup
 Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorReservedTypeSystemSystemAuto=Arvot 'system' ja 'systemauto' ovat varattuja. Voit käyttää 'user' arvona lisääksesi sinun omaa recordia
 ErrorCodeCantContainZero=Koodi ei voi sisältää arvoa 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Poista käytöstä JavaScript ja Ajax funktiot (Suositeltu näkövammaisille ja tekstiselaimille)
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
@@ -79,7 +79,7 @@ ShowPreview=Näytä esikatselu
 PreviewNotAvailable=Esikatselu ei ole käytettävissä
 ThemeCurrentlyActive=Teema on tällä hetkellä aktiivinen
 CurrentTimeZone=Nykyinen aikavyöhyke
-MySQLTimeZone=TimeZone MySql (database)
+MySQLTimeZone=Aikavyöhyke MySql (tietokanta)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
 Table=Taulu
@@ -101,21 +101,21 @@ AntiVirusParam= Lisää parametreja komentoriviltä
 AntiVirusParamExample= Esimerkki Simpukka - tietokanta = "C: \\ Program Files (x86) \\ Simpukka \\ lib"
 ComptaSetup=Kirjanpito-moduulin asetukset
 UserSetup=Käyttäjien hallinta-asetukset
-MultiCurrencySetup=Multi-currency setup
+MultiCurrencySetup=Multi-valuutta asetukset
 MenuLimits=Raja-arvot ja tarkkuus
 MenuIdParent=Emo-valikosta tunnus
 DetailMenuIdParent=ID emo-valikossa (0 ylhäältä valikosta)
 DetailPosition=Lajittele numero määritellä valikkopalkki kanta
 AllMenus=Kaikki
-NotConfigured=Module/Application not configured
+NotConfigured=Moduulia/Applikaatiota ei ole määritetty
 Active=Aktiivinen
-SetupShort=Setup
+SetupShort=Asetukset
 OtherOptions=Muut valinnat
 OtherSetup=Muut asetukset
 CurrentValueSeparatorDecimal=Desimaalierotin
 CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
+Destination=Määränpää
+IdModule=Moduuli ID
 IdPermissions=Permissions ID
 LanguageBrowserParameter=Parametri %s
 LocalisationDolibarrParameters=Lokalisointi parametrit
@@ -131,22 +131,22 @@ HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on thi
 Box=Widget
 Boxes=Widgetit
 MaxNbOfLinesForBoxes=Rivien maksimimäärä widgeteille
-AllWidgetsWereEnabled=All available widgets are enabled
-PositionByDefault=Oletus jotta
+AllWidgetsWereEnabled=Kaikki saatavilla olevat Widgetit on aktivoitu
+PositionByDefault=Oletus järjestys
 Position=Asema
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
 MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
 MenuForUsers=Valikko käyttäjille
 LangFile=File. Lang
-System=System
+System=Järjestelmä
 SystemInfo=Järjestelmän tiedot
 SystemToolsArea=Kehitysresurssit alueella
 SystemToolsAreaDesc=Tämä alue tarjoaa hallinnon ominaisuuksia. Käytä valikosta valita ominaisuus, jota etsit.
 Purge=Siivoa
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Poista kaikki väliaikaiset tiedostot (ei riskiä tietojen menettämisestä)
+PurgeDeleteTemporaryFilesShort=Poista väliaikaiset tiedostot
 PurgeDeleteAllFilesInDocumentsDir=Poista kaikki tiedostot <b>hakemistoon %s.</b> Väliaikaiset tiedostot, mutta myös liitetyt tiedostot elementtejä (kolmansien osapuolten, laskut, ...) ja siirretty osaksi ECM moduuli on poistettu.
 PurgeRunNow=Siivoa nyt
 PurgeNothingToDelete=Ei tuhottavia hakemistoja eikä tiedostoja.
@@ -155,18 +155,18 @@ PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
 PurgeAuditEvents=Purge kaikki tapahtumat
 ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
 GenerateBackup=Luo varmuuskopio
-Backup=Backup
+Backup=Varmuuskopio
 Restore=Palauta
 RunCommandSummary=Varmuuskopiointi tapahtuu seuraava komento
-BackupResult=Backup tulos
-BackupFileSuccessfullyCreated=Backup tiedoston onnistuneesti luotu
+BackupResult=Varmuuskopiointi tulos
+BackupFileSuccessfullyCreated=Varmuuskopio -tiedosto on onnistuneesti luotu
 YouCanDownloadBackupFile=Tuottamat tiedostot voi ladata
-NoBackupFileAvailable=N: o backup-tiedostoja on saatavilla.
+NoBackupFileAvailable=Varmuuskopio -tiedostoja ei ole saatavilla.
 ExportMethod=Vienti menetelmä
 ImportMethod=Tuo menetelmä
-ToBuildBackupFileClickHere=To build a backup file, click <a href=Rakentaa varmuuskopio tiedoston, klikkaa <a href="%s">tästä.</a>
-ImportMySqlDesc=Tuo varmuuskopio-tiedoston, sinun on käytettävä mysql komento command line:
-ImportPostgreSqlDesc=Tuo varmuuskopiotiedosto, sinun täytyy käyttää pg_restore komentoa komentoriviltä:
+ToBuildBackupFileClickHere=Tehdäksesi varmuuskopio -tiedosto, paina <a href=Rakentaa varmuuskopio tiedoston, klikkaa <a href="%s">tästä.</a>
+ImportMySqlDesc=Tuodaksesi varmuuskopio-tiedoston, sinun on käytettävä mysql komentoa komentoriviltä:
+ImportPostgreSqlDesc=Tuodaksesi varmuuskopio-tiedoston, sinun täytyy käyttää pg_restore komentoa komentoriviltä:
 ImportMySqlCommand=%s %s &lt;mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Tiedoston nimi tuottaa
@@ -175,7 +175,7 @@ CommandsToDisableForeignKeysForImport=Komento poistaa ulko avaimet tuontiluvista
 CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
 ExportCompatibility=Yhteensopivuutta luodaan viedä tiedosto
 MySqlExportParameters=MySQL vienti parametrit
-PostgreSqlExportParameters= PostgreSQL export parameters
+PostgreSqlExportParameters= PostgreSQL vie parametrit
 UseTransactionnalMode=Käytä kaupallisen tilassa
 FullPathToMysqldumpCommand=Koko polku mysqldump komento
 FullPathToPostgreSQLdumpCommand=Täysi polku pg_dump komento
@@ -187,35 +187,35 @@ ExtendedInsert=Laajennettu INSERT
 NoLockBeforeInsert=Ei lukko komennot noin INSERT
 DelayedInsert=Viivästynyt lisätä
 EncodeBinariesInHexa=Koodaus binary tiedot heksadesimaaleina
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Automaattisesti (selaimen kieli)
-FeatureDisabledInDemo=Feature vammaisten demo
+IgnoreDuplicateRecords=Ohita duplikaatti virheet (VALITSE OHITA)
+AutoDetectLang=Automaatti tunnistus (selaimen kieli)
+FeatureDisabledInDemo=Ominaisuus on poistettu käytöstä demossa
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
-ModulesDevelopYourModule=Develop your own app/modules
+ModulesMarketPlaces=Löydä ulkoisia app/moduuleja
+ModulesDevelopYourModule=Kehitä oma app/moduuli
 ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
 NewModule=Uusi
-FreeModule=Free
+FreeModule=Ilmainen
 CompatibleUpTo=Compatible with version %s
 NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
-Updated=Updated
+Updated=Päivitetty
 Nouveauté=Novelty
-AchatTelechargement=Buy / Download
+AchatTelechargement=Osta / Lataa
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, virallinen markkinapaikka Dolibarr ERP / CRM ulkoisten moduulien
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=Linkki
-BoxesAvailable=Widgets available
+BoxesAvailable=Widgetit saatavilla
 BoxesActivated=Widget aktivoitu
 ActivateOn=Ota annetun
 ActiveOn=Aktivoitu
@@ -234,72 +234,72 @@ ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to
 Feature=Ominaisuus
 DolibarrLicense=Lisenssi
 Developpers=Kehittäjät / vastaajat
-OfficialWebSite=Kansainvälinen virallisella web-sivut
+OfficialWebSite=Dolibarrin viralliset kansainväliset sivut
 OfficialWebSiteLocal=Local web site (%s)
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr online-demo
 OfficialMarketPlace=Virallinen markkinoilla ulkoisten moduulien / lisät
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Other resources
+OtherResources=Muut resurssit
 ExternalResources=External resources
-SocialNetworks=Social Networks
+SocialNetworks=Sosiaaliset verkostot
 ForDocumentationSeeWiki=Käyttäjälle tai kehittäjän dokumentaatio (doc, FAQs ...), <br> katsoa, että Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Muita kysymyksiä / apua, voit käyttää Dolibarr foorumilla: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Tämä alue voi auttaa sinua saamaan tukea palvelua Dolibarr.
 HelpCenterDesc2=Osa tätä palvelua on saatavilla <b>vain Englanti.</b>
 CurrentMenuHandler=Nykyinen valikko handler
-MeasuringUnit=Mittayksikön
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
+MeasuringUnit=Mittayksikkö
+LeftMargin=Vasen marginaali
+TopMargin=Ylä marginaali
+PaperSize=Paperin koko
+Orientation=Orientaatio
 SpaceX=Space X
 SpaceY=Space Y
-FontSize=Font size
+FontSize=Fontti koko
 Content=Content
 NoticePeriod=Notice period
 NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
+Emails=Sähköpostit
+EMailsSetup=Sähköpostien asetukset
 EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
 EmailSenderProfiles=Emails sender profiles
 MAIN_MAIL_SMTP_PORT=SMTP-portti (oletusarvoisesti <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_SERVER=SMTP Host (oletusarvoisesti <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP-portti (Ei määritelty osaksi PHP Unix-koneissa)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Host (Ei määritelty osaksi PHP Unix-koneissa)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
+MAIN_MAIL_EMAIL_FROM=Lähettäjä sähköposti automaattisille sähköpostiviesteille (Oletuksena php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Lähetä järjestelmällisesti piilotettu hiili-kopio kaikki lähetetyt sähköpostit
-MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_DISABLE_ALL_MAILS=Poista käytöstä kaikki sähköpostiviestin lähetykset (testaus tarkoituksiin tai demoihin)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_SENDMODE=Menetelmä käyttää lähettäessään Sähköpostit
+MAIN_MAIL_SENDMODE=Käyttömenetelmä sähköposteja lähettäessä
 MAIN_MAIL_SMTPS_ID=SMTP tunnus, jos vaaditaan
 MAIN_MAIL_SMTPS_PW=SMTP Salasana jos vaaditaan
-MAIN_MAIL_EMAIL_TLS= TLS (SSL) salaa
+MAIN_MAIL_EMAIL_TLS= Käytä TLS (SSL) salausta
 MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
 MAIN_DISABLE_ALL_SMS=Poista kaikki SMS-lähetysten (testitarkoituksiin tai demot)
-MAIN_SMS_SENDMODE=Menetelmä käyttää lähettää tekstiviestejä
-MAIN_MAIL_SMS_FROM=Default lähettäjän puhelinnumeroon tekstiviestien lähetykseen
+MAIN_SMS_SENDMODE=Käyttömenetelmä tekstiviestejä lähettäessä
+MAIN_MAIL_SMS_FROM=Vakio lähettäjän puhelinnumero tekstiviestien lähetykseen
 MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company email
+UserEmail=Käyttäjän sähköposti
+CompanyEmail=Yrityksen sähköposti
 FeatureNotAvailableOnLinux=Ominaisuus ei ole Unix-koneissa. Testaa sendmail ohjelmaa paikallisesti.
 SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
-ModuleSetup=Moduuli setup
-ModulesSetup=Modules/Application setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Asiakas Ressource Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Tuotehallinat (PM)
+ModuleSetup=Moduuli asetukset
+ModulesSetup=Moduulit/Applikaatio asetukset
+ModuleFamilyBase=Järjestelmä
+ModuleFamilyCrm=Asiakkuudenhallinta (CRM)
+ModuleFamilySrm=Toimittaja Suhteiden Hallinta (SRM)
+ModuleFamilyProducts=Tuotehallinta (PM)
 ModuleFamilyHr=Henkilöstöhallinta (HR)
-ModuleFamilyProjects=Projektit / Yhteistyöhankkeet työn
+ModuleFamilyProjects=Projektit / Yhteistyöhankkeet
 ModuleFamilyOther=Muu
 ModuleFamilyTechnic=Multi-modules työkalut
 ModuleFamilyExperimental=Kokeellinen modules
-ModuleFamilyFinancial=Financial Modules (kirjanpidon / Treasury)
-ModuleFamilyECM=ECM
+ModuleFamilyFinancial=Talouden Moduulit (Kirjanpito / Rahoitus)
+ModuleFamilyECM=Sisällönhallinta (ECM)
 ModuleFamilyPortal=Web sites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Valikko käsitteleville
@@ -319,10 +319,10 @@ InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dol
 YouCanSubmitFile=For this step, you can submit the .zip file of module package here :
 CurrentVersion=Dolibarr nykyinen versio
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
+LastStableVersion=Viimeisin vakaa versio
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
+LastActivationIP=Viimeinen aktiivinen IP
 UpdateServerOffline=Update server offline
 WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
@@ -330,28 +330,28 @@ GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}<
 GenericMaskCodes3=Kaikki muut merkit ja maski pysyy ennallaan. <br> Välilyönnit eivät ole sallittuja. <br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Esimerkki kolmannen osapuolen luotu 2007-03-01:</u> <br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Esimerkiksi tuotteille luotu 2007-03-01:</u><br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Paluu mukautettavan numeron mukaan määritelty mask.
 ServerAvailableOnIPOrPort=Server on saatavilla <b>osoitteessa %s satama %s</b>
 ServerNotAvailableOnIPOrPort=Palvelin ei ole käytettävissä <b>osoitteessa %s satama %s</b>
 DoTestServerAvailability=Test-palvelin-yhteydet
-DoTestSend=Test lähettäminen
-DoTestSendHTML=Test lähettämällä HTML
+DoTestSend=Testi lähettää
+DoTestSendHTML=Testi lähettää HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Virhe ei voi käyttäjä vaihtoehto @ jos SEQUENCE (yy) (mm) tai (vvvv) (mm) ei mask.
 UMask=UMask parametri uusia tiedostoja Unix / Linux / BSD-tiedostojärjestelmää.
 UMaskExplanation=Tämän parametrin avulla voit määrittää käyttöoikeudet asettaa oletuksena tiedostoja luotu Dolibarr palvelimelle (aikana ladata esimerkiksi). <br> Se on oktaali-arvo (esim. 0666 tarkoittaa, lukea ja kirjoittaa kaikki). <br> Ce paramtre ne Sert pas sous un serveur Windows.
-SeeWikiForAllTeam=Tutustu Wiki-sivulla luettelo kaikista toimijoista ja niiden järjestäminen
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Viive cashing vienti vastehuippu sekuntia (0 tai tyhjä ei välimuisti)
 DisableLinkToHelpCenter=Piilota linkki <b>"Tarvitsetko apua tai tukea"</b> on kirjautumissivulla
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelp=Piilota linkki online apuun "<b>%s</b>"
 AddCRIfTooLong=Ei ole automaattinen rivitys, joten jos linja on poissa sivu asiakirjoja, koska liian pitkä, sinun on lisättävä itse kuljetukseen tuotot ovat textarea.
 ConfirmPurge=Are you sure you want to execute this purge?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
 MinLength=Vähimmäispituus
 LanguageFilesCachedIntoShmopSharedMemory=Tiedostot. Lang ladattu jaettua muistia
-LanguageFile=Language file
-ExamplesWithCurrentSetup=Esimerkkejä kanssa käynnissä olevan setup
+LanguageFile=Kielitiedosto
+ExamplesWithCurrentSetup=Esimerkkejä nykyisellä asetuksella
 ListOfDirectories=Luettelo OpenDocument malleja hakemistoja
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
@@ -373,12 +373,12 @@ NoSmsEngine=Ei SMS lähettäjän Manager. SMS lähettäjä johtaja ei ole asenne
 PDF=PDF
 PDFDesc=Voit määrittää kunkin globaalin liittyviä vaihtoehtoja PDF sukupolvi
 PDFAddressForging=Säännöt luoda osoitteeseen laatikot
-HideAnyVATInformationOnPDF=Piilota kaikki tiedot, jotka liittyvät arvonlisävero syntyy PDF
+HideAnyVATInformationOnPDF=Piilota kaikki tiedot, jotka liittyvät arvonlisäveroon syntyvässä PDF -tiedostossa
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
+HideDescOnPDF=Piilota tuotekuvaukset syntyvässä PDF -tiedostossa
+HideRefOnPDF=Piilota tuotteiden viitteet syntyvässä PDF - tiedostossa
+HideDetailsOnPDF=Piilota tuote rivitiedot syntyvässä PDF -tiedostossa
 PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
 Library=Kirjasto
 UrlGenerationParameters=Parametrit turvata URL
@@ -386,61 +386,62 @@ SecurityTokenIsUnique=Käytä ainutlaatuinen securekey parametri jokaiselle URL
 EnterRefToBuildUrl=Kirjoita viittaus objektin %s
 GetSecuredUrl=Hanki lasketaan URL
 ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
+OldVATRates=Vanha ALV prosentti
+NewVATRates=Uusi ALV prosentti
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
+MassConvert=Käynnistä massa muutos
 String=String
-TextLong=Long text
+TextLong=Pitkä teksti
+HtmlText=Html teksti
 Int=Integer
 Float=Float
 DateAndTime=Päivämäärä ja tunti
-Unique=Unique
-Boolean=Boolean (one checkbox)
+Unique=Uniikki
+Boolean=Boolean (yksi valintaruutu)
 ExtrafieldPhone = Puhelin
 ExtrafieldPrice = Hinta
-ExtrafieldMail = Email
+ExtrafieldMail = Sähköposti
 ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
+ExtrafieldSelect = Valitse lista
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Salasana
 ExtrafieldRadio=Radio buttons (on choice only)
-ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBox=Valintaruudut
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
+LibraryToBuildPDF=Käytettävä kirjasto PDF:n luomiseen
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
+SMS=Tekstiviesti
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
+RefreshPhoneLink=Päivitä linkki
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
+KeepEmptyToUseDefault=Pidä tyhjänä käyttääksesi oletusarvoa
+DefaultLink=Oletuslinkki
+SetAsDefault=Aseta oletukseksi
 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 <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
+EraseAllCurrentBarCode=Poista kaikki nykyiset viivakoodi arvot
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
+AllBarcodeReset=Kaikki viivakoodi arvot on poistettu
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
 EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
-DisplayCompanyInfo=Display company address
+DisplayCompanyInfo=Näytä yrityksen osoitetiedot
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
@@ -449,8 +450,9 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
-ClickToShowDescription=Click to show description
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
+ClickToShowDescription=Klikkaa näyttääksesi kuvaus
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
@@ -466,30 +468,31 @@ ProductDocumentTemplates=Document templates to generate product document
 FreeLegalTextOnExpenseReports=Free legal text on expense reports
 WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
-SendEmailsReminders=Send agenda reminders by emails
+FilesAttachedToEmail=Liitä tiedosto
+SendEmailsReminders=Lähetä asialista muistutus sähköpostilla
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Käyttäjät & ryhmät
-Module0Desc=Users / Employees and Groups management
-Module1Name=Kolmannet osapuolet
-Module1Desc=Yritykset ja yhteystiedot hallinto
+Module0Desc=Käyttäjien / Työntekijöiden ja ryhmien hallinta
+Module1Name=Ulkopuoliset sidosryhmät
+Module1Desc=Yrityksien ja yhteystietojen hallinnointi (asiakkaat, prospektit...)
 Module2Name=Kaupalliset
 Module2Desc=Kaupallinen hallinnointi
 Module10Name=Kirjanpito
 Module10Desc=Yksinkertainen kirjanpito hallinta (laskua ja maksua lähettämistä)
 Module20Name=Ehdotukset
 Module20Desc=Kaupalliset ehdotuksia hallinto -
-Module22Name=E-postitusten
-Module22Desc=E-postitusten hallinto
+Module22Name=Massa sähköpostitus
+Module22Desc=Massa sähköpostitusten hallinnointi
 Module23Name=Energia
 Module23Desc=Seuranta kulutus energialähteiden
-Module25Name=Asiakas Tilaukset
-Module25Desc=Asiakas tilaa hallinto
+Module25Name=Asiakastilaukset
+Module25Desc=Asiakastilausten hallinnointi
 Module30Name=Laskut
 Module30Desc=Laskut ja hyvityslaskut hallinto-asiakkaille. Laskut hallinto-toimittajille
 Module40Name=Tavarantoimittajat
 Module40Desc=Toimittajien hallinta ja ostomenoista (tilaukset ja laskut)
-Module42Name=Debug Logs
+Module42Name=Debug Logit
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Toimitus
 Module49Desc=Editors' hallinta
@@ -501,10 +504,10 @@ Module52Name=Varastot
 Module52Desc=Varastojen hallinnan tuotteet
 Module53Name=Palvelut
 Module53Desc=Palvelut hallinto
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Sopimukset/Tilaukset
+Module54Desc=Hallinnoi Sopimukset (palvelut tai toistuvat tilaukset)
 Module55Name=Viivakoodi
-Module55Desc=Viivakoodi hallinto
+Module55Desc=Viivakoodien hallinnointi
 Module56Name=Puhelimet
 Module56Desc=Puhelimet yhdentyminen
 Module57Name=Direct bank payment orders
@@ -515,12 +518,12 @@ Module59Name=Bookmark4u
 Module59Desc=Lisää toiminto tuottaa Bookmark4u tilin käyttämisestä Dolibarr huomioon
 Module70Name=Interventions
 Module70Desc=Interventions hallinto
-Module75Name=Kulut ja matkoja toteaa
-Module75Desc=Kulut ja matkoja toteaa hallinto -
-Module80Name=Sendings
-Module80Desc=Sendings ja toimitus tilaukset hallinto
-Module85Name=Pankit ja pankkisaamiset
-Module85Desc=Hallintavirasto pankin tai tasetilit
+Module75Name=Kulut ja matka muistiinpanot
+Module75Desc=Kulut ja matkat muistiinpanojen hallinnointi
+Module80Name=Lähetykset
+Module80Desc=Lähetys ja toimitus tilauksien hallinnointi
+Module85Name=Pankit ja käteinen
+Module85Desc=Pankkitilien ja käteistilien hallinnointi
 Module100Name=ExternalSite
 Module100Desc=Sisälly erillisiä web sivuston Dolibarr valikot ja tarkastella sen Dolibarr runko
 Module105Name=Mailman ja SIP
@@ -530,9 +533,9 @@ Module200Desc=LDAP-hakemiston synkronointi
 Module210Name=PostNuke
 Module210Desc=PostNuke yhdentyminen
 Module240Name=Tietojen vienti
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Työkalu Dolibarr tietojen vientiin (avustuksella)
 Module250Name=Tietojen tuonti
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
+Module250Desc=Työkalu Dolibarr tietojen tuontiin (avustuksella)
 Module310Name=Jäsenet
 Module310Desc=Säätiön jäsenten hallintaan
 Module320Name=RSS Feed
@@ -543,35 +546,35 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar yhdentyminen
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Payment of employee wages
-Module510Desc=Record and follow payment of your employee wages
+Module500Name=Erityismenot (Verot, sosiaaliturvamaksut ja osingot)
+Module500Desc=Erityismenojen (verot, sosiaaliturvamaksut ja osingot) hallinnointi
+Module510Name=Suoritus työntekijöiden palkoista
+Module510Desc=Tallenna ja seuraa suorituksia työntekijöiden palkoista
 Module520Name=Laina
-Module520Desc=Management of loans
-Module600Name=Notifications on business events
+Module520Desc=Lainojen hallinnointi
+Module600Name=Ilmoitukset liiketapahtumista
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
 Module610Name=Product Variants
 Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=Lahjoitukset
-Module700Desc=Lahjoitukset hallinto
+Module700Desc=Lahjoituksien hallinnointi
 Module770Name=Kuluraportit
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis yhdentyminen
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1520Name=Dokumentin luonti
+Module1520Desc=Massa sähköposti dokumentin luominen
+Module1780Name=Merkit/Kategoriat
+Module1780Desc=Luo merkki/kategoria (tuotteet, asiakkaat, toimittajat, kontaktit tai jäsenet)
 Module2000Name=FCKeditor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
+Module2200Name=Dynaamiset Hinnat
 Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Scheduled jobs
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2300Name=Ajastetut työt
+Module2300Desc=Ajastettujen töiden hallinnointi (alias cron or chrono table)
 Module2400Name=Events/Agenda
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=DMS / ECM
@@ -584,20 +587,20 @@ Module2660Name=Call WebServices (SOAP client)
 Module2660Desc=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=Käytä online Gravatar palvelu (www.gravatar.com) näyttää kuvan käyttäjät / jäsenet (löytyi niiden sähköpostit). Tarvitsetko internetyhteys
-Module2800Desc=FTP Client
+Module2800Desc=FTP Ohjelma
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind tulokset valmiuksia
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
 Module3200Name=Unalterable Archives
 Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
-Module4000Name=HRM
+Module4000Name=Henkilöstöhallinta
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-yhtiö
 Module5000Desc=Avulla voit hallita useita yrityksiä
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
+Module6000Name=Työtehtävät
+Module6000Desc=Työtehtävien hallinta
+Module10000Name=Nettisivut
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
@@ -609,28 +612,30 @@ Module50100Name=Kassa
 Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
-Module50400Name=Accounting (advanced)
+Module50400Name=Kirjanpito (edistynyt)
 Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
-Module54000Name=PrintIPP
+Module54000Name=Tulosta IPP
 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=Poll, Survey or Vote
+Module55000Name=Vaalit, Kysely vai Äänestys
 Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Katteet
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
+Module59000Desc=Moduuli katteiden hallintaan
+Module60000Name=Komissiot
+Module60000Desc=Moduuli komissioiden hallintaan
+Module62000Name=Incoterm
+Module62000Desc=Lisää Incoterm ominaisuuksia
 Module63000Name=Resurssit
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Lue laskut
 Permission12=Luo laskut
-Permission13=Muokka laskut
-Permission14=Validate laskut
+Permission13=Vahvistamattomat laskut
+Permission14=Vahvistetut laskut
 Permission15=Lähetä laskut sähköpostilla
-Permission16=Luo maksut laskut
+Permission16=Luo maksut laskuille
 Permission19=Poista laskut
-Permission21=Lue kaupallinen ehdotuksia
-Permission22=Luoda / muuttaa kaupallinen ehdotuksia
-Permission24=Validate kaupallinen ehdotuksia
+Permission21=Lue kaupallisia ehdotuksia
+Permission22=Luo / muuta kaupallisia ehdotuksia
+Permission24=Vahvistettuja kaupallisia ehdotuksia
 Permission25=Lähetä kaupallinen ehdotuksia
 Permission26=Sulje kaupallinen ehdotuksia
 Permission27=Poista kaupallinen ehdotuksia
@@ -639,11 +644,11 @@ Permission31=Lue tuotetta / palvelua
 Permission32=Luoda / muuttaa tuotetta / palvelua
 Permission34=Poista tuotteita / palveluita
 Permission36=Vienti tuotteet / palvelut
-Permission38=Vientituotteen
+Permission38=Vie tuotteita
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Poista hankkeiden
-Permission45=Export projects
+Permission45=Vie Projektit
 Permission61=Lue interventioiden
 Permission62=Luoda / muuttaa interventioiden
 Permission64=Poista interventioiden
@@ -652,7 +657,7 @@ Permission71=Lue jäseniä
 Permission72=Luoda / muuttaa jäsenten
 Permission74=Poista jäseniä
 Permission75=Setup types of membership
-Permission76=Export data
+Permission76=Vie dataa
 Permission78=Lue tilauksia
 Permission79=Luoda / muuttaa tilaukset
 Permission81=Lue asiakkaiden tilauksia
@@ -697,23 +702,23 @@ 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
-Permission167=Export contracts
+Permission167=Vie Sopimukset
 Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission172=Luo/muuta matkat ja kulut
+Permission173=Poista matkat ja kulut
+Permission174=Lue kaikki Matkat ja kulut
+Permission178=Vie matkat ja kulut
 Permission180=Lue toimittajat
 Permission181=Lue toimittaja tilaukset
 Permission182=Luoda / muuttaa toimittajan tilaukset
 Permission183=Validate toimittaja tilaukset
 Permission184=Hyväksy toimittaja tilaukset
-Permission185=Order or cancel supplier orders
+Permission185=Tilaa tai peruuta toimittajatilaukset
 Permission186=Vastaanota toimittaja tilaukset
 Permission187=Sulje toimittaja tilaukset
 Permission188=Peruuta toimittaja tilaukset
-Permission192=Luo linjat
-Permission193=Peruuta linjat
+Permission192=Luo rivit
+Permission193=Peruuta rivit
 Permission194=Lue kaistanleveys linjat
 Permission202=Luo ADSL-liittymien
 Permission203=Tilaa yhteydet tilaukset
@@ -730,7 +735,7 @@ Permission222=Luoda / muuttaa emailings (aihe, vastaanottajat ...)
 Permission223=Validate emailings (avulla lähetys)
 Permission229=Poista emailings
 Permission237=View recipients and info
-Permission238=Manually send mailings
+Permission238=Manuaalinen viestien lähetys
 Permission239=Delete mailings after validation or sent
 Permission241=Lue tuoteryhmät
 Permission242=Luoda / muuttaa tuoteryhmät
@@ -776,17 +781,17 @@ Permission401=Lue alennukset
 Permission402=Luoda / muuttaa alennukset
 Permission403=Validate alennukset
 Permission404=Poista alennukset
-Permission501=Read employee contracts/salaries
-Permission502=Create/modify employee contracts/salaries
-Permission511=Read payment of salaries
-Permission512=Create/modify payment of salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission501=Lue työntekijän sopimukset/palkat
+Permission502=Luo / muuta työntekijän sopimuksia / palkkoja
+Permission511=Lue Palkkojen Suoritukset
+Permission512=Luo/muokkaa Palkkojen Suoritus
+Permission514=Poista palkat
+Permission517=Vie palkat
+Permission520=Lue Lainat
+Permission522=Luo/muokkaa Lainat
+Permission524=Poista Lainat
+Permission525=Pääsy lainalaskimelle
+Permission527=Vie Lainat
 Permission531=Lue palvelut
 Permission532=Luoda / muuttaa palvelut
 Permission534=Poista palvelut
@@ -797,14 +802,14 @@ Permission702=Luoda / muuttaa lahjoitusten
 Permission703=Poista lahjoitukset
 Permission771=Read expense reports (yours and your subordinates)
 Permission772=Create/modify expense reports
-Permission773=Delete expense reports
+Permission773=Poista kuluraportit
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
-Permission776=Pay expense reports
+Permission776=Maksa kuluraportit
 Permission779=Export expense reports
 Permission1001=Lue varastot
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Luo/muuta varastoja
+Permission1003=Poista varastoja
 Permission1004=Lue varastossa liikkeitä
 Permission1005=Luoda / muuttaa varastossa liikkeitä
 Permission1101=Lue lähetysluetteloihin
@@ -828,21 +833,21 @@ Permission1233=Validate toimittajan laskut
 Permission1234=Poista toimittajan laskut
 Permission1235=Lähetä toimittajan laskut sähköpostilla
 Permission1236=Vienti toimittajan laskut, ominaisuudet ja maksut
-Permission1237=Export supplier orders and their details
+Permission1237=Vie toimittajatilauksia ja -tietoja
 Permission1251=Suorita massa tuonnin ulkoisten tiedot tietokantaan (tiedot kuormitus)
 Permission1321=Vienti asiakkaan laskut, ominaisuudet ja maksut
-Permission1322=Reopen a paid bill
+Permission1322=Avaa uudelleen maksettu lasku
 Permission1421=Vienti asiakkaan tilaukset ja attribuutit
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
+Permission23001=Lue Ajastettu työ
+Permission23002=Luo/päivitä Ajastettu työ
+Permission23003=Poista Ajastettu työ
+Permission23004=Suorita Ajastettu työ
 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
@@ -854,14 +859,14 @@ Permission2501=Lue asiakirjat
 Permission2502=Lähetä tai poistaa asiakirjoja
 Permission2503=Lähetä tai poistaa asiakirjoja
 Permission2515=Setup asiakirjat hakemistoja
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
+Permission2801=Käytä FTP ohjelmaa lukutilassa (vain selain ja lataukset)
+Permission2802=Käytä FTP ohjelmaa kirjoitustilassa (poista tai päivitä tiedostot)
 Permission50101=Use Point of sales
 Permission50201=Lue liiketoimet
 Permission50202=Tuo liiketoimet
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
+Permission54001=Tulosta
+Permission55001=Lue äänestys
+Permission55002=Luo/muokkaa äänestys
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
@@ -869,8 +874,8 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
+DictionaryCompanyType=Sidosryhmä tyypit
+DictionaryCompanyJuridicalType=Sidostyhmän oikeudellinen muoto
 DictionaryProspectLevel=Esitetilaus mahdolliset tasolla
 DictionaryCanton=Valtio / Lääni
 DictionaryRegion=Alueiden
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Maksuehdot
 DictionaryPaymentModes=Maksutavat
 DictionaryTypeContact=Yhteystiedot tyypit
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ympäristöveron (WEEE)
 DictionaryPaperFormat=Paper tiedostomuodot
 DictionaryFormatCards=Cards formats
@@ -895,8 +901,8 @@ DictionaryOrderMethods=Tilaaminen menetelmät
 DictionarySource=Alkuperä ehdotusten / tilaukset
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Emails templates
+DictionaryAccountancyJournal=Kirjanpitotilityypit
+DictionaryEMailTemplates=Sähköposti pohjat
 DictionaryUnits=Yksiköt
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
@@ -904,27 +910,27 @@ DictionaryOpportunityStatus=Opportunity status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 SetupSaved=Setup tallennettu
-SetupNotSaved=Setup not saved
+SetupNotSaved=Asetuksia ei tallennettu
 BackToModuleList=Palaa moduulien luetteloon
 BackToDictionaryList=Palaa sanakirjat luettelo
 TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Alv Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Oletusarvon ehdotettu alv on 0, jota voidaan käyttää tapauksissa, kuten yhdistysten, yksityishenkilöiden tai pieniä yrityksiä.
-VATIsUsedExampleFR=Ranskassa, se tarkoittaa sitä, että yritykset tai järjestöt, joilla on todellista verotusjärjestelmän (yksinkertaistettu todellinen tai normaali todellinen). Järjestelmää, jossa arvonlisävero on ilmoitettu.
-VATIsNotUsedExampleFR=Ranskassa, se tarkoittaa sitä, yhdistyksiä, jotka eivät ole alv julistettu tai yritysten, organisaatioiden tai vapaiden ammattien harjoittajia, jotka ovat valinneet mikro yritys verotusjärjestelmän (alv franchising) ja maksetaan franchising alv ilman alv julkilausumaan. Tämä valinta näkyy maininta "Ei sovelleta alv - art-293B CGI" laskuissa.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Kurssi
-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
+LocalTax1IsNotUsed=Älä käytä toista veroa
+LocalTax1IsUsedDesc=Käytä toisen tyyppistä veroa (muu kuin ALV)
+LocalTax1IsNotUsedDesc=Älä käytä toisen tyyppistä veroa (muu kuin ALV)
+LocalTax1Management=Toisen tyyppinen vero
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-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
+LocalTax2IsNotUsed=Älä käytä kolmatta veroa
+LocalTax2IsUsedDesc=Käytä kolmannen tyyppistä veroa (muu kuin ALV)
+LocalTax2IsNotUsedDesc=Älä käytä muun tyyppistä veroa (muu kuin ALV)
+LocalTax2Management=Kolmannen tyypin vero
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE hallinta
@@ -937,9 +943,9 @@ LocalTax2IsUsedDescES= RE määrä oletuksena luodessasi näkymiä, laskuja, til
 LocalTax2IsNotUsedDescES= Oletuksena ehdotettu IRPF on 0. Loppu sääntö.
 LocalTax2IsUsedExampleES= Espanjassa, freelancer ja itsenäisten ammatinharjoittajien, jotka tarjoavat palveluja ja yrityksiä, jotka ovat valinneet verojärjestelmän moduuleja.
 LocalTax2IsNotUsedExampleES= Espanjassa niitä bussines ei veroteta järjestelmän moduulit.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax=Raportit paikallisista veroista
+CalcLocaltax1=Myynnit - Ostot
+CalcLocaltax1Desc=Paikallisten Verojen raportit on laskettu paikallisverojen myyntien ja ostojen erotuksena
 CalcLocaltax2=Ostot
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=Myynti
@@ -953,7 +959,7 @@ Offset=Offset
 AlwaysActive=Aina aktiivinen
 Upgrade=Päivitys
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+AddExtensionThemeModuleOrOther=Lisää/asenna ulkoinen app/moduuli
 WebServer=Web-palvelin
 DocumentRootServer=Web-palvelimen juuressa
 DataRootServer=Data-hakemistoon
@@ -962,7 +968,7 @@ Port=Port
 VirtualServerName=Virtuaali-palvelimen nimi
 OS=OS
 PhpWebLink=Web-Php linkki
-Browser=Browser
+Browser=Selain
 Server=Server
 Database=Database
 DatabaseServer=Tietokannan isäntä
@@ -977,24 +983,24 @@ Host=Server
 DriverType=Driver tyyppi
 SummarySystem=System Information summary
 SummaryConst=Luettelo kaikista Dolibarr setup parametrit
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Yritys/Organisaatio
 DefaultMenuManager= Standard valikonhallinta
 DefaultMenuSmartphoneManager=Smartphone valikonhallinta
 Skin=Ihon teema
 DefaultSkin=Oletus ihon teema
 MaxSizeList=Max pituus luettelo
-DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeList=Oletus luettelon maksimipituuteen
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Kirjoita viesti
-LoginPage=Login page
-BackgroundImageLogin=Background image
+LoginPage=Kirjautumissivu
+BackgroundImageLogin=Taustakuva
 PermanentLeftSearchForm=Pysyvä hakulomake vasemmassa valikossa
 DefaultLanguage=Oletuskieltä käyttää (kieli-koodi)
 EnableMultilangInterface=Ota monikielinen käyttöliittymä
 EnableShowLogo=Show logo vasemmalla valikossa
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Yritys/Organisaatio tiedot
+CompanyIds=Yritys/Organisaatio identiteetit
 CompanyName=Nimi
 CompanyAddress=Osoite
 CompanyZip=Postinumero
@@ -1007,7 +1013,7 @@ DoNotSuggestPaymentMode=Eivät viittaa siihen,
 NoActiveBankAccountDefined=Ei aktiivisia pankkitilille määritelty
 OwnerOfBankAccount=Omistajan pankkitilille %s
 BankModuleNotActive=Pankkitilit moduuli ei ole käytössä
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Näytä linkki "<strong>%s</strong>"
 Alerts=Vahtipalvelu
 DelaysOfToleranceBeforeWarning=Suvaitsevaisuus viivästyksellä ennen varoitus
 DelaysOfToleranceDesc=Tässä näytössä voidaan määrittää siedetty viivästyksiä, ennen kuin hälytys on raportoitu näytön kanssa picto %s kunkin myöhään elementti.
@@ -1033,15 +1039,15 @@ SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required beca
 SetupDescription5=Muut valikkoon rivit hallita valinnaisia parametrejä.
 LogEvents=Security Audit tapahtumat
 Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
+InfoDolibarr=Tietoja Dolibarrista
+InfoBrowser=Tietoja selaimesta
+InfoOS=Tietoja OS
+InfoWebServer=Tietoja Netti Serveristä
+InfoDatabase=Tietoja Tietokannasta
+InfoPHP=Tietoja PHP
 InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
+BrowserName=Selaimen nimi
+BrowserOS=Selaimen OS
 ListOfSecurityEvents=Luettelo Dolibarr turvallisuus tapahtumat
 SecurityEventsPurged=Turvallisuus tapahtumia puhdistettava
 LogEventDesc=Voit ottaa loki Dolibarr turvallisuus tapahtumia täältä. Järjestelmänvalvojat voivat sitten nähdä sen sisällön kautta valikosta <b>System tools - Audit.</b> Varoitus, tämä ominaisuus voi kuluttaa suuren määrän tietoa tietokannasta.
@@ -1049,8 +1055,9 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Järjestelmän tiedot ovat erinäiset tekniset tiedot saavat lukea vain tila ja näkyvissä vain järjestelmänvalvojat.
 SystemAreaForAdminOnly=Tämä alue on käytettävissä järjestelmänvalvojan käyttäjät vain. Ei mikään Dolibarr käyttöoikeudet voidaan vähentää tätä rajaa.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Voit valita kunkin parametrin yhteydessä Dolibarr näyttävät ja tuntuvat täällä
-AvailableModules=Available app/modules
+AvailableModules=Saatavilla olevat app/moduulit
 ToActivateModule=Aktivoi moduulit, mennä setup-alueella.
 SessionTimeOut=Aika pois istunnosta
 SessionExplanation=Tämä määrä taata, että istunto ei koskaan pääty ennen tätä viivästystä. Mutta PHP sessoin johto ei takeet siitä, että istunto aina päättyy sen jälkeen, kun tämä viive: Tämä ongelma ilmenee, jos järjestelmä puhdistaa välimuisti istunto on käynnissä. <br> Huom: ilman erityistä järjestelmää, sisäisen PHP prosessi puhtaan istuntoonsa joka <b>noin %s / %s,</b> mutta ainoastaan pääsy tehdään muissa istunnoissa.
@@ -1063,7 +1070,7 @@ TriggerActiveAsModuleActive=Käynnistäjät tähän tiedostoon ovat aktiivisia <
 GeneratedPasswordDesc=Määritä tässä joka sääntö, jota haluat käyttää luoda uuden salasanan, jos pyytää, että auto tuotti salasana
 DictionaryDesc=Insert all reference data. You can add your values to the default.
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
+MiscellaneousDesc=Kaikki turvallisuuteen liittyvät parametrit määritetään täällä.
 LimitsSetup=Rajat / Precision setup
 LimitsDesc=Voit määrittää rajat, täsmennyksiä ja optimisations käyttää Dolibarr tästä
 MAIN_MAX_DECIMALS_UNIT=Max desimaalitarkkuuksia yksikkökohtaiseen hinnat
@@ -1085,7 +1092,7 @@ BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
 RestoreDesc=Jos haluat palauttaa Dolibarr varmuuskopio, sinun täytyy:
 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 (<b>%s</b>).
 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 (<b>%s</b>). 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
+RestoreMySQL=MySQL vienti
 ForcedToByAModule= Tämä sääntö on <b>pakko %s</b> on aktivoitu moduuli
 PreviousDumpFiles=Generated database backup files
 WeekStartOnDay=Viikon ensimmäinen päivä
@@ -1098,11 +1105,11 @@ ShowProfIdInAddress=Näytä ammattijärjestöt id osoitteiden kanssa asiakirjoje
 ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
 TranslationUncomplete=Osittainen käännös
 MAIN_DISABLE_METEO=Poista Meteo näkymä
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
+MeteoStdMod=Standardi tila
+MeteoStdModEnabled=Standardi tila aktivoitu
+MeteoPercentageMod=Prosenttitila
+MeteoPercentageModEnabled=Prosenttitila käytössä
+MeteoUseMod=Klikkaa käyttääksesi %s
 TestLoginToAPI=Testaa kirjautua API
 ProxyDesc=Jotkin Dolibarr on oltava Internet-työhön. Määritä tässä parametrit tästä. Jos Dolibarr palvelin on välityspalvelimen takana, näiden parametrien kertoo Dolibarr miten Internetin kautta läpi.
 ExternalAccess=Ulkoinen pääsy
@@ -1133,7 +1140,7 @@ SendmailOptionNotComplete=Varoitus, joissakin Linux-järjestelmissä, lähettä
 PathToDocuments=Polku asiakirjoihin
 PathDirectory=Directory
 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=Setup of translation
+TranslationSetup=Käännöksen asetukset
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
 TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
@@ -1146,7 +1153,7 @@ NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
 TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
+YouMustEnableOneModule=Sinulla pitää olla ainakin 1 moduuli käytössä
 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) and only if permissions were granted:
@@ -1155,17 +1162,17 @@ 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
+SearchOptim=Hakuoptimointi
 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.
+XDebugInstalled=XDebug ladattu
+XCacheInstalled=XCache ladattu
 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".
 AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
 FieldEdition=Alalla painos %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
+GetBarCode=Hanki viivakoodi
 ##### Module password generation
 PasswordGenerationStandard=Palauta salasana luodaan mukaan sisäinen Dolibarr algoritmi: 8 merkkiä sisältävät jaettua numerot ja merkit pieniä.
 PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
@@ -1178,7 +1185,7 @@ DisableForgetPasswordLinkOnLogonPage=Älä näytä linkkiä "Unohda salasana" on
 UsersSetup=Käyttäjät moduuli setup
 UserMailRequired=Sähköposti Vaaditaan Luo uusi käyttäjä
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=Henkilöstöhallinta moduulin asetukset
 ##### Company setup #####
 CompanySetup=Yritykset moduulin asetukset
 CompanyCodeChecker=Moduuli kolmansille osapuolille koodi sukupolven ja tarkastuslennot (asiakas tai toimittaja)
@@ -1192,7 +1199,7 @@ DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS f
 WatermarkOnDraft=Vesileima asiakirjaluonnos
 JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Ammatillinen tunnus ainutlaatuinen
-MustBeUnique=Must be unique?
+MustBeUnique=Täytyy olla uniikki?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
@@ -1249,7 +1256,7 @@ WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none
 ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=Sopimukset numerointi moduulit
 TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
+FreeLegalTextOnContracts=Vapaa sana sopimuksissa
 WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
 ##### Members #####
 MembersSetup=Jäsenet moduulin asetukset
@@ -1381,7 +1388,7 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Esimerkki: objectsid
 LDAPFieldEndLastSubscription=Päiväys merkintää varten
 LDAPFieldTitle=Asema
-LDAPFieldTitleExample=Example: title
+LDAPFieldTitleExample=Esimerkiksi: titteli
 LDAPSetupNotComplete=LDAP-asetukset ole täydellinen (go muiden välilehdet)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=N: o ylläpitäjä tai salasana tarjotaan. LDAP pääsy on nimetön ja vain luku-tilassa.
 LDAPDescContact=Tällä sivulla voit määritellä LDAP attributes nimi LDAP puu jokaisen tiedon löytyy Dolibarr yhteystiedot.
@@ -1413,7 +1420,7 @@ CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilt
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
 DefaultCreateForm=Default values (on forms to create)
-DefaultSearchFilters=Default search filters
+DefaultSearchFilters=Oletus hakusuodattimet
 DefaultSortOrder=Default sort orders
 DefaultFocus=Default focus fields
 ##### Products #####
@@ -1441,6 +1448,9 @@ SyslogFilename=Tiedoston nimi ja polku
 YouCanUseDOL_DATA_ROOT=Voit käyttää DOL_DATA_ROOT / dolibarr.log varten lokitiedoston Dolibarr "asiakirjoihin" hakemistoon. Voit valita eri reitin tallentaa tiedoston.
 ErrorUnknownSyslogConstant=Constant %s ei ole tunnettu syslog vakio
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Lahjoitus-moduulin asetukset
 DonationsReceiptModel=Malline lahjoituksen vastaanottamisesta
@@ -1457,8 +1467,8 @@ BarcodeDescUPC=Viivakoodi tyypin UPC
 BarcodeDescISBN=Viivakoodi tyypin ISBN
 BarcodeDescC39=Viivakoodi tyypin C39
 BarcodeDescC128=Viivakoodi tyypin C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
+BarcodeDescDATAMATRIX=Datamatrix -viivakoodi tyyppi
+BarcodeDescQRCODE=QR -viivakoodi tyyppi
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1475,16 +1485,16 @@ MailingEMailFrom=Sender EMail (From) sähköpostiviestit lähetetään sähköpo
 MailingEMailError=Return Sähköpostiosoite (Virheet-to) koskevat sähköpostit virheistä
 MailingDelay=Seconds to wait after sending next message
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Sähköposti ilmoitus moduulin asetukset
 NotificationEMailFrom=Sender EMail (From) sähköpostiviestit lähetetään ilmoitukset
-FixedEmailTarget=Fixed email target
+FixedEmailTarget=Korjattu sähköposti kohde
 ##### Sendings #####
 SendingsSetup=Lähetysvalinnat-moduulin asetukset
 SendingsReceiptModel=Lähettävä vastaanottanut malli
 SendingsNumberingModules=Lähetysten numerointi moduulit
 SendingsAbility=Support shipping sheets for customer deliveries
 NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Vapaa sana lähetyksissä
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Tuotteiden toimitukset vastaanottamisesta numerointiin moduuli
 DeliveryOrderModel=Tuotteiden toimitukset vastaanottamisesta malli
@@ -1505,7 +1515,7 @@ OSCommerceTestOk=Yhteys palvelimeen ' %s' on tietokanta' %s' kanssa käyttäjä
 OSCommerceTestKo1=Yhteys palvelimeen ' %s' onnistua mutta tietokanta' %s' ei tavoitettu.
 OSCommerceTestKo2=Yhteys palvelimeen ' %s' kanssa käyttäjä' %s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Varasto moduuli asetukset
 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=Valikko poistettu
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Vaihtoehto d'exigibilit de TVA
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=Arvonlisävero on maksettava: <br> - Toimituksen / maksuja tavaroista <br> - Maksut palveluista
 OptionVatDebitOptionDesc=Arvonlisävero on maksettava: <br> - Toimituksen / maksuja tavaroista <br> - Laskulla (debet) ja palvelut
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=Toimituksen
 OnPayment=Maksu
@@ -1550,10 +1562,10 @@ SupposedToBeInvoiceDate=Laskun päiväys käytetty
 Buy=Ostaa
 Sell=Myydä
 InvoiceDateUsed=Laskun päiväys käytetty
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Kirjanpitotili
+AccountancyCodeSell=Myyntien tili
+AccountancyCodeBuy=Ostojen tili
 ##### Agenda #####
 AgendaSetup=Toimet ja esityslistan moduulin asetukset
 PasswordTogetVCalExport=Avain sallia viennin linkki
@@ -1565,7 +1577,7 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on users browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_BROWSER_SOUND=Ota käyttöön ilmoitusäänet
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Napsauttamalla Dial-moduulin asetukset
@@ -1595,10 +1607,10 @@ WebServicesDesc=Antamalla tämän moduulin, Dolibarr tullut verkkopalvelun palve
 WSDLCanBeDownloadedHere=WSDL avainsana tiedosto jos serviceses voi ladata täältä
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
 ##### API ####
-ApiSetup=API module setup
+ApiSetup=API moduuli asetukset
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
+ApiExporerIs=Voit selata ja testata APIs URL-osoitteesta
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1635,27 +1647,27 @@ TaskModelModule=Tasks reports document model
 UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
+AccountingPeriods=Tilikaudet
+AccountingPeriodCard=Tilikausi
+NewFiscalYear=Uusi tilikausi
+OpenFiscalYear=Avaa tilikausi
+CloseFiscalYear=Sulje tilikausi
+DeleteFiscalYear=Poista tilikausi
+ConfirmDeleteFiscalYear=Haluatko varmasti poistaa tämän tilikauden?
+ShowFiscalYear=Näytä tilikausi
+AlwaysEditable=Voi aina muokata
 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=Minimi määrä isoja merkkejä
+NbNumMin=Minimi määrä numero merkkejä
+NbSpeMin=Minimi määrä erikoismerkkejä
+NbIteConsecutive=Maksimi määrä samoja merkkejä
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
+SalariesSetup=Palkka moduulin asetukset
+SortOrder=Lajittelujärjestys
+Format=Formaatti
 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
+ExpenseReportsSetup=Kuluraportit moduulin asetukset
 TemplatePDFExpenseReports=Document templates to generate expense report document
 ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
@@ -1675,14 +1687,14 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
-LinkColor=Color of links
+TextTitleColor=Sivun otsikon väri
+LinkColor=Linkkien värit
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
+BackgroundColor=Taustaväri
+TopMenuBackgroundColor=Taustaväri ylävalikolle
+TopMenuDisableImages=Piilota kuvat ylävalikosta
+LeftMenuBackgroundColor=Taustaväri alavalikolle
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
@@ -1692,16 +1704,16 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
+SellTaxRate=Myyti veroprosentti
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
 UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
 OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
 TypeOfTemplate=Type of template
 TemplateIsVisibleByOwnerOnly=Template is visible by owner only
-VisibleEverywhere=Visible everywhere
+VisibleEverywhere=Näkyvillä kaikkialla
 VisibleNowhere=Visible nowhere
-FixTZ=TimeZone fix
+FixTZ=Aikavyöhyke korjaus
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
@@ -1716,8 +1728,9 @@ MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
 MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
+MailToMember=Sähköpostin lähettäminen jäsensivulta
+MailToUser=Sähköpostin lähettäminen käyttäjäsivulta
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1725,22 +1738,22 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
+ModelModulesProduct=Mallipohjat tuoteiden liitteille
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
 AllPublishers=All publishers
 UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
+AddRemoveTabs=Lisää tai poista välilehti
 AddDataTables=Add object tables
 AddDictionaries=Add dictionaries tables
 AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
+AddBoxes=Lisää widgettejä
+AddSheduledJobs=Lisää Ajastettuja Töitä
 AddHooks=Add hooks
 AddTriggers=Add triggers
 AddMenus=Add menus
-AddPermissions=Add permissions
+AddPermissions=Lisää käyttöoikeuksia
 AddExportProfiles=Add export profiles
 AddImportProfiles=Add import profiles
 AddOtherPagesOrServices=Add other pages or services
@@ -1748,7 +1761,7 @@ AddModels=Add document or numbering templates
 AddSubstitutions=Add keys substitutions
 DetectionNotPossible=Detection not possible
 UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
+ListOfAvailableAPIs=Luettelo saatavilla olevista API:sta
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
 LandingPage=Landing page
@@ -1760,13 +1773,17 @@ BaseCurrency=Reference currency of the company (go into setup of company to chan
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
 WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_PDF_MARGIN_LEFT=PDF:n vasen marginaali
+MAIN_PDF_MARGIN_RIGHT=PDF:n oikea marginaali
+MAIN_PDF_MARGIN_TOP=PDF:n ylämarginaali
+MAIN_PDF_MARGIN_BOTTOM=PDF:n alamarginaali
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index ba3756dc955..27cca484f80 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Voit myös lisätä seuraavat parametrit suodattaa output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Vie kalenteri
 ExtSites=Tuo ulkoinen kalenterit
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Määrä kalenterit
-AgendaExtNb=Kalenteri nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL päästä. ICal-tiedostona
 ExtSiteNoLabel=Ei kuvausta
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 4f62c7e1494..3264db009cb 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=Asiakkaiden laskut
 BillsCustomer=Asiakas lasku
 BillsSuppliers=Tavarantoimittajan laskut
 BillsCustomersUnpaid=Asiakkaiden maksamattomat laskut
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaidForCompany=Asiakkaiden maksamattomat laskut %s
 BillsSuppliersUnpaid=Tavarantoimittajan maksamattomat laskut
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Toimittajien maksamattomat laskut %s
 BillsLate=Maksuviivästykset
 BillsStatistics=Asiakkaiden laskujen tilastot
 BillsStatisticsSuppliers=Tavarantoimittaja laskujen tilastot
@@ -17,9 +17,9 @@ DisabledBecauseNotErasable=Poistettu käytöstä koska ei voida poistaa
 InvoiceStandard=Oletuslasku
 InvoiceStandardAsk=Oletuslasku
 InvoiceStandardDesc=Tämä lasku on oletuslasku.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceDeposit=Ennakkomaksulaksu
+InvoiceDepositAsk=Ennakkomaksulaksu
+InvoiceDepositDesc=Tällainen lasku luodaan, kun ennakkomaksu on vastaanotettu.
 InvoiceProForma=Proforma lasku
 InvoiceProFormaAsk=Proforma lasku
 InvoiceProFormaDesc=<b>Proforma lasku</b> on todellinen lasku, mutta sillä ei ole kirjanpidollista arvoa.
@@ -33,10 +33,10 @@ 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
 ReplaceInvoice=Korvaa laskun %s
-ReplacementInvoice=Korvaus lasku
+ReplacementInvoice=Hyvityslasku
 ReplacedByInvoice=Korvaaminen laskun %s
 ReplacementByInvoice=Korvaaminen lasku
-CorrectInvoice=Oikea laskun %s
+CorrectInvoice=Oikaisu laskun %s
 CorrectionInvoice=Oikaistaan lasku
 UsedByInvoice=Käytetyt maksaa laskun %s
 ConsumedBy=Kuluttamaan
@@ -50,7 +50,7 @@ Invoice=Lasku
 PdfInvoiceTitle=Lasku
 Invoices=Laskut
 InvoiceLine=Laskun linja
-InvoiceCustomer=Asiakas lasku
+InvoiceCustomer=Asiakkaan lasku
 CustomerInvoice=Asiakas lasku
 CustomersInvoices=Asiakkaiden laskut
 SupplierInvoice=Toimittajan laskun
@@ -63,10 +63,11 @@ CustomerInvoicePaymentBack=Maksun
 Payments=Maksut
 PaymentsBack=Maksut takaisin
 paymentInInvoiceCurrency=in invoices currency
-PaidBack=Paid back
+PaidBack=Takaisin maksu
 DeletePayment=Poista maksu
-ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmDeletePayment=Oletko varma, että haluat poistaa tämän suorituksen?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Tavarantoimittajat maksut
 ReceivedPayments=Vastaanotetut maksut
 ReceivedCustomersPayments=Saatujen maksujen asiakkaille
@@ -78,11 +79,11 @@ PaymentsAlreadyDone=Maksut jo
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Maksu sääntö
 PaymentMode=Maksutapa
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=Debit/Luottokortti
 PaymentTypePP=PayPal
-IdPaymentMode=Payment type (id)
+IdPaymentMode=Maksutapa (id)
 CodePaymentMode=Payment type (code)
-LabelPaymentMode=Payment type (label)
+LabelPaymentMode=Maksutapa (selite)
 PaymentModeShort=Maksutapa
 PaymentTerm=Maksuaika
 PaymentConditions=Maksuehdot
@@ -91,7 +92,7 @@ PaymentAmount=Maksusumma
 ValidatePayment=Vahvista maksu
 PaymentHigherThanReminderToPay=Maksu korkeampi kuin muistutus maksaa
 HelpPaymentHigherThanReminderToPay=Huomio, maksusumman yhden tai useamman laskut on korkeampi kuin muualla maksamaan. <br> Muokkaa merkintä, muuten vahvistaa ja mieti luoda menoilmoitus sen ylittävältä osalta saatu kunkin overpaid laskut.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Luokittele "Maksettu"
 ClassifyPaidPartially=Luokittele "Osittain maksettu"
 ClassifyCanceled=Luokittele "Hylätty"
@@ -100,26 +101,27 @@ ClassifyUnBilled=Luokittele 'Laskuttamatta'
 CreateBill=Luo lasku
 CreateCreditNote=Luo hyvityslasku
 AddBill=Luo lasku / hyvityslasku
-AddToDraftInvoices=Add to draft invoice
+AddToDraftInvoices=Lisää luonnoslaskuihin
 DeleteBill=Poista lasku
 SearchACustomerInvoice=Haku asiakkaan laskussa
 SearchASupplierInvoice=Haku toimittajan laskun
 CancelBill=Peruuta lasku
 SendRemindByMail=EMail muistutus
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
+DoPayment=Syötä suoritus
+DoPaymentBack=Syötä hyvitys
 ConvertToReduc=Muunna tulevaisuudessa edullisista
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Kirjoita maksun saanut asiakas
 EnterPaymentDueToCustomer=Tee maksun asiakkaan
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Hinta base
+DisabledBecauseRemainderToPayIsZero=Suljettu, koska maksettavaa ei ole jäljellä
+PriceBase=Perushinta
 BillStatus=Laskun tila
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Luonnos (on vahvistettu)
-BillStatusPaid=Maksetaan
+BillStatusPaid=Maksettu
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Muunnetaan edullisista
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Hylätty
 BillStatusValidated=Validoidut (on maksanut)
 BillStatusStarted=Started
@@ -129,7 +131,7 @@ BillStatusClosedUnpaid=Suljettu (palkaton)
 BillStatusClosedPaidPartially=Maksanut (osittain)
 BillShortStatusDraft=Vedos
 BillShortStatusPaid=Maksetaan
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Hyvitetty tai vaihdettu
 BillShortStatusConverted=Maksetut
 BillShortStatusCanceled=Hylätty
 BillShortStatusValidated=Validoidut
@@ -149,28 +151,28 @@ ErrorInvoiceAvoirMustBeNegative=Virhe, oikea lasku on negatiivinen määrä
 ErrorInvoiceOfThisTypeMustBePositive=Virhe, tällainen lasku on myönteinen määrä
 ErrorCantCancelIfReplacementInvoiceNotValidated=Virhe ei voi peruuttaa laskun, joka on korvattu toisella laskun, joka on vielä luonnosvaiheessa asema
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
-BillFrom=Mistä
-BillTo=Billistä
+BillFrom=Laskuttaja
+BillTo=Vastaanottaja
 ActionsOnBill=Toimet lasku
 RecurringInvoiceTemplate=Template / Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+NotARecurringInvoiceTemplate=Ei toistuva mallilasku
 NewBill=Uusi lasku
-LastBills=Latest %s invoices
+LastBills=Viimeisimmät %s laskut
 LatestTemplateInvoices=Latest %s template invoices
 LatestCustomerTemplateInvoices=Latest %s customer template invoices
 LatestSupplierTemplateInvoices=Latest %s supplier template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s supplier invoices
+LastCustomersBills=Viimeisimmät %s asiakkaan laskut
+LastSuppliersBills=Viimeisimmät %s tavarantoimittajan laskut
 AllBills=Kaikkien laskujen
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Kaikki laskupohjat
 OtherBills=Muut laskut
 DraftBills=Luonnos laskut
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Supplier draft invoices
+CustomersDraftInvoices=Asiakkaiden luonnoslaskut
+SuppliersDraftInvoices=Toimittajien luonnoslaskus
 Unpaid=Maksamattomat
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmDeleteBill=Oletko varman, että haluat poistaa tämän laskun?
 ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
 ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
 ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
@@ -208,18 +210,19 @@ ShowInvoice=Näytä lasku
 ShowInvoiceReplace=Näytä korvaa lasku
 ShowInvoiceAvoir=Näytä menoilmoitus
 ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Näytä tilannetilasku
 ShowPayment=Näytä maksu
 AlreadyPaid=Jo maksanut
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
 Abandoned=Hylätyt
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to refund
-Rest=Pending
+RemainderToPay=Jäljellä oleva avoin summa
+RemainderToTake=Jäljellä oleva laskutettava summa
+RemainderToPayBack=Jäljellä oleva hyvitettävä summa
+Rest=Odotettavissa oleva
 AmountExpected=Määrä väitti
 ExcessReceived=Trop Peru
+ExcessPaid=Excess paid
 EscompteOffered=Discount tarjotaan (maksu ennen aikavälillä)
 EscompteOfferedShort=Alennus
 SendBillRef=Submission of invoice %s
@@ -249,11 +252,11 @@ SetConditions=Aseta maksuehdot
 SetMode=Aseta maksun tila
 SetRevenuStamp=Set revenue stamp
 Billed=Laskutetun
-RecurringInvoices=Recurring invoices
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
+RecurringInvoices=Toistuvat laskut
+RepeatableInvoice=Laskupohja
+RepeatableInvoices=Laskupohjat
+Repeatable=Pohja
+Repeatables=Pohjat
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
@@ -262,10 +265,10 @@ CustomersInvoicesAndPayments=Asiakas laskut ja maksut
 ExportDataset_invoice_1=Asiakas laskujen luettelo ja laskut "linjat
 ExportDataset_invoice_2=Asiakas laskut ja maksut
 ProformaBill=Proforma Bill:
-Reduction=Vähennysprosentti
-ReductionShort=Vähentämistä.
-Reductions=Vähennykset
-ReductionsShort=Vähentämistä.
+Reduction=Alennusprosentti
+ReductionShort=Ale.
+Reductions=Alennukset
+ReductionsShort=Alet.
 Discounts=Alennukset
 AddDiscount=Lisää edullisista
 AddRelativeDiscount=Luo suhteellinen alennus
@@ -283,23 +286,27 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Alennus menoilmoitus %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Tällainen luotto voidaan käyttää laskun ennen sen validointi
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Uusi edullisista
 NewRelativeDiscount=Uusi suhteellinen alennus
+DiscountType=Discount type
 NoteReason=Huomautus / syy
 ReasonDiscount=Perustelu
 DiscountOfferedBy=Myöntämä
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill osoite
 HelpEscompte=Tämä alennus on alennus myönnetään asiakas, koska sen paiement tehtiin ennen aikavälillä.
 HelpAbandonBadCustomer=Tämä määrä on luovuttu (asiakas sanoi olla huono asiakas), ja se on pidettävä exceptionnal väljä.
 HelpAbandonOther=Tämä määrä on luovuttu, koska se oli virhe (väärä asiakas-tai laskunumeroa korvata toinen esimerkki)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Maksu-id
-PaymentRef=Payment ref.
+PaymentRef=Maksuviite
 InvoiceId=Laskun numero
 InvoiceRef=Laskun ref.
 InvoiceDateCreation=Laskun luontipäivämäärä
@@ -327,31 +334,31 @@ RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa
 MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+AmountPaymentDistributedOnInvoice=Summa on jaettu laskulla
 PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
-PaymentNote=Payment note
+PaymentNote=Maksuviesti
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
+FrequencyPer_d=Joka %s päivä
+FrequencyPer_m=Joka %s kuukausi
+FrequencyPer_y=Joka %s vuosi
 FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
+toolTipFrequency=Esimerkkejä: <br> <b> Aseta 7, Päivä </b>: anna uusi lasku joka 7. päivä <br><b> Aseta 3, kuukausi </b>: anna uusi lasku joka kolmas kuukausi
+NextDateToExecution=Päivämäärä seuraavalle lasku luonnille
 NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
+DateLastGeneration=Päivämäärä viimeiselle luonnille
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Hyväksy laskut automaattisesti
+GeneratedFromRecurringInvoice=Luotu mallipohjaisesta toistuvasta laskusta %s
+DateIsNotEnough=Päivämäärää ei ole vielä saavutettu
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
+ViewAvailableGlobalDiscounts=Katso saatavilla olevat alennukset
 # PaymentConditions
 Statut=Tila
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -370,14 +377,14 @@ PaymentConditionShortPT_ORDER=Tilata
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+PaymentConditionShort10D=10 päivää
+PaymentCondition10D=10 päivää
+PaymentConditionShort10DENDMONTH=10 päivää kuun lopusta
+PaymentCondition10DENDMONTH=10 päivää kuun loputtua
+PaymentConditionShort14D=14 päivää
+PaymentCondition14D=14 päivää
+PaymentConditionShort14DENDMONTH=14 päivää kuun lopusta
+PaymentCondition14DENDMONTH=14 päivää kuun loputtua
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -413,7 +420,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Säännellään
 ChequeNumber=Cheque N
 ChequeOrTransferNumber=Cheque / Transfer N
-ChequeBordereau=Check schedule
+ChequeBordereau=Tarkasta aikataulu
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Pankki sekki
 CheckBank=Shekki
@@ -426,7 +433,7 @@ IntracommunityVATNumber=Yhteisöhankintoja määrä alv
 PaymentByChequeOrderedTo=Cheque maksu on maksettava %s lähettää
 PaymentByChequeOrderedToShort=Cheque maksu on maksettava
 SendTo=lähetettiin
-PaymentByTransferOnThisBankAccount=Maksaminen siirto seuraavia tilitietoja
+PaymentByTransferOnThisBankAccount=Maksu tilisiirrolla käyttäen näitä tilitietoja
 VATIsNotUsedForInvoice=* Ei sovelleta alv taide-293B CGI
 LawApplicationPart1=Soveltamalla lain 80.335 tehty 12/05/80
 LawApplicationPart2=tavaroiden omistusoikeus säilyy
@@ -453,7 +460,7 @@ ShowUnpaidAll=Näytä kaikki maksamattomat laskut
 ShowUnpaidLateOnly=Näytä myöhään unpaid laskun vain
 PaymentInvoiceRef=Maksu laskun %s
 ValidateInvoice=Vahvista lasku
-ValidateInvoices=Validate invoices
+ValidateInvoices=Hyväksy laskut
 Cash=Kassa
 Reported=Myöhässä
 DisabledBecausePayments=Ole mahdollista, koska on olemassa joitakin maksuja
@@ -465,8 +472,8 @@ ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or rep
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila &quot;maksanut&quot;.
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
+ToMakePayment=Maksa
+ToMakePaymentBack=Takaisin maksu
 ListOfYourUnpaidInvoices=Luettelo maksamattomista laskuista
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
@@ -514,10 +521,14 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
+DeleteRepeatableInvoice=Poista laskupohja
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s lasku(a) luotu
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 6b769df03b9..b04630abd46 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -1,49 +1,50 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Yrityksen nimi %s on jo olemassa. Valitse toinen.
 ErrorSetACountryFirst=Aseta ensin maa
-SelectThirdParty=Valitse kolmas osapuoli
+SelectThirdParty=Valitse sidosryhmä
 ConfirmDeleteCompany=Haluatko varmasti poistaa tämän yrityksen ja kaikki siitä johdetut tiedot?
 DeleteContact=Poista yhteystieto
 ConfirmDeleteContact=Haluatko varmasti poistaa tämän yhteystiedon ja kaikki siitä johdetut tiedot?
-MenuNewThirdParty=Uusi kolmas osapuoli
+MenuNewThirdParty=Uusi sidosryhmä
 MenuNewCustomer=Uusi asiakas
-MenuNewProspect=Uusi mahdollisuus
+MenuNewProspect=Uusi prospekti
 MenuNewSupplier=Uusi toimittaja
 MenuNewPrivateIndividual=Uusi yksityishenkilö
-NewCompany=Uusi yhtiö (mahdollisuus, asiakas, toimittaja)
-NewThirdParty=Uusi kolmas osapuoli (mahdollisuus, asiakas, toimittaja)
+NewCompany=Uusi yhtiö (prospekti, asiakas, toimittaja)
+NewThirdParty=Uusi sidosryhmä (prospekti, asiakas, toimittaja)
 CreateDolibarrThirdPartySupplier=Luo sidosryhmä (tavarantoimittaja)
 CreateThirdPartyOnly=Luo sidosryhmä
 CreateThirdPartyAndContact=Luo sidosryhmä + ala yhteystieto
 ProspectionArea=Uusien mahdollisuuksien alue
-IdThirdParty=Kolmannen osapuolen tunnus
+IdThirdParty=Sidosryhmän tunnus
 IdCompany=Yritystunnus
 IdContact=Yhteystiedon tunnus
 Contacts=Yhteystiedot/Osoitteet
-ThirdPartyContacts=Kolmannen osapuolen yhteystiedot
-ThirdPartyContact=Kolmannen osapuolen yhteystiedot/osoitteet
+ThirdPartyContacts=Sidosryhmien yhteystiedot
+ThirdPartyContact=Sidosryhmän yhteystiedot/osoitteet
 Company=Yritys
 CompanyName=Yrityksen nimi
 AliasNames=Lisänimi (tuotenimi, brändi, ...)
 AliasNameShort=Lisänimi
 Companies=Yritykset
 CountryIsInEEC=Maa kuuluu EU:hun
-ThirdPartyName=Kolmannen osapuolen nimi
-ThirdPartyEmail=Third party email
-ThirdParty=Kolmas osapuoli
-ThirdParties=Kolmannet osapuolet
-ThirdPartyProspects=Mahdollisuudet
+ThirdPartyName=Sidosryhmän nimi
+ThirdPartyEmail=Sidosryhmän sähköposti
+ThirdParty=Sidosryhmä
+ThirdParties=Sidosryhmät
+ThirdPartyProspects=Prospektit
 ThirdPartyProspectsStats=Näkymät
 ThirdPartyCustomers=Asiakkaat
 ThirdPartyCustomersStats=Asiakkaat
 ThirdPartyCustomersWithIdProf12=Asiakkaat, joilla on %s tai %s
 ThirdPartySuppliers=Tavarantoimittajat
-ThirdPartyType=Kolmannen osapuolen tyyppi
+ThirdPartyType=Sidosryhmän tyyppi
 Individual=Yksityishenkilö
 ToCreateContactWithSameName=Luo automaattisesti yhteystiedot/osoitteen sidosryhmän tiedoilla sidosryhmän alaisuuteen. Yleensä, vaikka sidosryhmä olisi henkilö, pelkkä sidosryhmän luominen riittää.
 ParentCompany=Emoyhtiö
 Subsidiaries=Tytäryhtiöt
-ReportByCustomers=Raportti asiakkaiden mukaan
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Raportti tuloksittain
 CivilityCode=Siviilisääty
 RegisteredOffice=Kotipaikka
@@ -51,12 +52,12 @@ Lastname=Sukunimi
 Firstname=Etunimi
 PostOrFunction=Asema
 UserTitle=Titteli
-NatureOfThirdParty=Nature of Third party
+NatureOfThirdParty=Sidosryhmän luonne
 Address=Osoite
 State=Valtio / Lääni
 StateShort=Valtio
 Region=Alue
-Region-State=Region - State
+Region-State=Alue - Osavaltio
 Country=Maa
 CountryCode=Maakoodi
 CountryId=Maatunnus
@@ -75,15 +76,17 @@ Town=Postitoimipaikka
 Web=Kotisivut
 Poste= Asema
 DefaultLang=Oletuskieli
-VATIsUsed=Arvonlisävero käytössä
-VATIsNotUsed=Arvonlisävero ei ole käytössä
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Täytä osoite käyttäen sidosryhmän osoitetta
 ThirdpartyNotCustomerNotSupplierSoNoRef=Sidosryhmä ei ole asiakas eikä tavarantoimittaja, refering objects ei ole saatavilla
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Maksunt pankkitili
 OverAllProposals=Ehdotukset
 OverAllOrders=Tilaukset
 OverAllInvoices=Laskut
-OverAllSupplierProposals=Price requests
+OverAllSupplierProposals=Tarjouspyynnöt yhteensä
 ##### Local Taxes #####
 LocalTax1IsUsed=Käytä toista veroa
 LocalTax1IsUsedES= RE käytössä
@@ -161,14 +164,14 @@ ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId1DE=Y-tunnus 1 (USt.-IdNr)
+ProfId2DE=ALV-numero 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
-ProfId1ES=Prof Id 1 (CIF / NIF)
-ProfId2ES=Prof Id 2 (henkilötunnus)
+ProfId1ES=ALV-numero 1 (CIF / NIF  Espanja)
+ProfId2ES=Prof Id 2 (Henkilötunnus)
 ProfId3ES=Prof tunnus 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate numero)
 ProfId5ES=-
@@ -192,8 +195,8 @@ ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
 ProfId1IN=Prof Id 1 (TIN)
-ProfId2IN=Prof tunnus 2
-ProfId3IN=Prof Id 3
+ProfId2IN=Prof id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=ALV-numero
-VATIntraShort=ALV-numero
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntaksi on voimassa
-ProspectCustomer=Mahdollisuus / Asiakas
-Prospect=Mahdollisuus
+VATReturn=VAT return
+ProspectCustomer=Prospekti / Asiakas
+Prospect=Prospekti
 CustomerCard=Asiakaskortti
 Customer=Asiakas
 CustomerRelativeDiscount=Suhteellinen asiakasalennus
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Suhteellinen alennus
 CustomerAbsoluteDiscountShort=Absoluuttinen alennus
 CompanyHasRelativeDiscount=Tällä asiakkaalla on oletusalennus<b> %s%%</b>
 CompanyHasNoRelativeDiscount=Tällä asiakkaalla ei ole suhteellista alennusta oletuksena
-CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
+CompanyHasAbsoluteDiscount=Tällä asiakkaalla on alennuksia saatavilla (luottoa tai hyvityksiä) <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Tällä asiakkaalla on vielä luottomerkintöjä <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Asiakkaalla ei ole alennuksia saatavilla
-CustomerAbsoluteDiscountAllUsers=Absoluuttinen alennuksia (myöntää kaikille käyttäjille)
-CustomerAbsoluteDiscountMy=Absoluuttinen alennuksia (myöntää itse)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Ei mitään
 Supplier=Toimittaja
 AddContact=Luo yhteystiedot
@@ -287,9 +300,9 @@ NoContactDefinedForThirdParty=Tälle sidosryhmälle ei ole määritetty yhteysti
 NoContactDefined=Ei yhteystietoja määritelty tämän kolmannen osapuolen
 DefaultContact=Oletus kontakti / osoite
 AddThirdParty=Luo sidosryhmä
-DeleteACompany=Poista yrityksen
+DeleteACompany=Poista yritys
 PersonalInformations=Henkilötiedot
-AccountancyCode=Accounting account
+AccountancyCode=Kirjanpito tili
 CustomerCode=Asiakas-koodi
 SupplierCode=Toimittajan koodi
 CustomerCodeShort=Asiakas-koodi
@@ -307,11 +320,11 @@ ListOfContactsAddresses=Yhteystietojen/osoitteiden luettelo
 ListOfThirdParties=Luettelo kolmansien osapuolten
 ShowCompany=Näytä sidosryhmä
 ShowContact=Näytä yhteystiedot
-ContactsAllShort=Kaikki (N: o suodatin)
-ContactType=Yhteystiedot tyyppi
-ContactForOrders=Tilaukset yhteystiedot
+ContactsAllShort=Kaikki (Ei suodatinta)
+ContactType=Yhteystiedon tyyppi
+ContactForOrders=Tilauksen yhteystiedon
 ContactForOrdersOrShipments=Tilauksen tai lähetyksen yhteystiedot
-ContactForProposals=Ehdotukset yhteystiedot
+ContactForProposals=Tarjouksen yhteystiedon
 ContactForContracts=Sopimukset yhteystiedot
 ContactForInvoices=Laskut yhteystiedot
 NoContactForAnyOrder=Tämä yhteyshenkilö ei ole yhteyttä mihinkään jotta
@@ -322,64 +335,64 @@ NoContactForAnyInvoice=Tämä yhteys ei ole yhteyttä mihinkään lasku
 NewContact=Uusi yhteystieto
 NewContactAddress=Uusi yhteystieto/osoite
 MyContacts=Omat yhteystiedot
-Capital=Pääkaupunki
-CapitalOf=Capital of %s
-EditCompany=Muokkaa yrityksen
+Capital=Pääoma
+CapitalOf=Pääoma of %s
+EditCompany=Muokkaa yritystä
 ThisUserIsNot=Tämä käyttäjä ei ole näköpiirissä, asiakkaan tai toimittajan
 VATIntraCheck=Shekki
 VATIntraCheckDesc=<b>Linkkiä %s</b> sallii pyytää Euroopan alv checker palveluun. Ulkoisen Internet-palvelimelta vaaditaan tätä palvelua työtä.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Tarkista Intracomunnautary alv Euroopan komission Internet-sivustolla
-VATIntraManualCheck=You can also check manually from european web site <a href="%s" target=Voit myös tarkistaa manuaalisesti eurooppalaisen <a href="%s" target="_blank">www-sivuston %s</a>
+VATIntraCheckableOnEUSite=Tarkista yhteisömyynnin ALV Euroopan komission Internet-sivustolla
+VATIntraManualCheck=Voit myös tarkistaa manuaalisesti euroopan nettisivuilta <a href="%s" target="_blank">www-sivuston %s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tarkista ole mahdollista. Tarkista palvelu ei toimiteta jäsenvaltion ( %s).
 NorProspectNorCustomer=Eikä näköpiirissä, eikä asiakkaan
 JuridicalStatus=Yhtiömuoto
 Staff=Henkilökunta
-ProspectLevelShort=Mahdollinen
-ProspectLevel=Esitetilaus mahdollisten
+ProspectLevelShort=Potenttiaali
+ProspectLevel=Prospekti potentiaali
 ContactPrivate=Yksityinen
 ContactPublic=Yhteiset
 ContactVisibility=Näkyvyys
 ContactOthers=Muu
 OthersNotLinkedToThirdParty=Toiset, jotka eivät liity kolmasosaa osapuoli
-ProspectStatus=Esitetilaus asema
+ProspectStatus=Prospektin tila
 PL_NONE=Aucun
 PL_UNKNOWN=Tuntematon
 PL_LOW=Matala
-PL_MEDIUM=Medium
+PL_MEDIUM=Keskitaso
 PL_HIGH=Korkea
 TE_UNKNOWN=-
-TE_STARTUP=Käynnistys
+TE_STARTUP=Startup
 TE_GROUP=Suuri yritys
 TE_MEDIUM=Keskikokoinen yritys
-TE_ADMIN=Governmental
+TE_ADMIN=Valtiollinen
 TE_SMALL=Pieni yritys
 TE_RETAIL=Vähittäiskauppias
 TE_WHOLE=Wholetailer
 TE_PRIVATE=Yksityishenkilö
 TE_OTHER=Muu
-StatusProspect-1=Älä yhteyttä
-StatusProspect0=Älä koskaan yhteyttä
+StatusProspect-1=Älä ota yhteyttä
+StatusProspect0=Yhteyttä ei ole koskaan otettu
 StatusProspect1=Yhteydenotto tehdään
-StatusProspect2=Yhteystiedot prosessi
-StatusProspect3=Yhteystiedot tehnyt
-ChangeDoNotContact=Muuta aseman Älä yhteyttä "
-ChangeNeverContacted=Muuta asema "ei koskaan ottanut yhteyttä"
+StatusProspect2=Yhteydenotto työn alla
+StatusProspect3=Yhteydenotto tehty
+ChangeDoNotContact=Muuta tilaksi 'Älä ota yhteyttä'
+ChangeNeverContacted=Muuta tilaksi 'Yhteyttä ei ole koskaan otettu'
 ChangeToContact=Muuta tilaksi 'Yhteydenotto tehdään'
-ChangeContactInProcess=Muuta status' Yhteystiedot prosessi "
-ChangeContactDone=Muuta status' Yhteystiedot tehnyt "
-ProspectsByStatus=Näkymät aseman
+ChangeContactInProcess=Muuta tilaksi 'Yhteydenotto työn alla'
+ChangeContactDone=Muuta tilaksi 'Yhteydenotto tehty'
+ProspectsByStatus=Prospektit tilan mukaan
 NoParentCompany=Ei mitään
 ExportCardToFormat=Vienti kortin muodossa
 ContactNotLinkedToCompany=Yhteystiedot eivät liity minkään kolmannen osapuolen
 DolibarrLogin=Dolibarr sisäänkirjoittautumissivuksesi
-NoDolibarrAccess=N: o Dolibarr pääsy
+NoDolibarrAccess=Ei Dolibarr pääsyä
 ExportDataset_company_1=Sidosryhmät (Yritykset / säätiöt / ihmiset) ja ominaisuudet
 ExportDataset_company_2=Yhteystiedot ja ominaisuudet
 ImportDataset_company_1=Sidosryhmät (Yritykset / säätiöt / ihmiset) ja ominaisuudet
-ImportDataset_company_2=Yhteystiedot/Osoitteet (sidosryhmät tai ei) ja ominaisuudet
-ImportDataset_company_3=Pankkitiedot
-ImportDataset_company_4=Sidosryhmät/Myyntiedustajat (Vaikuttaa myyntiedustajien käyttäjiin yrityksissä)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Hintataso
 DeliveryAddress=Toimitusosoite
 AddAddress=Lisää osoite
@@ -389,13 +402,13 @@ DeleteFile=Poista tiedosto
 ConfirmDeleteFile=Oletko varma, että haluat poistaa tämän tiedoston?
 AllocateCommercial=Liitä myyntiedustajaan
 Organization=Organisaatio
-FiscalYearInformation=Tiedot tilikauden
-FiscalMonthStart=Lähtölista kuukauden kuluessa tilikauden
+FiscalYearInformation=Tilivuoden tiedot
+FiscalMonthStart=Tilivuoden aloitus kuukausi
 YouMustAssignUserMailFirst=Tälle käyttäjälle täytyy luoda sähköpostiosoite  jotta sähköpostimuistutukset voidaan ottaa käyttöön
 YouMustCreateContactFirst=Voidaksesi lisätä sähköposti muistutukset, täytyy ensin täyttää yhteystiedot sidosryhmän oikealla sähköpostiosoitteella
 ListSuppliersShort=Luettelo toimittajat
-ListProspectsShort=Luettelo näkymät
-ListCustomersShort=Luettelo asiakkaiden
+ListProspectsShort=Luettelo prospektit
+ListCustomersShort=Luettelo asiakkaat
 ThirdPartiesArea=Sidosryhmät ja yhteystiedot
 LastModifiedThirdParties=Viimeisimmät %s muokattua sidosryhmää
 UniqueThirdParties=Yhteensä ainutlaatuinen kolmannen osapuolen
@@ -406,15 +419,16 @@ ProductsIntoElements=Tuotteiden/palveluiden luettelo %s
 CurrentOutstandingBill=Avoin lasku
 OutstandingBill=Avointen laskujen enimmäismäärä
 OutstandingBillReached=Avointen laskujen enimmäismäärä saavutettu
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Paluu numero on muodossa %syymm-nnnn asiakkaan koodi ja %syymm-nnnn luovuttajalle koodi jos VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0.
 LeopardNumRefModelDesc=Asiakas / toimittaja-koodi on maksuton. Tämä koodi voidaan muuttaa milloin tahansa.
 ManagingDirectors=Johtajien nimet (TJ, johtaja, päällikkö...)
 MergeOriginThirdparty=Monista sidosryhmä (sidosryhmä jonka haluat poistaa)
 MergeThirdparties=Yhdistä sidosryhmät
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Sidosryhmät on yhdistetty
+ConfirmMergeThirdparties=Haluatko varmasti yhdistää tämän sidosryhmän nykyiseen? Kaikki yhdistetyt tiedot (laskut, tilaukset, ...) siirretään nykyiselle sidosryhmälle jolloin voit poistaa vastaavan sidosryhmän.
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Myyntiedustajan kirjautuminen
 SaleRepresentativeFirstname=Myyntiedustajan etunimi
 SaleRepresentativeLastname=Myyntiedustajan sukunimi
-ErrorThirdpartiesMerge=Sidosryhmän poistossa tapahtui virhe. Tarkista virhe lokitiedostosta. Muutoksia ei tehty
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Uusi asiakkaan tai tavarantoimittajan koodi näyttäisi olevan duplikaatti
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 9368cba9ed0..dd9fda3ef85 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+MenuFinancial=Laskutus | maksu
+TaxModuleSetupToModifyRules=Määritä laskentasäännöt <a href="%s"> Verojen moduulin määrittämiseen </a>
 TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
 OptionMode=Vaihtoehto kirjanpitotietojen
 OptionModeTrue=Vaihtoehto Panos-tuotos
@@ -13,12 +13,12 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Määrä maksu jäljellä:
 Account=Tili
-Accountparent=Parent account
-Accountsparent=Parent accounts
-Income=Tuotot
-Outcome=Tulos
+Accountparent=Päätili
+Accountsparent=Päätilit
+Income=Tuotto
+Outcome=Kulu
 MenuReportInOut=Tulot / tulokset
-ReportInOut=Balance of income and expenses
+ReportInOut=Tulojen ja menojen saldo
 ReportTurnover=Liikevaihto
 PaymentsNotLinkedToInvoice=Maksut eivät ole sidoksissa mihinkään lasku, joten ei liity mihinkään kolmannen osapuolen
 PaymentsNotLinkedToUser=Maksut eivät ole sidoksissa mihinkään käyttäjä
@@ -31,11 +31,11 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=HT kerätty
 AmountHTVATRealPaid=HT maksetaan
-VATToPay=ALV maksettava
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax Balance
-VATPaid=Tax paid
+VATToPay=Tax sales
+VATReceived=Vastaanotettu vero
+VATToCollect=Ostojen vero
+VATSummary=Verotase
+VATPaid=Maksettu vero
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
 LT1SummaryES=RE Balance
@@ -69,7 +69,7 @@ SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
 LabelContrib=Label contribution
 TypeContrib=Type contribution
-MenuSpecialExpenses=Special expenses
+MenuSpecialExpenses=Erityismenot (Verot, sosiaaliturvamaksut ja osingot)
 MenuTaxAndDividends=Veroja ja osinkoja
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF maksut
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näytä arvonlisäveron maksaminen
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Se sisältää kaikki tehokkaan maksut laskut asiakkailta. <br> - Se perustuu maksupäivä näiden laskujen osalta <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Raportti kolmannen osapuolen IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Raportti kolmannen osapuolen IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Voir le <b>rapport %sTVA encaissement %s</b> pour mode de calcul standardi
 SeeVATReportInDueDebtMode=Voir le <b>rapport %sTVA sur dbit %s</b> pour mode de calcul avec vaihtoehto sur les dbits
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- Jos materiaali omaisuutta, se sisältää verolaskun pohjalta laskun päiväyksestä.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Palvelujen, raportti sisältää ALV laskuja vuoksi, maksettu vai ei, perustuu laskun päivämäärästä.
-RulesVATDueProducts=- Jos materiaali omaisuutta, se sisältää alv laskujen pohjalta laskun päivämäärästä.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Remarque: Pour les biens matriels, il faudrait käytä la date de livraison pour tre plus juste.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/lasku
 NotUsedForGoods=Ei käytetä tavaroiden
 ProposalStats=Tilastot ehdotuksista
@@ -205,7 +210,7 @@ InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By products and services
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Link to order
+LinkedOrder=Linkki Tilauksiin
 Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -233,6 +238,7 @@ LinkedFichinter=Link to an intervention
 ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
+FiscalPeriod=Tilikausi
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index e4178981000..beaef6c9fe0 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
+Permission23101 = Lue Ajastettu työ
 Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23103 = Poista Ajastettu työ
+Permission23104 = Suorita Ajastettu työ
 # Admin
 CronSetup= Ajastettujen tehtävien asetusten hallinta
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -22,7 +22,7 @@ EnabledAndDisabled=Enabled and disabled
 CronLastOutput=Latest run output
 CronLastResult=Latest result code
 CronCommand=Command
-CronList=Scheduled jobs
+CronList=Ajastetut työt
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Prioriteetti
 CronLabel=Etiketti
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Mistä
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 31d528c7170..056a8807a86 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -28,9 +28,9 @@ ErrorProdIdIsMandatory=The %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad syntaksi asiakas-koodi
 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=Asiakas-koodi tarvitaan
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Viivakoodi vaaditaan
 ErrorCustomerCodeAlreadyUsed=Asiakas-koodi on jo käytetty
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=Viivakoodi on jo käytössä
 ErrorPrefixRequired=Etunumero tarvitaan
 ErrorBadSupplierCodeSyntax=Bad syntaksi toimittajan koodi
 ErrorSupplierCodeRequired=Toimittaja-koodi tarvitaan
@@ -39,7 +39,7 @@ ErrorBadParameters=Bad parametrit
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Arvo &quot;%s&quot; on väärä päivämäärä muoto
-ErrorWrongDate=Date is not correct!
+ErrorWrongDate=Päivämäärä ei ole oikein!
 ErrorFailedToWriteInDir=Epäonnistui kirjoittaa hakemistoon %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Löytyi virheellinen sähköposti syntaksi %s rivit tiedoston (esimerkiksi rivi %s email= %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP yhteensovitus ei ole täydellinen.
 ErrorLDAPMakeManualTest=A. LDIF tiedosto on luotu hakemistoon %s. Yritä ladata se manuaalisesti komentoriviltä on enemmän tietoa virheitä.
 ErrorCantSaveADoneUserWithZeroPercentage=Ei voi tallentaa toimia "statut ole käynnistetty", jos alalla "tehtävä" on myös täytettävä.
 ErrorRefAlreadyExists=Ref käytetään luomista jo olemassa.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,9 +127,9 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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 cannot be greater than today
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Yhteystiedon lisääminen epäonnistui
+ErrorDateMustBeBeforeToday=Päivämäärä ei voi olla isompi kuin tämä päivämäärä
 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 <b>%s</b> 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
@@ -142,10 +142,10 @@ ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at
 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'
+ErrorPriceExpression4=Kielletty merkki '%s'
+ErrorPriceExpression5=Odottamaton virhe '%s'
 ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression8=Odottamaton operaatio '%s'
 ErrorPriceExpression9=An unexpected error occured
 ErrorPriceExpression10=Iperator '%s' lacks operand
 ErrorPriceExpression11=Expecting '%s'
@@ -165,9 +165,9 @@ ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions m
 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'
+ErrorGlobalVariableUpdater2=Puuttuva parametri '%s'
 ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater4=SOAP ohjelma epäonnistui virheellä '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
@@ -176,7 +176,7 @@ ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class f
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
+ErrorFileMustHaveFormat=Tiedoston on oltava formaatissa %s
 ErrorSupplierCountryIsNotDefined=Maa tämä toimittaja ei ole määritelty. Korjata ensin.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
@@ -184,18 +184,18 @@ ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
+ErrorModuleNotFound=Moduulitiedostoa ei löydetty.
 ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
 ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
 ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorTaskAlreadyAssigned=Tehtävä on jo määrätty käyttäjälle
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
 ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorNoWarehouseDefined=Virhe, varastoa ei tunnistettu
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
 ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/fi_FI/loan.lang b/htdocs/langs/fi_FI/loan.lang
index 654957d68fa..5ed211f7457 100644
--- a/htdocs/langs/fi_FI/loan.lang
+++ b/htdocs/langs/fi_FI/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index e9439c3606f..c11d82bd3d7 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -35,16 +35,16 @@ MailingStatusSentPartialy=Lähetetyt osittain
 MailingStatusSentCompletely=Lähetetyt täysin
 MailingStatusError=Virhe
 MailingStatusNotSent=Ei lähetetty
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
+MailSuccessfulySent=Sähköposti (%s - %s) hyväksyttiin onnistuneesti toimitettavaksi
+MailingSuccessfullyValidated=Sähköpostitus onnistuneesti vahvistettu
+MailUnsubcribe=Poistu listalta
+MailingStatusNotContact=Älä ota enää yhteyttä
 MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Sähköposti vastaanottaja on tyhjä
 WarningNoEMailsAdded=Ei uusia Email lisätä vastaanottajan luetteloon.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do?
-ConfirmDeleteMailing=Are you sure you want to delete this emailling?
+ConfirmValidMailing=Haluatko varmasti vahvistaa tämän sähköpostituksen?
+ConfirmResetMailing=Varoitus, lähettämällä sähköpostituksen uudelleen <b> %s </b>, sallit tämän sähköpostiviestin lähettämisen massana uudelleen. Oletko varma, että tämä on mitä haluat tehdä?
+ConfirmDeleteMailing=Haluatko varmasti poistaa tämän sähköpostituksen?
 NbOfUniqueEMails=Nb ainutlaatuisia sähköpostit
 NbOfEMails=Nb sähköpostia
 TotalNbOfDistinctRecipients=Useita eri vastaanottajille
@@ -57,18 +57,18 @@ MailingAddFile=Liitä tämä kuva
 NoAttachedFiles=Ei liitetiedostoja
 BadEMail=Bad arvo EMail
 CloneEMailing=Klooni Sähköpostituksen
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+ConfirmCloneEMailing=Haluatko varmasti kloonata tämän sähköpostituksen?
 CloneContent=Klooni viesti
 CloneReceivers=Cloner vastaanottajat
-DateLastSend=Date of latest sending
+DateLastSend=Viimeisin lähetyspäivä
 DateSending=Päivämäärä lähettää
 SentTo=Lähetetään <b>%s</b>
 MailingStatusRead=Luettu
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
-EMailSentToNRecipients=EMail sent to %s recipients.
+YourMailUnsubcribeOK=Sähköpostiosoite <b> %s </b> on poistettu asianmukaisesti postituslistalta
+ActivateCheckReadKey=Avain, jota käytetään salaamaan URL-osoitteet, joita käytetään "Lukukuittaus" ja "Poistu listalta" -ominaisuusksissa
+EMailSentToNRecipients=Sähköposti lähetettiin %s vastaanottajille.
 EMailSentForNElements=EMail sent for %s elements.
-XTargetsAdded=<b>%s</b> recipients added into target list
+XTargetsAdded=<b> %s </b> vastaanottajat lisätään kohdelistaan
 OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=The recipients of the %s record selected (if their email is known).
 GroupEmails=Group emails
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -94,48 +95,48 @@ LineInFile=Rivi %s tiedosto
 RecipientSelectionModules=Määritelty pyynnöt vastaanottajien valinta
 MailSelectedRecipients=Valitut vastaanottajat
 MailingArea=EMailings alueella
-LastMailings=Latest %s emailings
+LastMailings=Uusimmat %s sähköpostitukset
 TargetsStatistics=Tavoitteet tilastot
 NbOfCompaniesContacts=Ainutlaatuinen yhteyksiä yritysten
 MailNoChangePossible=Vastaanottajat validoitava sähköpostia ei voi muuttaa
 SearchAMailing=Haku mailing
 SendMailing=Lähetä sähköpostia
 SentBy=Lähettänyt
-MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand=Sähköpostin lähettäminen voidaan suorittaa komentoriviltä. Pyydä palvelimen pääkäyttäjää käynnistämään seuraava komento lähettämään sähköpostiviesti kaikille vastaanottajille:
 MailingNeedCommand2=Voit kuitenkin lähettää ne online lisäämällä parametri MAILING_LIMIT_SENDBYWEB kanssa arvo max määrä sähköpostit haluat lähettää istunnossa.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+ConfirmSendingEmailing=Jos haluat lähettää sähköpostiviestin suoraan tästä näytöstä, vahvista, että olet varma, että haluat lähettää sähköpostiviestin nyt selaimestasi.
+LimitSendingEmailing=Huomaa: Sähköpostiviestien lähettäminen web-käyttöliittymästä tehdään useita kertoja turvallisuuden ja aikakatkaisujen takia, <b> %s </ b> vastaanottajat kerrallaan jokaiselle lähetysistuntoon.
 TargetsReset=Tyhjennä lista
 ToClearAllRecipientsClickHere=Voit tyhjentää vastaanottajien luetteloon tässä sähköpostitse napsauttamalla painiketta
 ToAddRecipientsChooseHere=Jos haluat lisätä vastaanottajia, valitse niissä luetellaan
 NbOfEMailingsReceived=Massa emailings saanut
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsSend=Massalähetykset lähetettiin
 IdRecord=ID kirjaa
-DeliveryReceipt=Delivery Ack.
+DeliveryReceipt=Toimitus vahvistus
 YouCanUseCommaSeparatorForSeveralRecipients=Voit käyttää <b>comma</b> separator määritellä usealle vastaanottajalle.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature of sending user
+TagCheckMail=Seuraa postin avaamista
+TagUnsubscribe=Poistu listalta-linkki
+TagSignature=Lähettävän käyttäjän allekirjoitus
 EMailRecipient=Recipient EMail
-TagMailtoEmail=Recipient EMail (including html "mailto:" link)
+TagMailtoEmail=Vastaanottajan sähköpostiosoite (myös html "mailto:" linkki)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Ilmoitukset
 NoNotificationsWillBeSent=Ei sähköposti-ilmoituksia on suunniteltu tähän tapahtumaan ja yritys
 ANotificationsWillBeSent=1 ilmoituksesta lähetetään sähköpostitse
 SomeNotificationsWillBeSent=%s ilmoitukset lähetetään sähköpostitse
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
+AddNewNotification=Aktivoi uusi sähköposti ilmoitus tavoittelle/tapahtumalle
+ListOfActiveNotifications=Luettelo kaikista aktiivisista kohteista / tapahtumista sähköpostin ilmoittamiselle
 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 <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Sähköpostin lähettämisen määritys on asetettu "%s": ksi. Tätä tilaa ei voi käyttää massapostitusten lähettämiseen.
+MailSendSetupIs2=Sinun on ensin siirryttävä admin-tilillä valikkoon %sHome - Setup - EMails%s parametrin <strong> '%s' </strong> muuttamiseksi käytettäväksi tilassa "%s". Tässä tilassa voit syöttää Internet-palveluntarjoajan antaman SMTP-palvelimen vaatimat asetukset ja käyttää Massa-sähköpostitoimintoa.
+MailSendSetupIs3=Jos sinulla on kysyttävää SMTP-palvelimen määrittämisestä, voit kysyä osoitteesta %s.
 YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
 NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 3eebc500a6e..07c98737b2c 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -24,13 +24,13 @@ FormatDateHourSecShort=%d.%m.%Y %H:%M:%S %p
 FormatDateHourTextShort=%d. %b %Y %H.%M
 FormatDateHourText=%d. %B %Y %H.%M
 DatabaseConnection=Tietokantayhteys
-NoTemplateDefined=No template available for this email type
+NoTemplateDefined=Tämän tyyliselle sähköpostille ei ole pohjaa saatavilla
 AvailableVariables=Available substitution variables
 NoTranslation=Ei käännöstä
 Translation=Käännös
 NoRecordFound=Tietueita ei löytynyt
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NoRecordDeleted=Tallennuksia ei poistettu
+NotEnoughDataYet=Ei tarpeeksi tietoja
 NoError=Ei virheitä
 Error=Virhe
 Errors=Virheet
@@ -38,13 +38,13 @@ ErrorFieldRequired=Kenttä '%s' on
 ErrorFieldFormat=Kenttä '%s' on huono arvo
 ErrorFileDoesNotExists=Tiedosto %s ei ole olemassa
 ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=Ei voida luoda polkua %s
+ErrorCanNotReadDir=Ei voida lukea polkua %s
 ErrorConstantNotDefined=Parametri %s ei ole määritelty
-ErrorUnknown=Unknown error
+ErrorUnknown=Tuntematon virhe
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo-tiedoston ' %s' ei löytynyt
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Mene "Yritys / organisaatio" - valikkoon korjataksesi asetus
 ErrorGoToModuleSetup=Siirry Moduuli setup vahvistaa tämän
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=Failed to send mail (lähettäjä= %s, vastaanotin= %s)
 ErrorFileNotUploaded=Tiedosto ei ole ladattu. Tarkista, että koko ei ylitä suurinta sallittua, että vapaata tilaa on käytettävissä levyllä ja että siellä ei ole jo tiedoston samalla nimellä tähän hakemistoon.
@@ -61,51 +61,53 @@ ErrorSomeErrorWereFoundRollbackIsDone=Joitakin virheitä ei löytynyt. Meidän p
 ErrorConfigParameterNotDefined=<b>Parametri %s</b> ei ole määritelty sisällä Dolibarr config file <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Ei onnistunut löytämään <b>käyttäjän %s</b> Dolibarr tietokantaan.
 ErrorNoVATRateDefinedForSellerCountry=Virhe ei alv määritellään maa ' %s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Virhe, ei sosiaalisia tai fiskaalisia verotyyppejä, jotka on määritelty maata "%s" varten.
 ErrorFailedToSaveFile=Virhe, ei tallenna tiedosto.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Oikeutesi ei riitä tähän toimintoon
 SetDate=Aseta päivä
 SelectDate=Valitse päivä
-SeeAlso=See also %s
+SeeAlso=Katso myös %s
 SeeHere=Katso täältä
+ClickHere=Klikkaa tästä
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default taustaväri
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
-FileSaved=The file was successfully saved
+FileRenamed=Tiedosto on uudelleen nimetty onnistuneesti
+FileGenerated=Tiedosto luotiin onnistuneesti
+FileSaved=Tiedosto tallennettiin onnistuneesti
 FileUploaded=Tiedosto on siirretty onnistuneesti
-FileTransferComplete=File(s) was uploaded successfully
-FilesDeleted=File(s) successfully deleted
+FileTransferComplete=Tiedosto(t) ladattiin onnistuneesti
+FilesDeleted=Tiedosto(t) poistettiin onnistuneesti
 FileWasNotUploaded=Tiedosto on valittu liite mutta ei ollut vielä ladattu. Klikkaa "Liitä tiedosto" tätä.
 NbOfEntries=Huom Merkintöjen
-GoToWikiHelpPage=Read online help (Internet access needed)
+GoToWikiHelpPage=Lue online-ohjeet (tarvitaan Internet-yhteys)
 GoToHelpPage=Lue auttaa
 RecordSaved=Record tallennettu
-RecordDeleted=Record deleted
+RecordDeleted=Tallennus poistettu
 LevelOfFeature=Taso ominaisuuksia
 NotDefined=Ei määritelty
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarrin todennusmoodi on <b> %s </b> konfigurointitiedostossa <b> conf.php </b>. <br> Tämä tarkoittaa, että salasanatietokanta on Dolibarrin ulkopuolinen, joten tämän kentän muuttaminen ei välttämättä vaikuta.
 Administrator=Administrator
 Undefined=Määrittelemätön
-PasswordForgotten=Password forgotten?
+PasswordForgotten=Unohditko salasanasi?
 SeeAbove=Katso edellä
 HomeArea=Etusivu alue
-LastConnexion=Latest connection
+LastConnexion=Viimeisin yhteys
 PreviousConnexion=Edellinen yhteydessä
-PreviousValue=Previous value
+PreviousValue=Edellinen arvo
 ConnectedOnMultiCompany=Connected on kokonaisuus
 ConnectedSince=Sidossuhteessa koska
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+AuthenticationMode=Todennusmoodi
+RequestedUrl=Pyydetty URL-osoite
 DatabaseTypeManager=Database Type Manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+RequestLastAccessInError=Virhe viimeisimmästä tietokannan pääsypyynnöstä
+ReturnCodeLastAccessInError=Viimeisin tietokannan käyttöoikeuspyyntövirheen palautekoodi
+InformationLastAccessInError=Tiedot viimeisimmän tietokannan käyttöoikeuspyynnön virheestä
 DolibarrHasDetectedError=Dolibarr on havaittu tekninen virhe
 YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+InformationToHelpDiagnose=Nämä tiedot voivat olla hyödyllisiä vianmääritystarkoituksiin (voit asettaa vaihtoehdon $ dolibarr_main_prod arvoon '1' poistamaan tällaiset ilmoitukset)
 MoreInformation=Lisätietoa
 TechnicalInformation=Tekniset tiedot
 TechnicalID=Tekninen tunniste
@@ -131,15 +133,15 @@ Never=Ei koskaan
 Under=alle
 Period=Kausi
 PeriodEndDate=Lopetuspäivä ajaksi
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
+SelectedPeriod=Valittu aikajakso
+PreviousPeriod=Edellinen aikajakso
 Activate=Aktivoi
 Activated=Aktiivihiili
 Closed=Suljettu
 Closed2=Suljettu
 NotClosed=Not closed
 Enabled=Enabled
-Deprecated=Deprecated
+Deprecated=Käytöstä poistettu
 Disable=Poistaa käytöstä
 Disabled=Disabled
 Add=Lisää
@@ -148,7 +150,7 @@ RemoveLink=Poista linkki
 AddToDraft=Add to draft
 Update=Päivittää
 Close=Sulje
-CloseBox=Remove widget from your dashboard
+CloseBox=Poista widgetti kojelaudaltasi
 Confirm=Vahvista
 ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
 Delete=Poistaa
@@ -168,11 +170,11 @@ ToClone=Klooni
 ConfirmClone=Valitse tietoja haluat klooni:
 NoCloneOptionsSpecified=Ei tietoja kloonata määritelty.
 Of=ja
-Go=Go
+Go=Mene
 Run=Suorita
 CopyOf=Kopio
 Show=Näytä
-Hide=Hide
+Hide=Piilota
 ShowCardHere=Näytä kortti
 Search=Haku
 SearchOf=Haku
@@ -185,6 +187,7 @@ ToLink=Linkki
 Select=Valitse
 Choose=Valitse
 Resize=Muuta kokoa
+ResizeOrCrop=Resize or Crop
 Recenter=Keskitä
 Author=Laatija
 User=Käyttäjä
@@ -201,7 +204,7 @@ Parameter=Parametri
 Parameters=Parametrit
 Value=Arvo
 PersonalValue=Henkilökohtainen arvo
-NewObject=New %s
+NewObject=Uusi %s
 NewValue=Uusi arvo
 CurrentValue=Nykyinen arvo
 Code=Koodi
@@ -216,8 +219,8 @@ Info=Kirjaudu
 Family=Perhe
 Description=Kuvaus
 Designation=Kuvaus
-Model=Doc template
-DefaultModel=Default doc template
+Model=Doc-pohja
+DefaultModel=Oletus doc-pohja
 Action=Tapahtuma
 About=Tietoa
 Number=Numero
@@ -263,7 +266,7 @@ DateBuild=Raportti rakentaa päivämäärä
 DatePayment=Maksupäivä
 DateApprove=Hyväksytään päivämäärä
 DateApprove2=Hyväksytään päivämäärä (toinen hyväksyntä)
-RegistrationDate=Registration date
+RegistrationDate=Rekisteröinti päivämäärä
 UserCreation=Creation user
 UserModification=Modification user
 UserValidation=Validation user
@@ -302,9 +305,9 @@ Afternoon=Iltapäivä
 Quadri=Quadri
 MonthOfDay=Kuukaudenpäivä
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Kurssi
-CurrencyRate=Currency conversion rate
+CurrencyRate=Valuutan vaihtokurssi
 UseLocalTax=Sisältää veron
 Bytes=Tavua
 KiloBytes=Kilotavua
@@ -323,26 +326,29 @@ Copy=Kopioi
 Paste=Liitä
 Default=Oletus
 DefaultValue=Oletusarvo
-DefaultValues=Default values
+DefaultValues=Oletusarvot
 Price=Hinta
+PriceCurrency=Price (currency)
 UnitPrice=Yksikköhinta
 UnitPriceHT=Yksikköhinta (netto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Yksikköhinta
-PriceU=UP
-PriceUHT=UP (netto)
+PriceU=A-hinta
+PriceUHT=Veroton hinta
 PriceUHTCurrency=U.P (valuutta)
-PriceUTTC=U.P. (inc. tax)
+PriceUTTC=Verollinen hinta
 Amount=Määrä
 AmountInvoice=Laskun summa
+AmountInvoiced=Amount invoiced
 AmountPayment=Maksun summa
 AmountHTShort=Määrä (netto)
 AmountTTCShort=Määrä (sis. alv)
 AmountHT=Määrä (ilman veroja)
 AmountTTC=Määrä (sis. alv)
 AmountVAT=Verot
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAlreadyPaid=Maksettu jo, alkuperäinen valuutta
+MulticurrencyRemainderToPay=Maksua avoimena, alkuperäinen valuutta
+MulticurrencyPaymentAmount=Suorituksen summa, alkuperäinen valuutta
 MulticurrencyAmountHT=Summa (veroton), alkuperäisessä valuutassa
 MulticurrencyAmountTTC=Summa (verollinen), alkuperäisessä valuutassa
 MulticurrencyAmountVAT=Veron määrä, alkuperäinen valuutta
@@ -353,6 +359,7 @@ AmountLT2ES=Määrä IRPF
 AmountTotal=Yhteissumma
 AmountAverage=Keskimääräinen summa
 PriceQtyMinHT=Hinta määrä min. (ilman veroja)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Prosenttia
 Total=Yhteensä
 SubTotal=Välisumma
@@ -374,8 +381,8 @@ TotalLT1IN=Total CGST
 TotalLT2IN=Total SGST
 HT=Veroton
 TTC=Sis. alv
-INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
+INCVATONLY=Sis. ALV
+INCT=Sis. kaikki verot
 VAT=Alv
 VATIN=IGST
 VATs=Myyntiverot
@@ -389,12 +396,14 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Veroaste
-DefaultTaxRate=Default tax rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Oletus veroprosentti
 Average=Keskimääräinen
 Sum=Sum
 Delta=Delta
-Module=Module/Application
-Modules=Modules/Applications
+Module=Moduuli/Applikaatio
+Modules=Moduulit/Applikaatiot
 Option=Vaihtoehto
 List=Luettelo
 FullList=Täydellinen luettelo
@@ -417,16 +426,20 @@ ActionNotApplicable=Ei sovelleta
 ActionRunningNotStarted=Aloitetaan
 ActionRunningShort=Käsittelyssä
 ActionDoneShort=Päättetty
-ActionUncomplete=Uncomplete
+ActionUncomplete=Keskeneräinen
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Yritys/Organisaatio
+Accountant=Accountant
 ContactsForCompany=Sidosryhmien yhteystiedot
 ContactsAddressesForCompany=Sidosryhmien kontaktit/osoitteet
 AddressesForCompany=Sidosryhmien osoitteet
 ActionsOnCompany=Sidosryhmien tapahtumat
 ActionsOnMember=Jäsenen tapahtumat
-ActionsOnProduct=Events about this product
+ActionsOnProduct=Tapahtumat tästä tuotteesta
 NActionsLate=%s myöhässä
+ToDo=Tehtävät
+Completed=Completed
+Running=Käsittelyssä
 RequestAlreadyDone=Pyyntö on jo rekisteröity
 Filter=Suodata
 FilterOnInto=Hakuperuste '<strong>%s</strong>' kentistä %s
@@ -438,9 +451,9 @@ Generate=Luo
 Duration=Kesto
 TotalDuration=Kokonaiskesto
 Summary=Yhteenveto
-DolibarrStateBoard=Database statistics
-DolibarrWorkBoard=Open items dashboard
-NoOpenedElementToProcess=No opened element to process
+DolibarrStateBoard=Tietokannan tilastot
+DolibarrWorkBoard=Avoimet työtehtävät
+NoOpenedElementToProcess=Ei avattuja elementtejä prosessissa
 Available=Saatavissa
 NotYetAvailable=Ei vielä saatavilla
 NotAvailable=Ei saatavilla
@@ -475,7 +488,7 @@ Discount=Alennus
 Unknown=Tuntematon
 General=Yleiset
 Size=Koko
-OriginalSize=Original size
+OriginalSize=Alkuperäinen koko
 Received=Vastaanotetut
 Paid=Maksetut
 Topic=Aihe
@@ -489,19 +502,19 @@ NextStep=Seuraava askel
 Datas=Tiedot
 None=Ei mitään
 NoneF=Ei mitään
-NoneOrSeveral=None or several
+NoneOrSeveral=Ei yhtään tai useita
 Late=Myöhässä
 LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Kuva
 Photos=Kuvat
 AddPhoto=Lisää kuva
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
+DeletePicture=Kuva poistettu
+ConfirmDeletePicture=Varmista kuvan poistaminen?
 Login=Kirjautuminen
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginEmail=Kirjaudu (sähköposti)
+LoginOrEmail=Kirjaudu vai Sähköposti
 CurrentLogin=Nykyinen kirjautuminen
-EnterLoginDetail=Enter login details
+EnterLoginDetail=Syötä kirjautumistiedot
 January=Tammikuu
 February=Helmikuu
 March=Maaliskuu
@@ -550,18 +563,18 @@ MonthShort09=syyskuu
 MonthShort10=lokakuu
 MonthShort11=marraskuu
 MonthShort12=joulukuu
-MonthVeryShort01=J
+MonthVeryShort01=T
 MonthVeryShort02=PE
 MonthVeryShort03=MA
-MonthVeryShort04=A
+MonthVeryShort04=H
 MonthVeryShort05=MA
-MonthVeryShort06=J
-MonthVeryShort07=J
-MonthVeryShort08=A
+MonthVeryShort06=K
+MonthVeryShort07=H
+MonthVeryShort08=E
 MonthVeryShort09=SU
-MonthVeryShort10=O
-MonthVeryShort11=N
-MonthVeryShort12=D
+MonthVeryShort10=L
+MonthVeryShort11=Mar
+MonthVeryShort12=J
 AttachedFiles=Liitetyt tiedostot ja asiakirjat
 JoinMainDoc=Join main document
 DateFormatYYYYMM=VVVV-KK
@@ -572,7 +585,7 @@ ReportPeriod=Raportointikausi
 ReportDescription=Kuvaus
 Report=Raportti
 Keyword=Avainsana
-Origin=Origin
+Origin=Alkuperä
 Legend=Legend
 Fill=Täytä
 Reset=Nollaa
@@ -594,7 +607,7 @@ TotalQuantity=Kokonaismäärä
 DateFromTo=Kohteesta %s %s
 DateFrom=Kohteesta %s
 DateUntil=Vasta %s
-Check=Shekki
+Check=Tarkista
 Uncheck=Poista valinta
 Internal=Sisäinen
 External=Ulkoinen
@@ -616,7 +629,7 @@ Undo=Kumoa
 Redo=Toista
 ExpandAll=Laajenna kaikki
 UndoExpandAll=Kumoa laajentaminen
-SeeAll=See all
+SeeAll=Katso kaikki
 Reason=Syy
 FeatureNotYetSupported=Ominaisuus ei vielä tue
 CloseWindow=Sulje ikkuna
@@ -629,7 +642,7 @@ SendAcknowledgementByMail=Lähetä vahvistussähköposti
 SendMail=Lähetä sähköpostia
 EMail=Sähköposti
 NoEMail=Ei sähköpostia
-Email=Email
+Email=Sähköposti
 NoMobilePhone=Ei matkapuhelinta
 Owner=Omistaja
 FollowingConstantsWillBeSubstituted=Seuraavat vakiot voidaan korvata ja vastaava arvo.
@@ -639,8 +652,8 @@ GoBack=Mene takaisin
 CanBeModifiedIfOk=Voidaan muuttaa, jos voimassa
 CanBeModifiedIfKo=Voidaan muuttaa, jos ei kelpaa
 ValueIsValid=Arvo on voimassa
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
+ValueIsNotValid=Arvo ei kelpaa
+RecordCreatedSuccessfully=Tallennus luotiin onnistuneesti
 RecordModifiedSuccessfully=Tietue muunnettu onnistuneesti
 RecordsModified=%s tietue muokattu
 RecordsDeleted=%s record deleted
@@ -653,7 +666,7 @@ SessionName=Istunnon nimi
 Method=Menetelmä
 Receive=Vastaanota
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
+ExpectedValue=Odotettu Arvo
 CurrentValue=Nykyinen arvo
 PartialWoman=Osittainen
 TotalWoman=Yhteensä
@@ -676,14 +689,14 @@ NoFileFound=Ei asiakirjoja tallennettuna tähän hakemistoon
 CurrentUserLanguage=Nykyinen kieli
 CurrentTheme=Nykyinen teema
 CurrentMenuManager=Nykyinen valikkohallinta
-Browser=Browser
+Browser=Selain
 Layout=Layout
-Screen=Screen
+Screen=Näyttö
 DisabledModules=Ei käytössä olevat moduulit
 For=Saat
 ForCustomer=Asiakkaan
 Signature=Allekirjoitus
-DateOfSignature=Date of signature
+DateOfSignature=Allekirjoituksen päivämäärä
 HidePassword=Näytä komento salasana piilotettuna
 UnHidePassword=Näytä todellinen komento salasana näkyen
 Root=Juuri
@@ -697,13 +710,15 @@ FreeLineOfType=Not a predefined entry of type
 CloneMainAttributes=Klooni objekti sen tärkeimmät attribuutit
 PDFMerge=PDF Merge
 Merge=Merge
-DocumentModelStandardPDF=Standard PDF template
+DocumentModelStandardPDF=Standardi PDF pohja
 PrintContentArea=Näytä sivu tulostaa päävalikkoon alue
 MenuManager=Valikkomanageri
 WarningYouAreInMaintenanceMode=Varoitus, olet ylläpitotilassa, joten vain kirjautunut <b>%s</b> saa käyttää hakemuksen tällä hetkellä.
 CoreErrorTitle=Järjestelmävirhe
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Luottokortti
+ValidatePayment=Vahvista maksu
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Tähdellä <b>%s</b> ovat pakollisia
 FieldsWithIsForPublic=Tähdellä <b>%s</b> näkyvät julkisessa jäsenluettelossa. Jos et halua tätä, poista valinta "julkinen"-kentästä.
 AccordingToGeoIPDatabase=(Mukaan GeoIP muuntaminen)
@@ -728,14 +743,14 @@ NewAttribute=Uusi ominaisuus
 AttributeCode=Ominaisuuden koodi
 URLPhoto=Kuvan tai logon url
 SetLinkToAnotherThirdParty=Linkki toiseen sidosryhmään
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
+LinkTo=Linkki
+LinkToProposal=Linkki Tarjoukseen
+LinkToOrder=Linkki Tilauksiin
+LinkToInvoice=Linkki Laskuihin
+LinkToSupplierOrder=Linkki Toimittaja tilauksiin
+LinkToSupplierProposal=Linkki Toimittaja tarjouksiin
+LinkToSupplierInvoice=Linkki Toimittaja laskuihin
+LinkToContract=Linkki Sopimuksiin
 LinkToIntervention=Link to intervention
 CreateDraft=Luo luonnos
 SetToDraft=Palaa luonnokseen
@@ -754,32 +769,32 @@ ByDay=Päivän mukaan
 BySalesRepresentative=Myyntiedustajittain
 LinkedToSpecificUsers=Linkitetty käyttäjätietoon
 NoResults=Ei tuloksia
-AdminTools=Admin tools
+AdminTools=Ylläpidon työkalut
 SystemTools=Kehitysresurssit
 ModulesSystemTools=Moduuli työkalut
 Test=Testi
 Element=Osa
 NoPhotoYet=Ei kuvaa saatavilla vielä
 Dashboard=Kojelauta
-MyDashboard=My dashboard
+MyDashboard=Minun kojelauta
 Deductible=Omavastuu
 from=mistä
 toward=eteenpäin
 Access=Käyttöoikeus
 SelectAction=Valitse toiminto
-SelectTargetUser=Select target user/employee
+SelectTargetUser=Valitse kohde käyttäjä/työntekijä
 HelpCopyToClipboard=Käytä Ctrl+C kopioisaksesi leikepöydälle
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Alkuperäinen tiedostonimi
 SetDemandReason=Aseta lähde
-SetBankAccount=Define Bank Account
-AccountCurrency=Account currency
+SetBankAccount=Määritä pankkitili
+AccountCurrency=Tilin valuutta
 ViewPrivateNote=Katso huomiot
 XMoreLines=%s rivi(ä) piilossa
-ShowMoreLines=Show more/less lines
+ShowMoreLines=Näytä enemmän/vähemmän rivejä
 PublicUrl=Julkinen URL
 AddBox=Lisää laatikko
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Valitse elementti ja klikkaa %s
 PrintFile=Tulosta tiedostoon %s
 ShowTransaction=Näytä pankkitilin kirjaus
 ShowIntervention=Näytä interventio
@@ -787,36 +802,36 @@ ShowContract=Näytä sopimus
 GoIntoSetupToChangeLogo=Vaihtaaksesi logoa mene Home - Setup - Company tai Home - Setup - Display poistaaksesi
 Deny=Kiellä
 Denied=Kielletty
-ListOf=List of %s
-ListOfTemplates=List of templates
+ListOf=Luettelo %s
+ListOfTemplates=Luettelo Pohjista
 Gender=Sukupuoli
 Genderman=Mies
 Genderwoman=Nainen
 ViewList=Näytä lista
 Mandatory=Pakollinen
 Hello=Terve
-GoodBye=GoodBye
+GoodBye=Näkemiin
 Sincerely=Vilpittömästi
 DeleteLine=Poista rivi
 ConfirmDeleteLine=Halutako varmasti poistaa tämän rivin?
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
 TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
-NoRecordSelected=No record selected
+NoRecordSelected=Tallennusta ei ole valittu
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
 ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Luokittele laskutetaan
+ClassifyUnbilled=Classify unbilled
 Progress=Edistyminen
-ClickHere=Klikkaa tästä
 FrontOffice=Front office
 BackOffice=Back office
-View=View
+View=Katso
 Export=Export
 Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=Vie suodatettu luettelo
+ExportList=Vie Luettelo
 ExportOptions=Vienti Valinnat
 Miscellaneous=Miscellaneous
 Calendar=Kalenteri
@@ -824,33 +839,35 @@ GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link (public/external)
+DirectDownloadLink=Suora latauslinkki (julkinen/ulkoinen)
 DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
-Download=Download
-DownloadDocument=Download document
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
-SetMultiCurrencyCode=Set currency
+Download=Lataa
+DownloadDocument=Lataa dokumentti
+ActualizeCurrency=Päivitä valuuttakurssi
+Fiscalyear=Tilivuosi
+ModuleBuilder=Moduuli Rakentaja
+SetMultiCurrencyCode=Aseta valuutta
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
+WebSite=Nettisivu
+WebSites=Nettisivut
 WebSiteAccounts=Web site accounts
-ExpenseReport=Expense report
+ExpenseReport=Kustannusraportti
 ExpenseReports=Kuluraportit
 HR=HR
 HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatically calculated
+AutomaticallyCalculated=Automaattisesti laskettu
 TitleSetToDraft=Go back to draft
 ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
-ImportId=Import id
+ImportId=Vie ID
 Events=Tapahtumat
-EMailTemplates=Emails templates
+EMailTemplates=Sähköposti pohjat
 FileNotShared=File not shared to exernal public
 Project=Hanke
 Projects=Projektit
 Rights=Oikeudet
+LineNb=Line no.
+IncotermLabel=Incoterm-ehdot
 # Week day
 Monday=Maanantai
 Tuesday=Tiistai
@@ -880,12 +897,12 @@ ShortThursday=TO
 ShortFriday=PE
 ShortSaturday=LA
 ShortSunday=SU
-SelectMailModel=Select an email template
+SelectMailModel=Valitse sähköpostipohja
 SetRef=Aseta viite
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Tuloksia ei löytynyt
 Select2Enter=Syötä
-Select2MoreCharacter=or more character
+Select2MoreCharacter=tai useampi merkki
 Select2MoreCharacters=tai lisää merkkejä
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Lataa lisää tuloksia...
@@ -905,14 +922,22 @@ SearchIntoCustomerProposals=Tarjoukset asiakkaille
 SearchIntoSupplierProposals=Tavarantoimittajan tarjoukset
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Sopimukset
-SearchIntoCustomerShipments=Customer shipments
+SearchIntoCustomerShipments=Asiakas lähetykset
 SearchIntoExpenseReports=Kuluraportit
 SearchIntoLeaves=Leaves
 CommentLink=Kommentit
-NbComments=Number of comments
+NbComments=Kommenttien määrä
 CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
+CommentAdded=Kommentti lisätty
+CommentDeleted=Kommentti poistettu
 Everybody=Yhteiset hanke
-PayedBy=Payed by
-PayedTo=Payed to
+PayedBy=Maksanut
+PayedTo=Maksettu
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Vaikuttaa
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index d4e86dc0c40..14dd9293ae2 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 8e2299b0c15..4d1271f1e00 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Luettelo validoitujen yleisön jäsenet
 ErrorThisMemberIsNotPublic=Tämä jäsen ei ole julkinen
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Toinen jäsen <b>(nimi: %s, kirjautuminen: %s)</b> on jo liitetty kolmasosaa <b>osapuoli %s.</b> Poista tämä ensimmäiseksi, koska kolmas osapuoli ei voi yhdistää vain jäsen (ja päinvastoin).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Turvallisuussyistä sinun täytyy myöntää oikeudet muokata kaikki käyttäjät pystyvät linkki jäsenen käyttäjä, joka ei ole sinun.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Sisältö jäsennimesi kortti
 SetLinkToUser=Linkki on Dolibarr käyttäjä
 SetLinkToThirdParty=Linkki on Dolibarr kolmannen osapuolen
 MembersCards=Jäsenet tulostaa kortit
@@ -108,17 +106,33 @@ PublicMemberCard=Osakkeenomistajan julkinen kortti
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Näytä tilaus
-SendAnEMailToMember=Lähetä tiedot sähköpostitse jäsen
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Sisältö jäsennimesi kortti
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=Viestin aihe ja jäsen autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=Sähköpostitse jäsenen autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail aihe jäsen validointi
-DescADHERENT_MAIL_VALID=EMail jäsenen validointi
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail aihe tilaamisesta
-DescADHERENT_MAIL_COTIS=EMail merkitsemisen
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail aihe jäsen résiliation
-DescADHERENT_MAIL_RESIL=EMail jäsenen résiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail automaattisen sähköpostit
 DescADHERENT_ETIQUETTE_TYPE=Etiketit muodossa
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 6f6b340032e..9e326e3e6ac 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Viesti on validoitu maksun tuotto sivu
 MessageKO=Viesti on peruutettu maksun tuotto sivu
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linkitettyä objektia
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Aloita lataaminen
 CancelUpload=Peruuta Lähetä
 FileIsTooBig=Files on liian suuri
 PleaseBePatient=Ole kärsivällinen ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titteli
 WEBSITE_DESCRIPTION=Kuvaus
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/fi_FI/paypal.lang b/htdocs/langs/fi_FI/paypal.lang
index 33f45eb168a..7b831d66326 100644
--- a/htdocs/langs/fi_FI/paypal.lang
+++ b/htdocs/langs/fi_FI/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Tämä on id liiketoimen: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Lisää URL Paypal-maksujärjestelmää, kun lähetät asiakirjan postitse
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 17f05adf40d..2a07ae4aa83 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -16,86 +16,87 @@ Create=Luo
 Reference=Viite
 NewProduct=Uusi tuote
 NewService=Uusi palvelu
-ProductVatMassChange=Mass VAT change
+ProductVatMassChange=Massa ALV vaihto
 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=Accounting code (purchase)
-ProductAccountancySellCode=Accounting code (sale)
-ProductAccountancySellIntraCode=Accounting code (sale intra-community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancyBuyCode=Kirjanpitotili (ostot)
+ProductAccountancySellCode=Kirjanpitotili (myynti)
+ProductAccountancySellIntraCode=Kirjanpitotili (Yhteisömyynti)
+ProductAccountancySellExportCode=Kirjanpitotili (Vientimyynti)
 ProductOrService=Tuote tai palvelu
 ProductsAndServices=Tuotteet ja palvelut
 ProductsOrServices=Tuotteet tai palvelut
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
+ProductsPipeServices=Products | Services
+ProductsOnSaleOnly=Tuotteet vain myynti
+ProductsOnPurchaseOnly=Tuotteet vain osto
+ProductsNotOnSell=Tuotteet eivät ole myynnissä ja ostossa
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSaleOnly=Palvelut vain myynti
+ServicesOnPurchaseOnly=Palvelut vain osto
+ServicesNotOnSell=Palvelut eivät ole myynnissä ja ostossa
 ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+LastModifiedProductsAndServices=Viimeksi %s muokattu tuotteet/palvelut
+LastRecordedProducts=Viimeksi %s tallennetut tuotteet
+LastRecordedServices=Viimeksi %s tallennetut palvelut
 CardProduct0=Tuote-kortti
 CardProduct1=Palvelukortti
-Stock=Kanta
+Stock=Varasto
 Stocks=Varastot
 Movements=Liikkeet
 Sell=Myynti
 Buy=Ostot
-OnSell=Käytössä myydä
-OnBuy=Ostettu
-NotOnSell=Out of Myy
-ProductStatusOnSell=Käytössä myydä
-ProductStatusNotOnSell=Out of myydä
-ProductStatusOnSellShort=Käytössä myydä
-ProductStatusNotOnSellShort=Out of myydä
-ProductStatusOnBuy=Saatavissa
-ProductStatusNotOnBuy=Vanhentunut
-ProductStatusOnBuyShort=Saatavissa
-ProductStatusNotOnBuyShort=Vanhentunut
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
+OnSell=Myynnissä
+OnBuy=Ostettavissa
+NotOnSell=Ei myynnissä
+ProductStatusOnSell=Myynnissä
+ProductStatusNotOnSell=Ei myynnissä
+ProductStatusOnSellShort=Myynnissä
+ProductStatusNotOnSellShort=Ei myynnissä
+ProductStatusOnBuy=Saatavilla
+ProductStatusNotOnBuy=Ei saatavilla
+ProductStatusOnBuyShort=Saatavilla
+ProductStatusNotOnBuyShort=Ei saatavilla
+UpdateVAT=Päivitä ALV
+UpdateDefaultPrice=Päivitä oletus hinta
 UpdateLevelPrices=Update prices for each level
 AppliedPricesFrom=Sovellettu hinnat
 SellingPrice=Myyntihinta
 SellingPriceHT=Myyntihinta (ilman veroja)
 SellingPriceTTC=Myyntihinta (sis. alv)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
+CostPriceUsage=Tätä arvoi voidaan käyttää katteen laskennassa
+SoldAmount=Myyty määrä
+PurchasedAmount=Ostettu määrä
 NewPrice=Uusi hinta
-MinPrice=Min. selling price
-CantBeLessThanMinPrice=Myyntihinta ei voi olla pienempi kuin pienin sallittu tämän tuotteen ( %s ilman veroja)
+MinPrice=Min. myyntihinta
+CantBeLessThanMinPrice=Myyntihinta ei saa olla pienempi kuin pienin sallittu tämän tuotteen hinta ( %s ilman veroja)
 ContractStatusClosed=Suljettu
 ErrorProductAlreadyExists=Tuotteen viitaten %s on jo olemassa.
 ErrorProductBadRefOrLabel=Väärä arvo viite-tai etiketissä.
 ErrorProductClone=There was a problem while trying to clone the product or service.
 ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Tavarantoimittajat
-SupplierRef=Toimittaja ref.
+SupplierRef=Tavarantoimittajan tuoteviite
 ShowProduct=Näytä tuote
 ShowService=Näytä palvelu
 ProductsAndServicesArea=Tuotteiden ja palvelujen alalla
 ProductsArea=Tuotteiden alalla
 ServicesArea=Palvelut alueella
 ListOfStockMovements=Luettelo varastojen muutokset
-BuyingPrice=Osto
+BuyingPrice=Ostohinta
 PriceForEachProduct=Products with specific prices
 SupplierCard=Toimittaja-kortti
 PriceRemoved=Hinta poistettu
 BarCode=Viivakoodi
-BarcodeType=Viivakoodi tyyppi
-SetDefaultBarcodeType=Aseta viivakoodi tyyppi
-BarcodeValue=Viivakoodi-arvo
+BarcodeType=Viivakoodin tyyppi
+SetDefaultBarcodeType=Aseta viivakoodin tyyppi
+BarcodeValue=Viivakoodin arvo
 NoteNotVisibleOnBill=Huomautus (ei näy laskuissa ehdotuksia ...)
 ServiceLimitedDuration=Jos tuote on palvelu, rajoitettu kesto:
 MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
-MultiPricesNumPrices=Lukumäärä hinta
-AssociatedProductsAbility=Activate the feature to manage virtual products
+MultiPricesNumPrices=Hintojen lukumäärä
+AssociatedProductsAbility=Aktivoi tämä ominaisuus hallitaksesi virtuaalisia tuotteita
 AssociatedProducts=Vastaavat tuotteet
 AssociatedProductsNumber=Määrä vastaavat tuotteet
 ParentProductsNumber=Number of parent packaging product
@@ -106,7 +107,7 @@ KeywordFilter=Hakusanalla suodatin
 CategoryFilter=Luokka suodatin
 ProductToAddSearch=Hae tuote lisätä
 NoMatchFound=Ei hakutuloksia löytyi
-ListOfProductsServices=List of products/services
+ListOfProductsServices=Luettelo Tuotteet/Palvelut
 ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Luettelo tuotteista / palveluista tämän tuotteen komponentti
 ErrorAssociationIsFatherOfThis=Yksi valittu tuote on vanhempi nykyinen tuote
@@ -120,10 +121,11 @@ ImportDataset_service_1=Palvelut
 DeleteProductLine=Poista tuote linja
 ConfirmDeleteProductLine=Oletko varma, että haluat poistaa tämän tuotteen linja?
 ProductSpecial=Special
-QtyMin=Minimum Qty
-PriceQtyMin=Price for this min. qty (w/o discount)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
+QtyMin=Minimi määrä
+PriceQtyMin=Hinta minimi määrälle (ilman alennusta)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
+VATRateForSupplierProduct=ALV-prosentti (tälle toimittajalle/tuotteelle)
+DiscountQtyMin=Vakio alennus määrälle
 NoPriceDefinedForThisSupplier=Ei hinta / kpl määritelty tämän toimittaja / tuote
 NoSupplierPriceDefinedForThisProduct=Toimittaja ei hinta / kpl määritelty tämän tuotteen
 PredefinedProductsToSell=Predefined products to sell
@@ -141,17 +143,17 @@ ListServiceByPopularity=Luettelo palvelujen suosio
 Finished=Valmistettua tuotetta
 RowMaterial=Ensimmäinen aineisto
 CloneProduct=Klooni tuotteen tai palvelun
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+ConfirmCloneProduct=Oletko varma että haluat kopioida tuotteen tai palvelun <b>%s</b>?
 CloneContentProduct=Klooni kaikki tärkeimmät tiedot tuotteen / palvelun
-ClonePricesProduct=Clone prices
+ClonePricesProduct=Kopioi hinnat
 CloneCompositionProduct=Clone packaged product/service
 CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Tämä tuote on käytetty
 NewRefForClone=Ref. uuden tuotteen tai palvelun
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Supplier prices
+SellingPrices=Myyntihinnat
+BuyingPrices=Ostohinnat
+CustomerPrices=Asiakas hinnat
+SuppliersPrices=Tavarantoimittajan hinnat
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs/Commodity/HS code
 CountryOrigin=Alkuperä maa
@@ -161,42 +163,42 @@ Unit=Yksikkö
 p=u.
 set=set
 se=set
-second=second
+second=sekunti
 s=s
-hour=hour
-h=h
+hour=tunti
+h=t
 day=päivä
-d=d
-kilogram=kilogram
+d=p
+kilogram=kilogramma
 kg=Kg
-gram=gram
+gram=gramma
 g=g
-meter=meter
+meter=metri
 m=m
 lm=lm
 m2=m²
 m3=m³
-liter=liter
+liter=litra
 l=L
 unitP=Piece
-unitSET=Set
+unitSET=Aseta
 unitS=Sekunti
-unitH=H
+unitH=Tunti
 unitD=Päivä
-unitKG=Kilogram
-unitG=Gram
-unitM=Meter
+unitKG=Kilogramma
+unitG=Gramma
+unitM=Metri
 unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
+unitM2=Neliömetri
+unitM3=Kuutiometri
+unitL=Litra
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 CurrentProductPrice=Nykyinen hinta
 AlwaysUseNewPrice=Always use current price of product/service
 AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=Poista käytöstä hinnat kappalemäärän mukaan
 PriceByQuantityRange=Quantity range
 MultipriceRules=Price segment rules
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
@@ -204,23 +206,23 @@ PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
 KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
 VariantRefExample=Example: COL
-VariantLabelExample=Example: Color
+VariantLabelExample=Esimerkiksi: Väri
 ### composition fabrication
 Build=Produce
 ProductsMultiPrice=Products and prices for each price segment
 ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly before tax
 ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print bar code
+Quarter1=Ensimmäinen neljännes
+Quarter2=Toinen neljännes
+Quarter3=Kolmas neljännes
+Quarter4=Neljäs neljännes
+BarCodePrintsheet=Tulosta viivakoodi
 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 <b>%s</b>.
 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.
+BuildPageToPrint=Luo sivu tulostettavaksi
+FillBarCodeTypeAndValueManually=Täytä viivakoodi tyyppi ja arvo manuaalisesti
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
 FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
@@ -231,9 +233,9 @@ ResetBarcodeForAllRecords=Define barcode value for all record (this will also re
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for sell prices
-AddCustomerPrice=Add price by customer
+AddCustomerPrice=Lisää hinta asiakaskohtaisesti
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Log of previous customer prices
+PriceByCustomerLog=Logi viimeisimmistä asiakashinnoista
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
@@ -245,7 +247,7 @@ PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price
 PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Numero
-DefaultPrice=Default price
+DefaultPrice=Oletus hinta
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
@@ -260,33 +262,33 @@ GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterType1=WebService tiedot
 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 for request 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=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
+PropalMergePdfProductChooseFile=Valitse PDF tiedostot
 IncludingProductWithTag=Including product/service with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Yksikkö
-NbOfQtyInProposals=Qty in proposals
+NbOfQtyInProposals=Kappalemäärä tarjouksessa
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products or services translation
+ProductsOrServicesTranslations=Tuotteiden tai palveluiden käännös
 TranslatedLabel=Translated label
 TranslatedDescription=Translated description
 TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-SizeUnits=Size unit
+ProductWeight=Paino yhdelle tuotteelle
+ProductVolume=Tilavuus yhdelle tuotteelle
+WeightUnits=Painoyksikkö
+VolumeUnits=Tilavuusyksikkö
+SizeUnits=Kokoyksikkö
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 SubProduct=Sub product
-ProductSheet=Product sheet
+ProductSheet=Tuotekortti
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
@@ -308,13 +310,13 @@ NewProductCombination=New variant
 EditProductCombination=Editing variant
 NewProductCombinations=New variants
 EditProductCombinations=Editing variants
-SelectCombination=Select combination
+SelectCombination=Valitse yhdistelmä
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
 WeightImpact=Weight impact
 NewProductAttribute=Uusi ominaisuus
-NewProductAttributeValue=New attribute value
+NewProductAttributeValue=Uuden ominaisuuden arvo
 ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
 ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
 TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index edc2999efa2..e394a9ff00a 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Hankkeen yhteystiedot
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Kaikki hankkeet
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Tämä näkemys esitetään kaikki hankkeet sinulla voi lukea.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät sinulla voi lukea.
 ProjectsDesc=Tämä näkemys esitetään kaikki hankkeet (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät sinulla voi lukea.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Käytetty aika
 MyTimeSpent=Oma käytetty aika
+BillTime=Bill the time spent
 Tasks=Tehtävät
 Task=Tehtävä
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Luettelo toimia, jotka liittyvät hankkeen
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Toiminta hanke tällä viikolla
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Toiminta hankkeen tässä kuussa
 ActivityOnProjectThisYear=Toiminta hanke tänä vuonna
 ChildOfProjectTask=Child Hankkeen / tehtävä
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Ei omistaja tämän yksityistä hanketta
 AffectedTo=Vaikuttaa
 CantRemoveProject=Tämä hanke ei voi poistaa, koska se on viittaamat joitakin muita esineitä (lasku, tilaukset ja muut). Katso viittaajan välilehti.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -207,7 +211,7 @@ OppStatusPROSP=Prospection
 OppStatusQUAL=Qualification
 OppStatusPROPO=Ehdotus
 OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
+OppStatusPENDING=Odotettavissa oleva
 OppStatusWON=Won
 OppStatusLOST=Lost
 Budget=Budget
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/fi_FI/propal.lang b/htdocs/langs/fi_FI/propal.lang
index 46c842e2f8a..953bc00511f 100644
--- a/htdocs/langs/fi_FI/propal.lang
+++ b/htdocs/langs/fi_FI/propal.lang
@@ -3,7 +3,7 @@ Proposals=Tarjoukset
 Proposal=Tarjous
 ProposalShort=Tarjous
 ProposalsDraft=Tarjousluonnos
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Avoimet tarjoukset
 CommercialProposal=Tarjous
 PdfCommercialProposalTitle=Tarjous
 ProposalCard=Tarjous kortti
@@ -33,6 +33,7 @@ PropalStatusSigned=Allekirjoitettu (laskuttaa)
 PropalStatusNotSigned=Ei ole kirjautunut (suljettu)
 PropalStatusBilled=Laskutetun
 PropalStatusDraftShort=Vedos
+PropalStatusValidatedShort=Hyväksytty
 PropalStatusClosedShort=Suljettu
 PropalStatusSignedShort=Allekirjoitettu
 PropalStatusNotSignedShort=Ei ole kirjautunut
diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
index a803d236e4a..26c6a7c59d6 100644
--- a/htdocs/langs/fi_FI/salaries.lang
+++ b/htdocs/langs/fi_FI/salaries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Käytetty kirjanpitotili käyttäjän sidosryhmille
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Oletus kirjanpitotili palkkamaksuille
 Salary=Palkka
 Salaries=Palkat
 NewSalaryPayment=Uusi palkanmaksu
@@ -13,5 +13,6 @@ TJM=Keskimääräinen päiväpalkka
 CurrentSalary=Nykyinen palkka
 THMDescription=Jos projektimoduli on käytössä, tätä arvoa voi käyttää projektin aikakustannuksen laskemiseen käyttäjän syöttämien tuntien perusteella
 TJMDescription=Tätä arvoa ei toistaiseksi käytetä laskentaan, se on olemassa vain tiedoksi
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Viimeisimmät %s palkkamaksut
+AllSalaries=Kaikki Palkkamaksut
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 67f02d73b5b..08ffee41d27 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Muokkaa varasto
 MenuNewWarehouse=Uusi varasto
 WarehouseSource=Lähde varasto
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Kohdekieli varasto
 ValidateSending=Poista lähettäminen
 CancelSending=Peruuta lähettäminen
@@ -22,6 +24,7 @@ Movements=Liikkeet
 ErrorWarehouseRefRequired=Warehouse viite nimi tarvitaan
 ListOfWarehouses=Luettelo varastoissa
 ListOfStockMovements=Luettelo varastojen muutokset
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/fi_FI/stripe.lang b/htdocs/langs/fi_FI/stripe.lang
index 5493d637b2f..7eef8eb1c01 100644
--- a/htdocs/langs/fi_FI/stripe.lang
+++ b/htdocs/langs/fi_FI/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang
index f3c1bd245a1..127b3668938 100644
--- a/htdocs/langs/fi_FI/trips.lang
+++ b/htdocs/langs/fi_FI/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Määrä tai kilometreinä
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index 531d606e19f..7f11bbce9f9 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -69,8 +69,8 @@ InternalUser=Sisäinen käyttäjä
 ExportDataset_user_1=Dolibarr käyttäjille ja ominaisuudet
 DomainUser=Domain käyttäjän %s
 Reactivate=Uudelleenaktivoi
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Lupa myönnettiin, koska periytyy yhden käyttäjän ryhmä.
 Inherited=Peritty
 UserWillBeInternalUser=Luotu käyttäjä on sisäinen käyttäjä (koska ei liity erityistä kolmannelle osapuolelle)
@@ -93,6 +93,7 @@ NameToCreate=Nimi kolmannen osapuolen luoda
 YourRole=Omat roolit
 YourQuotaOfUsersIsReached=Tilakiintiösi aktiivisia käyttäjiä on saavutettu!
 NbOfUsers=Nb käyttäjien
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Vain superadmin voi downgrade superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 7be7649bc02..5ef824be8d7 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Luettu
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 6e4e4695343..ed02481791b 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Jotta prosessi
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Kolmannen osapuolen pankin koodi
-NoInvoiceCouldBeWithdrawed=N: o laskun withdrawed menestyksekkäästi. Tarkista, että laskussa yrityksiin, joilla on voimassa oleva kielto.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Luokittele hyvitetään
 ClassCreditedConfirm=Oletko varma, että haluat luokitella tämän vetäytymisen vastaanottamisesta kuin hyvitetty pankkitilisi?
 TransData=Päivämäärä Lähetetty
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 7d3cfcb49ee..1071dd5c68b 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -3,7 +3,6 @@ ConfigAccountingExpert=Configuration du module de compta expert
 Processing=Exécution
 Lineofinvoice=Lignes de facture
 Doctype=Type de document
-ThirdPartyAccount=Compte tiers
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 TotalMarge=Marge de ventes totale
 Selectmodelcsv=Sélectionnez un modèle d'export
diff --git a/htdocs/langs/fr_BE/agenda.lang b/htdocs/langs/fr_BE/agenda.lang
index 893a0505281..030f39f5b55 100644
--- a/htdocs/langs/fr_BE/agenda.lang
+++ b/htdocs/langs/fr_BE/agenda.lang
@@ -19,5 +19,4 @@ ProposalSentByEMail=Propale %s envoyée par e-mail
 OrderSentByEMail=Commande client %s envoyée par e-mail
 ShippingSentByEMail=Livraison %s envoyée par e-mail
 ExportCal=Exporter calendrier
-AgendaExtNb=Calendrier num %s
 ExtSiteUrlAgenda=URL pour accéder au fichier .ical
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index ef4fb31a806..c6426cd5062 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -16,8 +16,6 @@ AccountancySetupDoneFromAccountancyMenu=La plupart de la configuration de la com
 CurrentDedicatedAccountingAccount=Compte dédié actuel
 AssignDedicatedAccountingAccount=Nouveau compte à attribuer
 InvoiceLabel=Etiquette de facture
-OverviewOfAmountOfLinesNotBound=Aperçu du montant des lignes non liées au compte comptable
-OverviewOfAmountOfLinesBound=Vue d'ensemble du montant des lignes déjà liées au compte comptable
 DeleteCptCategory=Supprimer le compte comptable du groupe
 ConfirmDeleteCptCategory=Êtes-vous sûr de vouloir supprimer ce compte comptable du groupe de compte comptable?
 AccountancyArea=Zone de comptabilité
@@ -84,7 +82,6 @@ GroupByAccountAccounting=Groupe par compte comptable
 NotMatch=Pas encore défini
 DeleteMvt=Effacer les lignes du grand livre
 ConfirmDeleteMvt=Cela supprimera toutes les lignes du Ledger pour l'année et / ou d'un journal spécifique. Au moins un critère est requis.
-DelBookKeeping=Supprimer l'enregistrement du Ledger
 FinanceJournal=Journal des finances
 ExpenseReportsJournal=Journal des rapports de dépenses
 DescFinanceJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t
@@ -112,7 +109,6 @@ DescVentilDoneExpenseReport=Consultez ici la liste des rapports des lignes de d
 AutomaticBindingDone=Liaison automatique effectuée
 FicheVentilation=Carte de reliure
 GeneralLedgerIsWritten=Les transactions sont écrites dans le Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Certaines transactions n'ont pas pu être envoyées. S'il n'y a pas d'autre message d'erreur, c'est probablement parce qu'ils ont déjà été envoyés.
 ChangeBinding=Changer la liaison
 ApplyMassCategories=Appliquer des catégories de masse
 CategoryDeleted=La catégorie pour le compte comptable a été supprimée
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 926fa1b27ba..eac09b7b9d2 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -45,6 +45,9 @@ InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dan
 ProtectAndEncryptPdfFilesDesc=La protection d'un document PDF le permet de lire et d'imprimer avec n'importe quel navigateur PDF. Cependant, l'édition et la copie ne sont plus possibles. Notez que l'utilisation de cette fonctionnalité rend le développement d'un PDF fusionné global ne fonctionnant pas.
 NoticePeriod=Période de préavis
 NewByMonth=Nouveau par mois
+Emails=Courriels
+EMailsSetup=Configuration des courriels
+MAIN_DISABLE_ALL_MAILS=Désactiver toutes les envois de courriels (pour des fins de démonstration ou de tests)
 MAIN_MAIL_EMAIL_STARTTLS=Utilisation du chiffrement TLS (SSL)
 UserEmail=Courrier électronique de l'utilisateur
 CompanyEmail=Courrier électronique de la société
@@ -64,6 +67,7 @@ UnpackPackageInModulesRoot=Pour déployer / installer un module externe, décomp
 SetupIsReadyForUse=Le déploiement du module est terminé. Vous devez toutefois activer et configurer le module dans votre application en allant sur la page pour configurer les modules: <a href="%s"> %s </a>.
 NotExistsDirect=Le répertoire racine alternatif n'est pas défini dans un répertoire existant.
 InfDirAlt=Depuis la version 3, il est possible de définir un autre répertoire racine. Cela vous permet de stocker, dans un répertoire dédié, des plug-ins et des modèles personnalisés. <br> Créez simplement un répertoire à la racine de Dolibarr (par exemple: personnalisé).
+YouCanSubmitFile=Pour cette étape, vous pouvez insérer le fichier du module .zip ici :
 CallUpdatePage=Accédez à la page qui met à jour la structure et les données de la base de données: %s.
 LastStableVersion=Dernière version stable
 LastActivationDate=Dernière date d'activation
@@ -87,7 +91,6 @@ ExtrafieldRadio=Boutons radio (uniquement sur le choix)
 ExtrafieldCheckBoxFromList=Les cases à cocher du tableau
 ExtrafieldLink=Lier à un objet
 ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant d'autres propriétés de l'objet ou tout codage PHP pour obtenir une valeur calculée dynamique. Vous pouvez utiliser toutes les formules compatibles PHP, y compris le "?" L'opérateur de condition et l'objet global suivant: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </ strong>. <br> <strong> AVERTISSEMENT </ strong>: Seules certaines propriétés de $ L'objet peut être disponible. Si vous avez besoin de propriétés non chargées, récupérez-vous l'objet dans votre formule comme dans le deuxième exemple. L'utilisation d'un champ calculé signifie que vous ne pouvez pas entrer de valeur d'interface. De plus, s'il existe une erreur de syntaxe, la formule ne peut renvoyer rien. <br> <br> Exemple de formule: $ $ object-> id <10? Round ($ object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2) <br> <br> Exemple de recharger l'objet <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetch ($ obj-> id? $ Obj-> id: ($ obj-> rowid? $ Obj-> Rowid: $ object-> id))> 0))? $ Reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Autre exemple de formule pour forcer la charge de l'objet et son objet parent: <br> (($ reloadedobj = New Task ($ db)) && ($ reloadedobj-> fetch ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetch ($ reloadedobj-> fk_project )> 0))? $ Secondloadedobj-> ref: 'Projet parent introuvable'
-ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Exemple : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération de PDF
 LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant TPS/TVH (la taxe locale est appliquée sur le montant + TPS/TVH)<br>3 : taxe locale uniquement sur les produits hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant TPS/TVH (la taxe locale est calculée sur le montant + TPS/TVH)<br>5 : taxe locale uniquement sur les services hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant TPS/TVH (la taxe locale est calculée sur le montant + TPS/TVH)
 CurrentlyNWithoutBarCode=Actuellement, vous avez <strong>%s</strong> enregistrements sur <strong>%s</strong> %s sans code à barres défini.
@@ -100,7 +103,6 @@ DisplayCompanyInfoAndManagers=Afficher l'adresse de la société et les noms des
 EnableAndSetupModuleCron=Si vous souhaitez que cette facture récurrente soit générée automatiquement, le module * %s * doit être activé et correctement configuré. Sinon, la génération des factures doit être effectuée manuellement à partir de ce modèle avec le bouton * Créer *. Notez que même si vous avez activé la génération automatique, vous pouvez toujours lancer une génération manuelle sans risque. La génération de doublons pour la même période n'est pas possible.
 Use3StepsApproval=Par défaut, les bons de commande doivent être créés et approuvés par 2 utilisateurs différents (une étape / utilisateur à créer et une étape / utilisateur à approuver. Notez que si l'utilisateur a la permission de créer et d'approuver, un pas / utilisateur suffira) . Vous pouvez demander cette option pour introduire une troisième étape / approbation de l'utilisateur, si le montant est supérieur à une valeur dédiée (donc 3 étapes seront nécessaires: 1 = validation, 2 = première approbation et 3 = deuxième approbation si le montant est suffisant). <br> Configurez ceci pour vider si une approbation (2 étapes) est suffisante, définissez-la à une valeur très faible (0.1) si une deuxième approbation (3 étapes) est toujours requise.
 UseDoubleApproval=Utilisez une approbation de 3 étapes lorsque le montant (sans taxes) est supérieur à ...
-WarningPHPMail=AVERTISSEMENT: Certains fournisseurs de courrier électronique (comme Yahoo) ne vous permettent pas d'envoyer un courrier électronique d'un autre serveur que le serveur Yahoo si l'adresse de courrier électronique utilisée comme expéditeur est votre courrier électronique Yahoo (comme myemail@yahoo.com, myemail@yahoo.fr, ...). Votre configuration actuelle utilise le serveur de l'application pour envoyer un courrier électronique, de sorte que certains destinataires (l'un compatible avec le protocole DMARC restrictif) demanderont à Yahoo s'ils peuvent accepter votre courrier électronique et Yahoo répondra «non» car le serveur n'est pas un serveur Appartenant à Yahoo, peu de vos e-mails envoyés peuvent ne pas être acceptés. Si votre fournisseur de messagerie (comme Yahoo) a cette restriction, vous devez modifier la configuration de messagerie pour choisir l'autre méthode "Serveur SMTP" et entrer le serveur SMTP et Les informations d'identification fournies par votre fournisseur de messagerie (demandez à votre fournisseur d'EMail d'obtenir des informations d'identification SMTP pour votre compte).
 ClickToShowDescription=Cliquez pour afficher la description
 DependsOn=Ce module nécessite le (s) module (s)
 RequiredBy=Ce module est requis par module (s)
@@ -136,13 +138,10 @@ Module2610Desc=Activer le serveur REST de services API de les services
 Module2660Name=WebServices appel ( client SOAP )
 Module2660Desc=Activer le client Dolibarr de services Web (peut être utilisé pour pousser les données / demandes de serveurs externes . Fournisseur commandes prises en charge seulement pour le moment )
 Module3100Desc=Ajouter un bouton Skype aux utilisateurs / tiers / contacts / cartes membres
-Module3200Name=Grumes non réversibles
-Module3200Desc=Activez le journal de certains événements commerciaux dans un journal non réversible. Les événements sont archivés en temps réel. Le journal est un tableau de l'événement enchaîné qui peut ensuite être lu et exporté. Ce module peut être obligatoire pour certains pays.
 Module4000Name=Gestion des ressources humaines
 Module10000Name=Sites Internet
 Module20000Name=Gestion des demandes de congès
 Module20000Desc=Déclaration et suivi des congès des employés
-Module39000Name=Lot/Série du produit
 Module50100Desc=Module de point de vente (POS).
 Module55000Name=Sondage, enquête ou vote
 Module55000Desc=Module pour faire des sondages en ligne, des enquêtes ou des votes (comme Doodle , Studs , Rdvz , ... )
@@ -165,10 +164,6 @@ Permission171=Lire les déplacements et les dépenses (le vôtre et vos subordon
 Permission262=Prolonger l'accès à tous les tiers (non seulement les tiers que l'utilisateur est un représentant de la vente). <br> Pas efficace pour les utilisateurs externes (toujours limités à eux-mêmes pour des propositions, des commandes, des factures, des contrats, etc.). Projets (règles uniquement sur les autorisations de projet, visibilité et affectation).
 Permission771=Lire les rapports de dépenses (le vôtre et vos subordonnés )
 Permission1322=Réouvrir une facture payée
-Permission20001=Lire les demandes de congé  (le vôtre et vos subordonnés)
-Permission20002=Créer / modifier les demandes de congé
-Permission20004=Lire toutes les demandes de congé (même utilisateur non subordonnés)
-Permission20005=Créer / modifier les demandes de congé pour tout le monde
 Permission20006=Administration des demandes de congé (balance de configuration et de mise à jour )
 Permission23004=Exécuté Travail planifié
 Permission2414=Exportation d'actions/tâches des autres
@@ -195,11 +190,8 @@ LocalTax1IsNotUsedDesc=Pas d'utilisation de 2ème type taxe (autre que TPS/TVH)
 LocalTax2IsUsedDesc=Utilisation d'un 3ème type taxe  (autre que TPS/TVH)
 LocalTax2IsNotUsedDesc=Pas d'utilisation de 3ème type taxe  (autre que TPS/TVH)
 CurrentNext=Actuel / Suivant
-MenuCompanySetup=Société / Organisation
 DefaultMaxSizeList=Longueur maximale des listes
 DefaultMaxSizeShortList=Longueur maximale par défaut des listes
-CompanyInfo=Informations sur la société / l'organisation
-CompanyIds=Identités de la société / organisation
 CompanyObject=Objet de la compagnie
 ShowBugTrackLink=Afficher le lien "Signaler un défaut"
 Delays_MAIN_DELAY_ACTIONS_TODO=Tolérance retardée (en jours) avant l'alerte sur les événements planifiés (événements agenda) non encore terminés
@@ -286,7 +278,6 @@ OptionVatMode=TPS/TVH due
 OptionVatDefaultDesc=TPS/TVH sur encaissement, l'exigibilité de la TPS/TVH est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur paiement pour les services
 OptionVatDebitOptionDesc=TPS/TVH sur débit, l'exigibilité de la TPS/TVH est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur facturation (débit) pour les services
 SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilité par défaut de la TPS/TVH pour l'option choisie:
-YourCompanyDoesNotUseVAT=Votre entreprise a été définie pour ne pas utiliser la TVA (Home - Setup - Company / Organization), donc il n'y a pas de TVA pour configurer.
 AGENDA_USE_EVENT_TYPE_DEFAULT=Réglez automatiquement cette valeur par défaut pour le type d'événement dans en événement de lors de la création »
 AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue d'agenda
 ClickToDialUrlDesc=Url appelle quand un clic sur le picto du téléphone est terminé. Dans l'URL, vous pouvez utiliser des tags sur <b> __ PHONETO __ </ b> qui sera remplacé par le numéro de téléphone de la personne à appeler <b> __ PHONEFROM __ </ b> qui sera remplacé par le numéro de téléphone de l'appel Personne (votre) <br> <b> __ LOGIN __ </ b> qui sera remplacé par login clicktodial (défini sur la carte utilisateur) <br> <b> __ PASS __ </ b> qui sera remplacé par le mot de passe clicktodial (défini sur l'utilisateur carte).
@@ -351,6 +342,7 @@ MailToSendIntervention=Envoyer l'intervention
 MailToSendSupplierRequestForQuotation=Pour envoyer demande de devis au fournisseur
 MailToSendSupplierOrder=Envoyer la commande fournisseur
 MailToSendSupplierInvoice=Envoyer la facture fournisseur
+MailToSendContract=Pour envoyer un contrat
 MailToThirdparty=Pour envoyer un courriel à partir d'une page tiers
 ByDefaultInList=Afficher par défaut sur la liste vue
 TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version majeure ( se sentir libre de l'utiliser sur vos sites web )
@@ -388,5 +380,3 @@ WarningNoteModuleInvoiceForFrenchLaw=Ce module %s est conforme aux lois françai
 WarningNoteModulePOSForFrenchLaw=Ce module %s est conforme aux lois françaises (Loi Finance 2016) car le module Les journaux non réversibles est automatiquement activé.
 WarningInstallationMayBecomeNotCompliantWithLaw=Vous essayez d'installer le module %s qui est un module externe. L'activation d'un module externe signifie que vous faites confiance à l'éditeur du module et que vous êtes sûr que ce module ne modifie pas négativement le comportement de votre application et est conforme aux lois de votre pays (%s). Si le module comporte une fonctionnalité non juridique, vous devenez responsable de l'utilisation d'un logiciel non juridique.
 UseSearchToSelectResource=Utilisez un formulaire de recherche pour choisir une ressource (plutôt qu'une liste déroulante).
-DisabledResourceLinkUser=Lien de ressource désactivé à l'utilisateur
-DisabledResourceLinkContact=Lien de ressource handicapée au contact
diff --git a/htdocs/langs/fr_CA/agenda.lang b/htdocs/langs/fr_CA/agenda.lang
index 4e06b8dd1e1..98f60f4c0c1 100644
--- a/htdocs/langs/fr_CA/agenda.lang
+++ b/htdocs/langs/fr_CA/agenda.lang
@@ -8,7 +8,6 @@ MemberValidatedInDolibarr=Membre %s validé
 MemberModifiedInDolibarr=Membre %s modifié
 MemberResiliatedInDolibarr=Membre %s terminé
 MemberDeletedInDolibarr=Membre %s supprimé
-MemberSubscriptionAddedInDolibarr=L'abonnement au membre %s a ajouté
 ShipmentClassifyClosedInDolibarr=Expédition %s classé facturé
 ShipmentUnClassifyCloseddInDolibarr=Expédition %s classée rouverte
 ShipmentDeletedInDolibarr=Envoi %s supprimé
@@ -18,11 +17,9 @@ ShippingSentByEMail=Bon expédition %s envoyé par EMail
 InterventionSentByEMail=Intervention %s envoyée par EMail
 ProposalDeleted=Proposition supprimée
 AgendaModelModule=Modèles de document pour l'événement
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pour restreindre aux écévements associés au projet <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Afficher les dates d'anniversaire des contacts
 AgendaHideBirthdayEvents=Cacher les dates d'anniversaire des contacts
 ExportDataset_event1=Liste évênements de l'agenda
-AgendaExtNb=Calendrier no %s
 VisibleTimeRange=Plage d'heures visibles
 VisibleDaysRange=Plage de jours visibles
 CloneAction=Dupliquer événement
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index 5c195000a46..619d5a2161d 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -51,7 +51,6 @@ DatePointOfTax=Point d'imposition
 SetRevenuStamp=Configurer timbre fiscal
 AddGlobalDiscount=Créer ligne de déduction
 DiscountFromDeposit=Acompte versé par la facture %s
-DiscountFromExcessReceived=Paiements provenant de l'excédent reçu de la facture %s
 CreditNoteDepositUse=La facture doit être validée pour utiliser ce type de crédits
 IdSocialContribution=Id charge sociale
 PaymentRef=Règlement référence
@@ -69,9 +68,6 @@ FrequencyPer_m=Chaque %s mois
 FrequencyPer_y=Chaque %s années
 NextDateToExecution=Date de la prochaine génération de facture
 DateLastGeneration=Date de dernière génération
-MaxPeriodNumber=Nombre maximal de génération de facture
-NbOfGenerationDone=Nombre de génération de facture déjà faite
-MaxGenerationReached=Nombre maximum de générations atteintes
 GeneratedFromRecurringInvoice=Généré à partir du modèle facture récurrente %s
 DateIsNotEnough=Date non encore atteinte
 InvoiceGeneratedFromTemplate=Facture %s générée depuis le modèle de facture %s récurrentes
diff --git a/htdocs/langs/fr_CA/companies.lang b/htdocs/langs/fr_CA/companies.lang
index 7ab8756646e..78a1c1aaead 100644
--- a/htdocs/langs/fr_CA/companies.lang
+++ b/htdocs/langs/fr_CA/companies.lang
@@ -10,8 +10,6 @@ State=États/Provinces
 StateShort=États
 PhoneShort=Téléphone
 No_Email=Refuser les envois de masse
-VATIsUsed=Assujetti à la TPS/TVH
-VATIsNotUsed=Non assujetti à la TPS/TVH
 CopyAddressFromSoc=Adresse de remplissage avec adresse de tiers
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty ni client ni fournisseur, aucun objet de référence disponible
 PaymentBankAccount=Compte bancaire de paiement
@@ -21,9 +19,6 @@ LocalTax1IsUsed=Assujeti à la TVQ
 LocalTax2IsUsed=Assujeti à une troisième taxe
 ProfId6Short=TVQ
 ProfId6=TVQ
-ProfId1US=Id du professeur
-VATIntra=Numéro de TPS/TVH
-VATIntraShort=TPS/TVH
 CompanyHasAbsoluteDiscount=Ce client dispose d'un rabais disponible (notes de crédits ou acomptes) pour <b> %s</b>%s
 ContactId=ID de contact
 FromContactName=Prénom:
@@ -33,7 +28,6 @@ StatusProspect1=Pour être contacté
 ChangeToContact=Changer l'état sur 'À contacter'
 ExportDataset_company_1=Les tiers (Entreprises / fondations / personnes physiques) et les propriétés
 ImportDataset_company_1=Les tiers (Entreprises / fondations / personnes physiques) et les propriétés
-ImportDataset_company_4=Tiers/ventes représentatives (ventes représentatives affectées aux utilisateurs aux entreprises )
 AddAddress=Ajoutez l'adresse
 AllocateCommercial=Attribué au représentant des ventes
 YouMustAssignUserMailFirst=Vous devez d'abord créer un email pour cet utilisateur afin d'y ajouter des notifications par courrier électronique.
@@ -46,9 +40,7 @@ OutstandingBillReached=Max. Pour la facture exceptionnelle atteinte
 MergeOriginThirdparty=Dupliquer tiers (tiers que vous souhaitez supprimer)
 MergeThirdparties=Fusionner des tiers
 ConfirmMergeThirdparties=Êtes-vous sûr de vouloir fusionner ce tiers avec le présent? Tous les objets liés (factures, commandes, ...) seront transférés vers un tiers actuel, puis la tierce partie sera supprimée.
-ThirdpartiesMergeSuccess=Les tiers ont été fusionnées
 SaleRepresentativeLogin=Connexion du représentant des ventes
 SaleRepresentativeFirstname=Prénom du représentant des ventes
 SaleRepresentativeLastname=Nom de représentant commercial
-ErrorThirdpartiesMerge=Il y avait une erreur lors de la suppression des les tiers. S'il vous plaît vérifier le journal. Des modifications ont été annulées.
 NewCustomerSupplierCodeProposed=Nouveau code client ou fournisseur suggéré sur le code en double
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index 34352b47579..a78d1ead272 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -3,7 +3,6 @@ Accountparent=Compte Parent
 Accountsparent=Comptes parents
 AmountHTVATRealReceived=no tax. collectée
 AmountHTVATRealPaid=no tax. payé
-VATToPay=TPS/TVH ventes
 LT1SummaryES=Balance RE (TVQ)
 LT1PaidES=RE (TVQ) Payé
 LT1CustomerES=RE (TVQ) ventes
@@ -51,23 +50,15 @@ RulesResultInOut=- Il comprend les paiements réels effectués sur les factures,
 RulesCADue=- Il comprend les factures exigibles du client, qu'elles soient payées ou non. <br> - Il est basé sur la date de validation de ces factures.<br>
 DepositsAreNotIncluded=- Les factures d'acompte ne sont ni incluses
 DepositsAreIncluded=- Les factures de versement sont incluses
-LT1ReportByCustomersInInputOutputModeES=Rapport par tiers des RE (TVA)
-VATReportByCustomersInDueDebtMode=Rapport par client des TPS/TVH collectées et payées
-VATReportByQuartersInInputOutputMode=Rapport par taux des TPS/TVH collectées et payées
-LT1ReportByQuartersInInputOutputMode=Rapport par taux de RE (TVQ)
-VATReportByQuartersInDueDebtMode=Rapport par taux des TPS/TVH collectées et payées
-LT1ReportByQuartersInDueDebtMode=Rapport par taux de RE (TVQ)
+LT1ReportByCustomersES=Rapport par tiers des RE (TVA)
+LT1ReportByQuartersES=Rapport par taux de RE (TVQ)
 RulesVATInServices=- Pour les services, le rapport inclut les TVA TAXES) des règlements effectivement reçus ou émis en se basant sur la date du règlement.
-RulesVATInProducts=- Pour les biens matériels, il inclut les TVA(TAXES) des factures en se basant sur la date de facture.
 RulesVATDueServices=- Pour les services, le rapport inclut les TVA TAXES) des factures dues, payées ou non en se basant sur la date de facture.
-RulesVATDueProducts=- Pour les biens matériels, il inclut les TVA TAXES) des factures en se basant sur la date de facture.
 WarningDepositsNotIncluded=Les factures de acompte ne sont pas incluses dans cette version avec ce module de comptabilité.
 Pcg_version=Modèles de plan comptable
 ToCreateAPredefinedInvoice=Pour créer une facture de modèle, créez une facture standard, puis, sans la valider, cliquez sur le bouton "%s".
 CalculationRuleDesc=Pour calculer le total de TPS/TVH, il existe 2 modes:<br>Le mode 1 consiste à arrondir la TPS/TVH de chaque ligne et à sommer cet arrondi.<br>Le mode 2 consiste à sommer la TPS/TVH de chaque ligne puis à l'arrondir.<br>Les résultats peuvent différer de quelques centimes. Le mode par défaut est le mode <b>%s</b>.
 CalculationRuleDescSupplier=Selon le fournisseur, choisissez la méthode appropriée pour appliquer la même règle de calcul et obtenez le même résultat attendu par votre fournisseur.
-ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable par défaut pour la perception de la TVA - TVA sur les ventes (utilisé si non défini sur la configuration du dictionnaire TVA)
-ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable par défaut pour la TVA récupérée - TVA sur les achats (utilisé si non défini sur la configuration du dictionnaire TVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour payer la TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable utilisé pour les tiers clients
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour les tiers fournisseurs
diff --git a/htdocs/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
index e1ff1f94cad..d4a1f4689f9 100644
--- a/htdocs/langs/fr_CA/cron.lang
+++ b/htdocs/langs/fr_CA/cron.lang
@@ -25,7 +25,6 @@ CronDtLastLaunch=Date de début de la dernière exécution
 CronDtLastResult=Date de fin de la dernière exécution
 CronNoJobs=Aucun emploi enregistré
 CronNbRun=Nb. lancement
-CronMaxRun=Max nb. lancement
 CronEach=Chaque
 CronAdd=Ajouter des emplois
 CronEvery=Exécuter le travail chaque
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index e76bcee0195..8a23ebe69b1 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -63,7 +63,6 @@ ErrorLDAPSetupNotComplete=La correspondance Dolibarr-LDAP n'est pas complète.
 ErrorLDAPMakeManualTest=Un fichier .ldif a été généré dans le répertoire %s. Essayez de le charger manuellement à partir de la ligne de commande pour avoir plus d'informations sur les erreurs.
 ErrorCantSaveADoneUserWithZeroPercentage=Impossible d'enregistrer une action avec "statut non démarré" si le champ "fait par" est également rempli.
 ErrorRefAlreadyExists=La référence utilisée pour la création existe déjà.
-ErrorPleaseTypeBankTransactionReportName=Tapez le nom du relevé bancaire où l'entrée est signalée (Format AAAAMM ou AAAAMMDD)
 ErrorRecordHasChildren=Impossible de supprimer l'enregistrement puisqu'il a des enfants.
 ErrorRecordIsUsedCantDelete=Impossible de supprimer l'enregistrement. Il est déjà utilisé ou inclus dans un autre objet.
 ErrorModuleRequireJavascript=Javascript ne doit pas être désactivé pour que cette fonction fonctionne. Pour activer / désactiver Javascript, accédez au menu Accueil-> Configuration-> Affichage.
@@ -110,7 +109,6 @@ ErrorFailedToAddToMailmanList=Impossible d'ajouter l'enregistrement %s à la lis
 ErrorFailedToRemoveToMailmanList=Impossible de supprimer l'enregistrement %s à la liste Mailman %s ou à la base SPIP
 ErrorNewValueCantMatchOldValue=Une nouvelle valeur ne peut pas être égale à l'ancienne
 ErrorFailedToValidatePasswordReset=Impossible de réinitialiser le mot de passe. Peut-être que le reinit était déjà fait (ce lien ne peut être utilisé qu'une seule fois). Sinon, essayez de redémarrer le processus de réinitialisation.
-ErrorToConnectToMysqlCheckInstance=La connexion à la base de données échoue. Vérifiez que le serveur Mysql est en cours d'exécution (dans la plupart des cas, vous pouvez le lancer à partir de la ligne de commande avec 'sudo /etc/init.d/mysql start').
 ErrorFailedToAddContact=Impossible d'ajouter un contact
 ErrorPaymentModeDefinedToWithoutSetup=Un mode de paiement a été configuré pour taper %s mais la configuration du module La facture n'a pas été complétée pour définir les informations à afficher pour ce mode de paiement.
 ErrorOpenIDSetupNotComplete=Vous configurez le fichier de configuration Dolibarr pour autoriser l'authentification OpenID, mais l'URL du service OpenID n'est pas définie en constante %s
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
index 9e54c776bf8..a3893cff3af 100644
--- a/htdocs/langs/fr_CA/mails.lang
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -105,7 +105,6 @@ NbOfTargetedContacts=Nombre actuel d'emails de contact ciblés
 UseFormatFileEmailToTarget=Le fichier importé doit avoir un format <strong> email; nom; prénom; autre </ strong>
 UseFormatInputEmailToTarget=Entrez une chaîne avec le format <strong> email; nom; prénom; autre </ strong>
 MailAdvTargetRecipients=Récipiendaires (sélection avancée)
-AdvTgtTitle=Remplissez les champs de saisie pour présélectionner les tierces parties ou les contacts / adresses à cibler
 AdvTgtSearchTextHelp=Utilisez %% comme caractères magiques. Par exemple, pour trouver tous les éléments comme <b> jean, joe, jim</b>, vous pouvez entrer <b> j%%</b>, vous pouvez également utiliser; Comme séparateur pour la valeur et l'utilisation! Sauf pour cette valeur. Par exemple <b> jean; joe; jim%%;! jimo;! Jima% </b> ciblera tous jean, joe, commence par jim mais pas jimo et pas tout le monde commence par jima
 AdvTgtSearchIntHelp=Intervalle d'utilisation pour sélectionner la valeur int ou flottante
 AdvTgtMinVal=Valeur minimale
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 61b4a0f9d4f..2a7c8653c0d 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -22,12 +22,11 @@ FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexion à la base de donnée
 ErrorCanNotCreateDir=Impossible de créer le dir %s
 ErrorCanNotReadDir=Impossible de lire le dir %s
-ErrorGoToGlobalSetup=Accédez à la configuration 'Société / Organisation' pour corriger cela
 ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
 ErrorCannotAddThisParentWarehouse=Vous essayez d'ajouter un entrepôt parent qui est déjà un enfant de l'actuel
-MaxNbOfRecordPerPage=Nombre maximum d'enregistrements par page
 NotAuthorized=Vous n'êtes pas autorisé à le faire.
 SeeHere=Regardez ici
+ClickHere=Cliquez ici
 GoToWikiHelpPage=Lire l'aide en ligne (accès Internet nécessaire)
 DolibarrInHttpAuthenticationSoPasswordUseless=Le mode d'authentification Dolibarr est défini sur <b>%s</b> dans le fichier de configuration <b>conf.php</b>.<br> Cela signifie que la base de données de mots de passe est externe à Dolibarr, donc changer ce champ peut ne pas avoir d'effet .
 PasswordForgotten=Mot de passe oublié?
@@ -36,7 +35,6 @@ RequestedUrl=URL requise
 RequestLastAccessInError=Erreur de demande d'accès à la base de données la plus récente
 ReturnCodeLastAccessInError=Code de retour pour la dernière erreur de demande d'accès à la base de données
 InformationLastAccessInError=Informations pour la dernière erreur de demande d'accès à la base de données
-TechnicalID=ID technique
 MediaBrowser=Navigateur multimédia
 NotClosed=Pas fermé
 RemoveLink=Supprimer lien
@@ -92,7 +90,6 @@ VATs=Taxes de vente
 VATRate=Taux TPS/TVH
 Module=Module / Application
 Modules=Modules / Applications
-CompanyFoundation=Société / Organisation
 FilterOnInto=Critères de recherche '<strong>%s</strong>' dans les champs %s
 DolibarrStateBoard=Statistiques de base de données
 DolibarrWorkBoard=Ouvrir le tableau de bord des éléments
@@ -103,6 +100,7 @@ DeletePicture=Supprimer image
 ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ?
 EnterLoginDetail=Entrez les détails de connexion
 MonthVeryShort02=V
+MonthVeryShort03=L
 MonthVeryShort05=L
 MonthVeryShort09=D
 NbOfObjectReferers=Nombre d'articles connexes
@@ -134,7 +132,6 @@ NoRecordSelected=Aucun enregistrement sélectionné
 MassFilesArea=Domaine pour les fichiers construits par des actions de masse
 ShowTempMassFilesArea=Afficher la zone des fichiers construits par des actions de masse
 RelatedObjects=Objets associés
-ClickHere=Cliquez ici
 FrontOffice=Front Office
 ExportFilteredList=Export liste filtrée
 ExportList=Liste des exportations
@@ -170,3 +167,4 @@ SearchIntoSupplierProposals=Propositions de fournisseurs
 SearchIntoCustomerShipments=Envois clients
 SearchIntoExpenseReports=Note de frais
 SearchIntoLeaves=Feuilles
+AssignedTo=Affecté à
diff --git a/htdocs/langs/fr_CA/margins.lang b/htdocs/langs/fr_CA/margins.lang
index c06f8189cb6..a4418708f74 100644
--- a/htdocs/langs/fr_CA/margins.lang
+++ b/htdocs/langs/fr_CA/margins.lang
@@ -31,4 +31,3 @@ rateMustBeNumeric=Le taux doit être une valeur numérique
 markRateShouldBeLesserThan100=Le taux de marquage devrait être inférieur à 100
 ShowMarginInfos=Afficher les infos de marge
 CheckMargins=Détail des marges
-MarginPerSaleRepresentativeWarning=Le rapport de la marge par utilisateur utilise le lien entre les tierces parties et les représentants de vente pour calculer la marge de chaque salerepresentaive. Étant donné que certaines tierces parties peuvent ne pas avoir de représentant de vente dédié et que certaines tierces parties peuvent être liées à plusieurs, certains montants peuvent ne pas être inclus dans ce rapport (s'il n'y a pas de représentant de vente) et certains peuvent apparaître sur des lignes différentes (pour chaque représentant de vente).
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index a53f05ad15d..51d1c0a17c4 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Liste des membres publics validés
 ErrorThisMemberIsNotPublic=Ce membre n'est pas public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre membre (nom: <b> %s</b>, connexion: <b>%s</b>) est déjà lié à un tiers <b>%s</b>. Supprimez ce lien en premier parce qu'un tiers ne peut être lié qu'à un membre (et vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, vous devez disposer d'autorisations pour éditer tous les utilisateurs afin de pouvoir lier un membre à un utilisateur qui n'est pas le vôtre.
-ThisIsContentOfYourCard=Bonjour. <br> <br> Ceci rappelle l'information que nous avons sur vous. N'hésitez pas à nous contacter si quelque chose a l'air mal. <br> <br>
-CardContent=Contenu de votre carte membre
 SetLinkToUser=Lien vers un utilisateur Dolibarr
 SetLinkToThirdParty=Lien vers un tiers Dolibarr
 MembersCards=Cartes de visite Membres
@@ -89,6 +87,7 @@ PublicMemberCard=Carte publique membre
 SubscriptionNotRecorded=L'abonnement n'est pas enregistré
 AddSubscription=Créer un abonnement
 ShowSubscription=Afficher l'abonnement
+CardContent=Contenu de votre carte membre
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Objet de l'e-mail reçu en cas d'auto-inscription d'un invité
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail reçu en cas d'auto-inscription d'un invité
 DescADHERENT_MAIL_FROM=Expéditeur EMail pour les courriels automatiques
diff --git a/htdocs/langs/fr_CA/modulebuilder.lang b/htdocs/langs/fr_CA/modulebuilder.lang
index f27b5eb5d0c..ef352237786 100644
--- a/htdocs/langs/fr_CA/modulebuilder.lang
+++ b/htdocs/langs/fr_CA/modulebuilder.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
+ModuleBuilderDescdescription=Insérez ici toute l'information générale qui décrit votre module
 ModuleBuilderDescmenus=Cet onglet est dédié à définir les entrées de menu fournies par votre module.
 ModuleBuilderDescpermissions=Cet onglet est dédié à définir les nouvelles autorisations que vous souhaitez fournir à votre module.
 ModuleBuilderDeschooks=Cet onglet est dédié aux crochets.
 ModuleBuilderDescwidgets=Cet onglet est dédié à la gestion / création de widgets.
 DangerZone=Zone dangereuse
+ModuleIsNotActive=Ce module n'a pas été activé encore. Allez %s pour l'activer ou cliquez ici :
 ModuleIsLive=Ce module a été activé. Toute modification peut briser une caractéristique active actuelle.
 DescriptionLong=Longue description
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index 803c80994c3..354e3f0274a 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -138,3 +138,4 @@ OpportunityTotalAmount=Possibilité montant total
 OpportunityPonderatedAmountDesc=Montant des opportunités pondéré avec probabilité
 OppStatusPENDING=Créance
 OppStatusWON=A gagné
+SendProjectRef=About project %s
diff --git a/htdocs/langs/fr_CA/propal.lang b/htdocs/langs/fr_CA/propal.lang
index 85be96949d3..f6fcc97840b 100644
--- a/htdocs/langs/fr_CA/propal.lang
+++ b/htdocs/langs/fr_CA/propal.lang
@@ -15,6 +15,7 @@ AmountOfProposalsByMonthHT=Montant par mois (net d'impôt)
 PropalsOpened=Ouverte
 PropalStatusValidated=Validé (la proposition est ouverte)
 PropalStatusNotSigned=Non signée (close)
+PropalStatusValidatedShort=Validée
 PropalsToClose=Propositions commerciales à clôturer
 ListOfProposals=Liste des propositions commerciales
 ActionsOnPropal=Événements sur proposition
diff --git a/htdocs/langs/fr_CA/salaries.lang b/htdocs/langs/fr_CA/salaries.lang
index 95fb5badeab..8b380dd75f2 100644
--- a/htdocs/langs/fr_CA/salaries.lang
+++ b/htdocs/langs/fr_CA/salaries.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les dépenses de personnel
 Salary=Salaires
 NewSalaryPayment=Nouveau paiement de salaire
 SalaryPayment=Paiement Salaire
diff --git a/htdocs/langs/fr_CA/trips.lang b/htdocs/langs/fr_CA/trips.lang
index 343c597405d..30ff8d6e6ed 100644
--- a/htdocs/langs/fr_CA/trips.lang
+++ b/htdocs/langs/fr_CA/trips.lang
@@ -9,7 +9,6 @@ ListOfFees=Liste des frais
 TypeFees=Types de frais
 ShowTrip=Afficher le rapport de dépenses
 NewTrip=Nouveau rapport de dépenses
-CompanyVisited=Entreprise / organisation visité
 DeleteTrip=Supprimer le rapport de dépenses
 ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer ce rapport de dépenses?
 ListTripsAndExpenses=Liste des rapports de dépenses
@@ -17,17 +16,11 @@ ListToApprove=en attente d'approbation
 ExpensesArea=Zone de rapports sur les dépenses
 ClassifyRefunded=Classer «Remboursé»
 ExpenseReportWaitingForApproval=Un nouveau rapport de dépenses a été soumis pour approbation
-ExpenseReportWaitingForApprovalMessage=Un nouveau rapport de dépenses a été soumis et attend l'approbation.\n - Utilisateur: %s\n - Période: %s\nCliquez ici pour valider: %s
 ExpenseReportWaitingForReApproval=Un rapport sur les dépenses a été soumis pour approbation
-ExpenseReportWaitingForReApprovalMessage=Un rapport sur les dépenses a été soumis et attend une ré-approbation.\nLe %s, vous avez refusé d'approuver le rapport de dépenses pour cette raison: %s.\nUne nouvelle version a été proposée et en attente de votre approbation.\n - Utilisateur: %s\n - Période: %s\nCliquez ici pour valider: %s
 ExpenseReportApproved=Un rapport sur les dépenses a été approuvé
-ExpenseReportApprovedMessage=Le rapport de dépenses %s a été approuvé.\n - Utilisateur: %s\n - Approuvé par: %s\nCliquez ici pour afficher le rapport de dépenses: %s
 ExpenseReportRefused=Un rapport de dépenses a été refusé
-ExpenseReportRefusedMessage=Le rapport de dépenses %s a été refusé.\n - Utilisateur: %s\n - Refusé par: %s\n - Motif de refus: %s\nCliquez ici pour afficher le rapport de dépenses: %s
 ExpenseReportCanceled=Un rapport de dépenses a été annulé
-ExpenseReportCanceledMessage=Le rapport de dépenses %s a été annulé.\n - Utilisateur: %s\n - Annulé par: %s\n - Motif d'annulation: %s\nCliquez ici pour afficher le rapport de dépenses: %s
 ExpenseReportPaid=Un rapport de dépenses a été payé
-ExpenseReportPaidMessage=Le rapport de dépenses %s a été payé.\n - Utilisateur: %s\n - Payé par: %s\nCliquez ici pour afficher le rapport de dépenses: %s
 TripId=Rapport de dépenses
 AnyOtherInThisListCanValidate=Personne à informer pour validation.
 TripSociete=Société d'information
diff --git a/htdocs/langs/fr_CA/users.lang b/htdocs/langs/fr_CA/users.lang
index fd444332f7b..b2fec9afe90 100644
--- a/htdocs/langs/fr_CA/users.lang
+++ b/htdocs/langs/fr_CA/users.lang
@@ -8,8 +8,6 @@ ConfirmReinitPassword=Êtes-vous sûr de vouloir générer un nouveau mot de pas
 ConfirmSendNewPassword=Êtes-vous sûr de vouloir générer et envoyer un nouveau mot de passe pour l'utilisateur <b> %s</b>?
 LastGroupsCreated=Derniers groupes %s créés
 LastUsersCreated=Derniers %s utilisateurs créés
-CreateInternalUserDesc=Ce formulaire vous permet de créer un utilisateur interne à votre entreprise / organisation. Pour créer un utilisateur externe (client, fournisseur, ...), utilisez le bouton 'Créer un utilisateur Dolibarr' à partir de la carte de contact de tiers.
-InternalExternalDesc=Un utilisateur <b> interne </b> est un utilisateur qui fait partie de votre entreprise/organisation. <br>Un utilisateur<b> externe</b>est un client, un fournisseur ou un autre. <br><br>Les deux cas, les autorisations définissent les droits sur Dolibarr, mais l'utilisateur externe peut avoir un gestionnaire de menu différent de l'utilisateur interne (voir Home - Setup - Display)
 ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact?
 ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce membre?
 ConfirmCreateThirdParty=Êtes-vous sûr de vouloir créer un tiers pour ce membre?
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 152c5afe46d..6e6f13d9a87 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -11,4 +11,4 @@ PreviewOfSiteNotYetAvailable=Aperçu de votre site web <strong>%s</strong> n'est
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
 ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
-PreviewSiteServedByWebServer=Aperçu %s dans un nouvel onglet. <br> <br> Le %s sera desservi par un serveur web externe (comme Apache, Nginx, IIS). Vous devez installer et configurer ce serveur avant de pointer vers le répertoire: <br> <strong>%s</strong> <br> URL desservie par un serveur externe: <br> <strong> %s</strong>
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index 7d220baf2d4..7456eb708fb 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Zone de commandes de paiement par débit direct
 SuppliersStandingOrdersArea=Zone de commandes de paiement direct
+StandingOrderPayment=Ordre de paiement de débit direct
 NewStandingOrder=Nouveau décret direct
 StandingOrderToProcess=Procéder
 WithdrawalsReceipts=Ordres de débit direct
@@ -22,7 +23,6 @@ LastWithdrawalReceipt=Derniers %s reçus de débit direct
 MakeWithdrawRequest=Faire une demande de paiement par prélèvement automatique
 WithdrawRequestsDone=%s demandes de paiement par prélèvement automatique enregistrées
 ThirdPartyBankCode=Code bancaire tiers
-NoInvoiceCouldBeWithdrawed=Aucune facture retirée avec succès. Vérifiez que la facture se trouve sur des sociétés avec un BAN valide.
 ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce reçu de retrait comme crédité sur votre compte bancaire?
 WithdrawalRefused=Retrait refusée
 WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir introduire un rejet de retrait pour la société?
@@ -60,7 +60,6 @@ WithdrawalFile=Fichier de retrait
 SetToStatusSent=Définir le statut "Fichier envoyé"
 StatisticsByLineStatus=Statistiques par état des lignes
 RUMLong=Référence de mandat unique
-RUMWillBeGenerated=Le numéro UMR sera généré une fois les informations du compte bancaire enregistrées
 WithdrawMode=Mode de débit direct (FRST ou RECUR)
 WithdrawRequestAmount=Montant de la demande de débit direct:
 WithdrawRequestErrorNilAmount=Impossible de créer une demande de débit direct pour un montant vide.
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index d8e307a1ee3..2ff8dc59dd9 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -133,9 +133,10 @@ BANK_DISABLE_DIRECT_INPUT=Désactiver la saisie directe de transactions en banqu
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes
 ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des opérations diverses
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des ops. diverses
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Journal des notes de frais
 ACCOUNTING_SOCIAL_JOURNAL=Journal de paie
+ACCOUNTING_HAS_NEW_JOURNAL=Journal d'ouverture
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable de tranfert
 ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'attente
@@ -168,18 +169,17 @@ DelYear=Année à supprimer
 DelJournal=Journal à supprimer
 ConfirmDeleteMvt=Cela supprimera toutes les lignes du grand livre pour l'année et/ou d'un journal spécifique. Un critère au moins est requis.
 ConfirmDeleteMvtPartial=Cette action effacera les écritures de votre grand livre (toutes les lignes liées à une même transaction seront effacées)
-DelBookKeeping=Supprimer l'enregistrement du grand livre
 FinanceJournal=Journal de trésorerie
 ExpenseReportsJournal=Journal des notes de frais
 DescFinanceJournal=Journal de trésorerie comprenant tous les types de paiements par compte bancaire / caisse
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=Ceci est une vue des enregistrements qui sont liés à un compte comptable produits/services et qui peuvent être enregistrés dans le grand livre.
 VATAccountNotDefined=Compte de la TVA non défini
 ThirdpartyAccountNotDefined=Compte pour le tiers non défini
 ProductAccountNotDefined=Compte pour le produit non défini
 FeeAccountNotDefined=Compte de charge non défini
 BankAccountNotDefined=Compte pour la banque non défini
 CustomerInvoicePayment=Paiement de facture client
-ThirdPartyAccount=Third party account
+ThirdPartyAccount=Comptes de tiers
 NewAccountingMvt=Nouvelle transaction
 NumMvts=Numéro de transaction
 ListeMvts=Liste des mouvements
@@ -219,7 +219,7 @@ ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte
 MvtNotCorrectlyBalanced=Mouvement non équilibré. Crédit = %s. Débit = %s
 FicheVentilation=Fiche lien
 GeneralLedgerIsWritten=Les transactions sont enregistrées dans le grand livre
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être journalisées. S'il n'y a pas d'autres messages, c'est probablement car elles sont déjà comptabilisées.
 NoNewRecordSaved=Plus d'enregistrements à journaliser
 ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable
 ChangeBinding=Changer les liens
@@ -235,14 +235,15 @@ AccountingJournal=Journal comptable
 NewAccountingJournal=Nouveau journal comptable
 ShowAccoutingJournal=Afficher le journal
 Nature=Nature
-AccountingJournalType1=Opération diverse
+AccountingJournalType1=Opérations diverses
 AccountingJournalType2=Ventes
 AccountingJournalType3=Achats
 AccountingJournalType4=Banque
 AccountingJournalType5=Note de frais
+AccountingJournalType8=Inventaire
 AccountingJournalType9=A-nouveaux
 ErrorAccountingJournalIsAlreadyUse=Le journal est déjà utilisé
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=Remarque: Le compte de comptabilité pour la TVA est défini dans le menu <b> %s </b> - <b> %s </b>
 
 ## Export
 ExportDraftJournal=Exporter le journal brouillon
@@ -284,7 +285,7 @@ Formula=Formule
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Certaines étapes obligatoires de la configuration n'ont pas été réalisées, merci de compléter cette dernière
 ErrorNoAccountingCategoryForThisCountry=Pas de catégories de regroupement comptable disponibles pour le pays %s (Voir Accueil - Configuration - Dictionnaires)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBounded=Vous essayez de journaliser certaines lignes de la facture <strong> %s </strong>, mais certaines autres lignes ne sont pas encore liées au compte de comptabilité. La journalisation de toutes les lignes de facture pour cette facture est refusée.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Certaines lignes sur la facture ne sont pas liées au compte comptable.
 ExportNotSupported=Le format de l'export n'est pas supporté par cette page
 BookeppingLineAlreayExists=Lignes dejà existantes dans le grand livre
@@ -294,3 +295,4 @@ ToBind=Lignes à lier
 UseMenuToSetBindindManualy=L'autodection n'est pas possible, utilisez le menu <a href="%s"> %s </a> pour effectuer la liaison manuellement
 
 WarningReportNotReliable=Attention : ce rapport n'est pas basé sur le grand livre et ne contient donc pas les écritures manuelles qui lui ont été ajoutées. Si votre journalisation est à jour, la vue depuis le grand livre sera plus précise.
+InventoryJournal=Journal d'inventaire
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 8a036be5678..49a80dabe7a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Erreur, ne peut utiliser l'option @ pour remettre
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erreur, ne peut utiliser l'option @ si la séquence {yy}{mm} ou {yyyy}{mm} n'est pas dans le masque.
 UMask=Masque des nouveaux fichiers sous Unix/Linux/BSD/Mac.
 UMaskExplanation=Ce paramètre permet de définir les droits des fichiers créés sur le serveur par Dolibarr (lors d'envois par exemple).<br>Ce doit être la valeur octale (par exemple 0666 signifie lecture/écriture pour tous).<br>Ce paramètre n'a aucun effet sur un serveur Windows.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
+SeeWikiForAllTeam=Voir le wiki pour le détail de tous les acteurs et leur organisation
 UseACacheDelay= Délai de mise en cache de l'export en secondes (0 ou vide pour aucun cache)
 DisableLinkToHelpCenter=Cacher le lien «<b>Besoin d'aide ou d'assistance</b>» sur la page de connexion
 DisableLinkToHelp=Cacher le lien vers l'aide en ligne <b>%s</b>
@@ -392,7 +392,7 @@ PriceBaseTypeToChange=Modifier sur les prix dont la référence de base est le
 MassConvert=Convertir en masse
 String=Chaîne
 TextLong=Texte long
-HtmlText=Html text
+HtmlText=Texte HTML
 Int=Numérique entier
 Float=Décimal
 DateAndTime=Date et heure
@@ -412,13 +412,13 @@ ExtrafieldCheckBoxFromList=Cases à cocher issues d'une table
 ExtrafieldLink=Lien vers un objet
 ComputedFormula=Champ calculé
 ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant les propriétés objet ou tout code PHP pour obtenir des valeurs dynamiques. Vous pouvez utiliser toute formule compatible PHP, incluant l'opérateur conditionnel "?", et les objets globaux : <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATTENTION</strong> : Seulement quelques propriétés de l'objet $object pourraient être disponibles. Si vous avez besoin de propriétés non chargées, créez vous même une instance de l'objet dans votre formule, comme dans le deuxième exemple.<br>Utiliser un champs calculé signifie que vous ne pouvez pas entrer vous même toute valeur à partir de l'interface. Aussi, s'il y a une erreur de syntaxe, la formule pourrait ne rien retourner.<br><br>Exemple de formule:<br> $object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple pour recharger l'objet: <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Un autre exemple de formule pour forcer le rechargement d'un objet et de son objet parent:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Objet parent projet non trouvé'
-ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
+ExtrafieldParamHelpPassword=Gardez ce champ vide signifie que la valeur sera stockée sans cryptage (le champ doit juste être caché avec des étoiles sur l'écran). <br> Définissez la valeur 'auto' pour utiliser la règle de cryptage par défaut pour enregistrer le mot de passe dans la base de données (ensuite la valeur lue sera le hash uniquement, sans moyen de retrouver la valeur d'origine)
 ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>\nPour afficher une liste dépendant d'une autre liste attribut complémentaire: <br>1, valeur1|options_<i>code_liste_parente</i>:clé_parente<br> 2,valeur2|option_<i>Code_liste_parente</i>:clé_parente<br><br>\nPour que la liste soit dépendante d'une autre liste:<br>1,valeur1|<i>code_liste_parent</i>:clef_parent<br>2,valeur2|<i>code_liste_parent</i>:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'une table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>-idfilter est nécessairement une clé primaire int<br>- filter peut être un simple test (e.g. active=1) pour seulement montrer les valeurs actives<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez $SEL$<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre attribut complémentaire:<br>\n<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pour avoir une liste qui dépend d'une autre liste:<br>\nc_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Les paramètres de la liste proviennent d'une table<br>:\nSyntaxe : nom_de_la_table:libelle_champ:id_champ::filtre<br>\nExemple : c_typent:libelle:id::filter<br><br>le filtre peut n'est qu'un test (ex : active=1) pour n'afficher que les valeurs actives.<br>Vous pouvez aussi utiliser $ID$ dans les filtres pour indiquer l'ID de l'élément courant.<br>\nPour utiliser un SELECT dans un filtre, utilisez $SEL$<br>\nPour filtrer sur un attribut supplémentaire, utilisez la syntaxe\nextra.fieldcode=... (ou fieldcode est le code de l'attribut supplémentaire)<br><br>Pour afficher une liste dépendant d'un autre attribut supplémentaire : <br>c_typent:libelle:id:options_<i>code_liste_parente</i>|colonne_parente:filtre <br><br>Pour afficher une liste dépendant d'une autre liste : <br>c_typent:libelle:id:<i>code_liste_parente</i>|colonne_parente:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath <br> Syntaxe: ObjectName:Classpath <br> Exemples: <br> Société:societe/class/societe.class.php <br> Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF
 LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant tva (la taxe locale est calculée sur le montant + tva)<br>3 : taxe locale uniquement sur les produits hors tva (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant tva (la taxe locale est calculée sur le montant + tva)<br>5 : taxe locale uniquement sur les services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant tva (la taxe locale est calculée sur le montant + tva)
 SMS=SMS
@@ -450,15 +450,15 @@ ModuleCompanyCodePanicum=Retourne 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.
 Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être créées et approuvées en deux étapes/utilisateurs (une étape/utilisateur pour créer et une étape/utilisateur pour approuver. Si un utilisateur à les deux permissions, ces deux actions sont effectuées en une seule fois). Cette option ajoute la nécessité d'une approbation par une troisième étape/utilisateur, si le montant de la commande est supérieur au montant d'une valeur définie (soit 3 étapes nécessaire: 1 =Validation, 2=Première approbation et 3=seconde approbation si le montant l'exige).<br>Laissez le champ vide si une seule approbation (2 étapes) sont suffisantes, placez une valeur très faibe (0.1) si une deuxième approbation (3 étapes) est toujours exigée.
 UseDoubleApproval=Activer l'approbation en trois étapes si le montant HT est supérieur à...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be car also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
+WarningPHPMail=Attention : Il est préférable de configurer les emails sortant pour utiliser le serveur email de votre fournisseur plutôt que la configuration par défaut. Certains fournisseurs email (comme Yahoo) ne permettent pas l'envoi d'e-mails depuis un autre serveur que le leur si l'adresse d'envoi utilisée est une adresse autre que la leur. Votre configuration actuelle utilise le serveur de l'application pour l'envoi d'e-mails et non le serveur de votre fournisseur de messagerie, aussi certains destinataires (ceux compatibles avec le protocole restrictif DMARC) demanderont au fournisseur d'email si ils peuvent accepter l'email et certains fournisseurs (comme Yahoo) peuvent répondre "non" car le serveur utilisé pour l'envoi n'est pas un serveur appartenant au fournisseur, aussi certains de vos emails envoyés peuvent ne pas etre accepté (faites attention aussi aux quotas de votre fournisseur d'email). <br>SI votre fournisseur d'email (comme Yahoo) impose cette restriction, vous devrez modifier votre configuration et opter pour l'autre méthode d'envoi "SMTP server" et saisir les identifiants SMTP de votre compte fournis par votre fournisseur d'e-mail (à demander à votre fournisseur d'e-mail)
+WarningPHPMail2=Si votre fournisseur de messagerie SMTP a besoin de restreindre le client de messagerie à certaines adresses IP (très rare), voici l'adresse IP de votre application CRM ERP : <strong> %s </strong>.
 ClickToShowDescription=Cliquer pour afficher la description
 DependsOn=Ce module a besoin du(des) module(s)
 RequiredBy=Ce module est requis par le ou les module(s)
 TheKeyIsTheNameOfHtmlField=C'est le nom du champ HTML. Cela nécessite d'avoir des connaissances techniques pour lire le contenu de la page HTML et récupérer le nom d'un champ.
 PageUrlForDefaultValues=Vous devez entrer ici l'URL relative de la page. Si vous indiquez des paramètres dans l'URL, les valeurs par défaut seront effectives si tous les paramètres sont définis sur la même valeur. Exemples :
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br> Pour le formulaire pour créer un nouveau tiers, c'est <strong> %s </strong>, <br> Si vous voulez une valeur par défaut seulement si l'url a certains paramètres, vous pouvez utiliser <strong> %s </strong>
+PageUrlForDefaultValuesList=<br>Pour la page de liste des tiers, c'est <strong>%s</strong>,<br>Si vous voulez une valeur par défaut uniquement sir l'url a certains paramètres, vous pouvez utiliser <strong>%s</strong>
 EnableDefaultValues=Activer la fonction de valeurs par défaut personnalisées
 EnableOverwriteTranslation=Activer la réécriture des traductions
 GoIntoTranslationMenuToChangeThis=Une traduction a été trouvée pour le code de cette valeur. Pour changer cette valeur, vous devez modifier le fichier depuis Accueil > Configuration > Traduction.
@@ -470,6 +470,7 @@ WatermarkOnDraftExpenseReports=Filigrane sur les notes de frais
 AttachMainDocByDefault=Définissez cette valeur sur 1 si vous souhaitez joindre le document principal au courrier électronique par défaut (si applicable)
 FilesAttachedToEmail=Joindre le fichier
 SendEmailsReminders=Envoyer des alertes agenda par e-mails
+davDescription=Ajout un composant pour devenir un serveur DAV
 # Modules
 Module0Name=Utilisateurs & groupes
 Module0Desc=Gestion des utilisateurs / employés et groupes
@@ -577,7 +578,7 @@ Module2300Desc=Gestion des travaux planifiées (alias cron ou table chrono)
 Module2400Name=Événements/Agenda
 Module2400Desc=Gestion des événements réalisés ou à venir. Enregistrer manuellement des événements ou rendez-vous dans l'agenda ou laisser l'application enregistrer automatiquement des événements à des fins de suivi.
 Module2500Name=GED
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2500Desc=Gestion de documents (GED). Stockage automatic des documents générés ou stockés. Fonction de partage.
 Module2600Name=API/Web services (serveur SOAP)
 Module2600Desc=Active le server SOAP Dolibarr fournissant des services API
 Module2610Name=API/Web services (serveur REST)
@@ -837,11 +838,11 @@ Permission1251=Lancer des importations en masse dans la base (chargement de donn
 Permission1321=Exporter les factures clients, attributs et règlements
 Permission1322=Rouvrir une facture payée
 Permission1421=Exporter les commandes clients et attributs
-Permission20001=Read leave requests (your leaves and the one of your subordinates)
-Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
+Permission20001=Lire les demandes de congé (les vôtres et celle de vos subordonnés)
+Permission20002=Créer/modifier vos demandes de congé (les vôtres et celle de vos subordonnés)
 Permission20003=Supprimer les demandes de congé
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20004=Lire toutes les demandes de congé (même celle des utilisateurs non subordonnés)
+Permission20005=Créer/modifier des demandes de congé pour tout le monde (même des utilisateur non subordonnés)
 Permission20006=Administration des demandes de congés (configuration et mise à jour du solde)
 Permission23001=Voir les travaux planifiés
 Permission23002=Créer/Modifier des travaux planifiées
@@ -888,7 +889,7 @@ DictionaryRevenueStamp=Montants des timbres fiscaux
 DictionaryPaymentConditions=Conditions de règlement
 DictionaryPaymentModes=Modes de paiements
 DictionaryTypeContact=Types de contacts/adresses
-DictionaryTypeOfContainer=Type of website pages/containers
+DictionaryTypeOfContainer=Type de pages/conteneurs de site Web
 DictionaryEcotaxe=Barèmes Eco-participation (DEEE)
 DictionaryPaperFormat=Format papiers
 DictionaryFormatCards=Formats des cartes
@@ -917,7 +918,7 @@ VATManagement=Gestion TVA
 VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :<br>Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu (TVA pays vendeur si < seuil du pays et si  avant 01/01/2015, TVA pays acheteur après le 01/01/2015). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.<br>Sinon TVA proposée par défaut=0. Fin de règle.<br>
 VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés.
 VATIsUsedExampleFR=En France, cela signifie que les entreprises ou les organisations sont assuetis à la tva (réel ou normal).
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsNotUsedExampleFR=En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaître la mention "TVA non applicable - art-293B du CGI" sur les factures.
 ##### Local Taxes #####
 LTRate=Taux
 LocalTax1IsNotUsed=Non assujeti
@@ -982,7 +983,7 @@ Host=Serveur
 DriverType=Type du pilote
 SummarySystem=Résumé des informations systèmes
 SummaryConst=Liste de tous les paramètres de configuration Dolibarr
-MenuCompanySetup=Company/Organization
+MenuCompanySetup=Société/Organisation
 DefaultMenuManager= Gestionnaire du menu standard
 DefaultMenuSmartphoneManager=Gestionnaire du menu smartphone
 Skin=Thème visuel
@@ -998,8 +999,8 @@ PermanentLeftSearchForm=Zone de recherche permanente du menu de gauche
 DefaultLanguage=Langue à utiliser par défaut (code langue)
 EnableMultilangInterface=Activer l'interface multi-langue
 EnableShowLogo=Afficher le logo dans le menu gauche
-CompanyInfo=Company/organization information
-CompanyIds=Company/organization identities
+CompanyInfo=Informations sur la société/organisation
+CompanyIds=Identifiants société/organisation
 CompanyName=Nom/Enseigne/Raison sociale
 CompanyAddress=Adresse
 CompanyZip=Code postal
@@ -1054,7 +1055,7 @@ AreaForAdminOnly=Les paramètres d'installation ne peuvent être remplis que par
 SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement.
 SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateur. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace.
 CompanyFundationDesc=Éditez sur cette page toutes les informations connues de la société ou de l'association que vous souhaitez gérer (Pour cela, cliquez sur les boutons "Modifier" ou "Sauvegarder" en bas de page)
-AccountantDesc=Edit on this page all known information of your accountant/auditor to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Renseignez sur cette page toutes les informations connues sur votre comptable
 DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr
 AvailableModules=Modules/applications installés
 ToActivateModule=Pour activer des modules, aller dans l'espace Configuration (Accueil->Configuration->Modules).
@@ -1168,6 +1169,7 @@ BrowserIsKO=Vous utilisez le navigateur %s. Ce navigateur est déconseillé pour
 XDebugInstalled=XDebug est chargé.
 XCacheInstalled=XCache est chargé.
 AddRefInList=Afficher les références client/fournisseur dans les listes (listes déroulantes ou à autocomplétion) et les libellés des liens clicables. Les tiers apparaîtront alors sous la forme "CC12345 - SC45678 - La big company coorp", au lieu de "La big company coorp".
+OnSearchAndListGoOnCustomerOrSupplierCard = A la recherche, ou sur une liste, aller directement sur la fiche client ou fournisseur (si le tiers est client ou fournisseur)
 AskForPreferredShippingMethod=Demander la méthode d'expédition préférée pour les tiers.
 FieldEdition=Édition du champ %s
 FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export)
@@ -1447,9 +1449,9 @@ SyslogFilename=Nom et chemin du fichier
 YouCanUseDOL_DATA_ROOT=Vous pouvez utiliser DOL_DATA_ROOT/dolibarr.log pour un journal dans le répertoire "documents" de Dolibarr. Vous pouvez néanmoins définir un chemin différent pour stocker ce fichier.
 ErrorUnknownSyslogConstant=La constante %s n'est pas une constante syslog connue
 OnlyWindowsLOG_USER=Windows ne prend en charge que LOG_USER
-CompressSyslogs=Syslog files compression and backup
-SyslogFileNumberOfSaves=Log backups
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+CompressSyslogs=Compression et sauvegarde des fichiers Syslog
+SyslogFileNumberOfSaves=Sauvegardes de Log
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurer le travail planifié de nettoyage pour définir la fréquence de sauvegarde de log
 ##### Donations #####
 DonationsSetup=Configuration du module Dons
 DonationsReceiptModel=Modèles de reçu de dons
@@ -1546,12 +1548,12 @@ FailedToInitializeMenu=Échec à inisialiser le menu
 ##### Tax #####
 TaxSetup=Configuration du module TVA, charges fiscales ou sociales et dividendes
 OptionVatMode=Option d'exigibilité de TVA par défaut
-OptionVATDefault=Standard basis
+OptionVATDefault=Standard
 OptionVATDebitOption=Option services sur Débit
 OptionVatDefaultDesc=TVA sur encaissement, l'exigibilité de la TVA est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur paiement pour les services
 OptionVatDebitOptionDesc=TVA sur débit, l'exigibilité de la TVA est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur facturation (débit) pour les services
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+OptionPaymentForProductAndServices=Sur paiements pour les produits et services
+OptionPaymentForProductAndServicesDesc=La TVA est due: <br> - sur le paiement pour les marchandises <br> - sur les paiements pour les services
 SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilité par défaut de la TVA pour l'option choisie:
 OnDelivery=Sur livraison
 OnPayment=Sur paiement
@@ -1561,7 +1563,7 @@ SupposedToBeInvoiceDate=Date de facture utilisée
 Buy=Achat
 Sell=Vente
 InvoiceDateUsed=Date de facture utilisée
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Votre société/institution est définie comme non assujettie à la TVA (voir Accueil > Configuration > Société/Institution), aussi il n'y a pas d'option de paramétrage de la TVA.
 AccountancyCode=Code comptable
 AccountancyCodeSell=Code comptable vente
 AccountancyCodeBuy=Code comptable achat
@@ -1729,6 +1731,7 @@ MailToSendContract=Pour l'envoie depuis un contrat
 MailToThirdparty=Pour l'envoi depuis la fiche Tiers
 MailToMember=Pour l'envoi depuis la fiche d'un adhérent
 MailToUser=Pour l'envoi depuis la page utilisateur
+MailToProject= Pour envoyer un e-mail depuis la fiche projet
 ByDefaultInList=Afficher par défaut sur les vues listes
 YouUseLastStableVersion=Vous utilisez la dernière version stable
 TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annonce une nouvelle version majeure (n'hésitez pas à l'utilisez pour vos propres news)
@@ -1775,12 +1778,13 @@ MAIN_PDF_MARGIN_LEFT=Marge gauche sur les PDF
 MAIN_PDF_MARGIN_RIGHT=Marge droite sur les PDF
 MAIN_PDF_MARGIN_TOP=Marge haute sur les PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge bas sur les PDF
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
-SeveralLangugeVariatFound=Several language variants found
+SetToYesIfGroupIsComputationOfOtherGroups=Réglez ceci sur Oui si ce groupe est un calcul d'autres groupes
+EnterCalculationRuleIfPreviousFieldIsYes=Entrez la règle de calcul si le champ précédent a été défini sur Oui (par exemple, 'CODEGRP1 + CODEGRP2')
+SeveralLangugeVariatFound=Plusieurs variantes de langue trouvées
+WebDavServer=URL du serveur %s: %s
 ##### Resource ####
 ResourceSetup=Configuration du module Ressource
 UseSearchToSelectResource=Utilisez un champ avec auto-complétion pour choisir les ressources (plutôt qu'une liste déroulante).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
+DisabledResourceLinkUser=Désactiver la fonctionnalité pour lier une ressource aux utilisateurs
+DisabledResourceLinkContact=Désactiver la fonctionnalité pour lier une ressource aux contacts/adresses
 ConfirmUnactivation=Confirmer réinitialisation du module
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 3479884bab3..322fe871d7a 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Adhérent %s validé
 MemberModifiedInDolibarr=Adhérent %s modifié
 MemberResiliatedInDolibarr=Adhérent %s résilié
 MemberDeletedInDolibarr=Adhérent %s supprimé
-MemberSubscriptionAddedInDolibarr=Souscription adhérent %s
+MemberSubscriptionAddedInDolibarr=Adhésion %s pour l'adhérent %s ajoutée
+MemberSubscriptionModifiedInDolibarr=Abonnement %s pour l'adhérent %s modifié
+MemberSubscriptionDeletedInDolibarr=Abonnement %s pour l'adhérent %s supprimé
 ShipmentValidatedInDolibarr=Expédition %s validée
 ShipmentClassifyClosedInDolibarr=Expédition %s classée payée
 ShipmentUnClassifyCloseddInDolibarr=Expédition %s réouverte
@@ -98,6 +100,7 @@ AgendaUrlOptions3=<b>logina=%s</b> pour limiter l'export aux actions dont l'util
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> pour limiter l'export aux actions non assignées à l'utilisateur <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b>pour limiter l'export aux actions assignées à l'utilisateur <b>%s</b> (propriétaire et autres).
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pour restreindre aux événements associés au projet <b>PROJECT_ID</b>.
+AgendaUrlOptionsNotAutoEvent=<b> notactiontype=systemauto </b> pour exclure un événement automatique.
 AgendaShowBirthdayEvents=Afficher les anniversaires de contacts
 AgendaHideBirthdayEvents=Masquer les anniversaires de contacts
 Busy=Occupé
@@ -109,7 +112,7 @@ ExportCal=Export calendrier
 ExtSites=Import calendriers externes
 ExtSitesEnableThisTool=Afficher les calendriers externes (définis dans la configuration globale du module) dans l'agenda. N'affecte pas les calendriers externes définis par les utilisateurs.
 ExtSitesNbOfAgenda=Nombre de calendriers
-AgendaExtNb=Calendrier n° %s
+AgendaExtNb=Calendrier no %s
 ExtSiteUrlAgenda=URL d'accès au fichier ical
 ExtSiteNoLabel=Aucune description
 VisibleTimeRange=Plage d'heures visible
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index efce18bfe12..1cd7471e660 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -7,6 +7,7 @@ BankName=Nom de la banque
 FinancialAccount=Compte
 BankAccount=Compte bancaire
 BankAccounts=Comptes bancaires
+BankAccountsAndGateways=Comptes bancaires | Interfaces paiement
 ShowAccount=Afficher compte
 AccountRef=Ref compte financier
 AccountLabel=Libellé compte financier
@@ -59,7 +60,7 @@ BankType2=Compte caisse/liquide
 AccountsArea=Espace comptes
 AccountCard=Fiche compte
 DeleteAccount=Suppression de compte
-ConfirmDeleteAccount=Êtes-vous sûr de vouloir effacer cet événement ?
+ConfirmDeleteAccount=Êtes-vous sûr de vouloir effacer ce compte bancaire ?
 Account=Compte
 BankTransactionByCategories=Écritures bancaires par tags/catégories
 BankTransactionForCategory=Écritures bancaires pour le tag/catégorie <b>%s</b>
@@ -145,7 +146,7 @@ AllRIB=Tous les comptes bancaires
 LabelRIB=Nom du compte bancaire
 NoBANRecord=Aucun compte bancaire enregistré
 DeleteARib=Supprimer compte bancaire
-ConfirmDeleteRib=Etes vous sur de vouloir supprimé ce compte bancire ?
+ConfirmDeleteRib=Êtes-vous sur de vouloir supprimer ce compte bancaire ?
 RejectCheck=Chèque rejeté
 ConfirmRejectCheck=Êtes-vous sûr de vouloir marquer ce chèque comme rejeté ?
 RejectCheckDate=Date du rejet du chèque
@@ -158,6 +159,6 @@ NewVariousPayment=Nouvelle opération diverse
 VariousPayment=Opérations diverses
 VariousPayments=Opérations diverses
 ShowVariousPayment=Afficher les opérations diverses
-AddVariousPayment=Ajouter paiements divers
+AddVariousPayment=Créer paiements divers
 YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 13729eb43fa..bdf18b987e2 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Remboursé
 DeletePayment=Supprimer le paiement
 ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement ?
 ConfirmConvertToReduc=Voulez vous convertir ce(cet) %s en remise fixe ?<br>Le montant sera enregistré parmi les autres remises et pourra être utilisé en tant que remise sur une autre facture du client.
+ConfirmConvertToReducSupplier=Voulez vous convertir ce(cet) %s en remise fixe ?<br>Le montant sera enregistré parmi les autres remises et pourra être utilisé en tant que remise sur une autre facture courante ou future de ce fournisseur.
 SupplierPayments=Règlements fournisseurs
 ReceivedPayments=Règlements reçus
 ReceivedCustomersPayments=Règlements reçus du client
@@ -91,7 +92,7 @@ PaymentAmount=Montant règlement
 ValidatePayment=Valider ce règlement
 PaymentHigherThanReminderToPay=Règlement supérieur au reste à payer
 HelpPaymentHigherThanReminderToPay=Attention, le montant de paiement pour une ou plusieurs factures est supérieur au reste à payer.<br>Corrigez votre saisie, sinon, confirmez et pensez à créer un avoir du trop perçu lors de la fermeture de chacune des factures surpayées.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, le montant de paiement pour une ou plusieurs factures est supérieur au reste à payer.<br>Corrigez votre saisie, sinon, confirmez.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, le montant de paiement pour une ou plusieurs factures est supérieur au reste à payer.<br>Corrigez votre saisie, sinon, confirmez et pensez à créer un avoir pour l'excédent pour chaque facture surpayée.
 ClassifyPaid=Classer 'Payée'
 ClassifyPaidPartially=Classer 'Payée partiellement'
 ClassifyCanceled=Classer 'Abandonnée'
@@ -110,6 +111,7 @@ DoPayment=Saisir règlement
 DoPaymentBack=Saisir remboursement 
 ConvertToReduc=Convertir en réduction future
 ConvertExcessReceivedToReduc=Convertir le trop-perçu en réduction future
+ConvertExcessPaidToReduc=Convertir le trop-perçu en réduction future
 EnterPaymentReceivedFromCustomer=Saisie d'un règlement reçu du client
 EnterPaymentDueToCustomer=Saisie d'un remboursement d'un avoir client
 DisabledBecauseRemainderToPayIsZero=Désactivé car reste à payer est nul
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Statut des factures générées
 BillStatusDraft=Brouillon (à valider)
 BillStatusPaid=Payée
 BillStatusPaidBackOrConverted=Facture d'avoir remboursée ou convertie en réduction
-BillStatusConverted=Payée
+BillStatusConverted=Payée (prêt pour consommation dans une facture finale)
 BillStatusCanceled=Abandonnée
 BillStatusValidated=Validée (à payer)
 BillStatusStarted=Règlement commencé
@@ -220,6 +222,7 @@ RemainderToPayBack=Montant restant à rembourser
 Rest=Créance
 AmountExpected=Montant réclamé
 ExcessReceived=Trop perçu
+ExcessPaid=Excédent payé
 EscompteOffered=Escompte (règl. avt échéance)
 EscompteOfferedShort=Escompte
 SendBillRef=Envoi de la facture %s
@@ -283,16 +286,20 @@ Deposit=Acompte
 Deposits=Acomptes
 DiscountFromCreditNote=Remise issue de l'avoir %s
 DiscountFromDeposit=Acomptes issus de la facture %s
-DiscountFromExcessReceived=Trop-perçu sur la facture %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ce type de crédit ne peut s'utiliser que sur une facture non validée
 CreditNoteDepositUse=La facture doit être validée pour pouvoir utiliser ce type de crédit
 NewGlobalDiscount=Nouvelle ligne de déduction
 NewRelativeDiscount=Nouvelle remise relative
+DiscountType=Type de remise
 NoteReason=Note/Motif
 ReasonDiscount=Motif
 DiscountOfferedBy=Accordé par
 DiscountStillRemaining=Réductions disponibles
 DiscountAlreadyCounted=Réductions déjà consommées
+CustomerDiscounts=Remises client
+SupplierDiscounts=Remises fournisseur
 BillAddress=Adresse de facturation
 HelpEscompte=Un <b>escompte</b> est une remise accordée, sur une facture donnée, à un client car ce dernier a réalisé son règlement bien avant l'échéance.
 HelpAbandonBadCustomer=Ce montant a été abandonné (client jugé mauvais payeur) et est considéré comme une perte exceptionnelle.
@@ -341,10 +348,10 @@ NextDateToExecution=Date pour la prochaine génération de facture
 NextDateToExecutionShort=Date de prochaine génération
 DateLastGeneration=Date de la dernière génération
 DateLastGenerationShort=Date de dernière génération
-MaxPeriodNumber=Nombre maximum de génération
-NbOfGenerationDone=Nombre de génération déjà réalisées
-NbOfGenerationDoneShort=Nb de génération réalisée
-MaxGenerationReached=Maximum de générations atteint
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Valider les factures automatiquement
 GeneratedFromRecurringInvoice=Généré depuis la facture modèle récurrente %s
 DateIsNotEnough=Date pas encore atteinte
@@ -521,3 +528,7 @@ BillCreated=%s facture(s) créée(s)
 StatusOfGeneratedDocuments=Statut de génération du document
 DoNotGenerateDoc=Ne pas générer le fichier
 AutogenerateDoc=Auto-génerer le fichier
+AutoFillDateFrom=Définir la date de début de la ligne de service avec la date de la facture
+AutoFillDateFromShort=Définir la date de début
+AutoFillDateTo=Définir la date de fin de la ligne de service avec la date de la prochaine facture
+AutoFillDateToShort=Définir la date de fin
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 99d1375b28c..10ab0fd65e4 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -85,4 +85,3 @@ CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une cat
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
-ChooseCategory=Choisissez les catégories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index a3aea77e86c..867f0b7197f 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -54,7 +54,7 @@ PostOrFunction=Poste/fonction
 UserTitle=Titre civilité
 NatureOfThirdParty=Nature de tiers
 Address=Adresse
-State=Département/Canton
+State=Département / Canton
 StateShort=Département
 Region=Région
 Region-State=Région - État
@@ -77,9 +77,11 @@ Web=Web
 Poste= Poste
 DefaultLang=Langue par défaut
 VATIsUsed=Assujetti à la TVA
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Non assujetti à la TVA
 CopyAddressFromSoc=Remplir avec l'adresse du tiers
 ThirdpartyNotCustomerNotSupplierSoNoRef=Ce tiers n'est ni client ni fournisseur. il n'y a pas d'objet référent.
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Compte bancaire paiements
 OverAllProposals=Propositions commerciales
 OverAllOrders=Commandes
@@ -240,7 +242,7 @@ ProfId3TN=Id. prof. 3 (Code en douane)
 ProfId4TN=Id. prof. 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Id professionnel
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -259,21 +261,31 @@ ProfId4DZ=Numéro d'identification du client
 VATIntra=Numéro de TVA
 VATIntraShort=Num. TVA
 VATIntraSyntaxIsValid=Syntaxe valide
+VATReturn=Fréquence TVA
 ProspectCustomer=Prospect / Client
 Prospect=Prospect
 CustomerCard=Fiche client
 Customer=Client
 CustomerRelativeDiscount=Remise client relative
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Remise relative
 CustomerAbsoluteDiscountShort=Remise fixe
 CompanyHasRelativeDiscount=Ce client a une remise par défaut de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ce client n'a pas de remise relative par défaut
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=Ce client dispose de remises disponibles (avoirs ou acomptes) pour un montant de <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Ce client a une réduction disponible (commercial, acompte) pour <b>%s</b>%s
 CompanyHasCreditNote=Ce client a <b>%s</b> %s d'avoirs disponibles
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus de remise fixe disponible
-CustomerAbsoluteDiscountAllUsers=Remises fixes en cours (accordées par tout utilisateur)
-CustomerAbsoluteDiscountMy=Remises fixes en cours (accordées personnellement)
+CustomerAbsoluteDiscountAllUsers=Remises client fixes en cours (accordées par tout utilisateur)
+CustomerAbsoluteDiscountMy=Remises client fixes en cours (accordées personnellement)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Aucune
 Supplier=Fournisseur
 AddContact=Créer contact
@@ -379,7 +391,7 @@ ExportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attribut
 ExportDataset_company_2=Contacts (de tiers) et attributs
 ImportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attributs
 ImportDataset_company_2=Contacts/Adresses (de tiers ou libre) et attributs
-ImportDataset_company_3=Coordonnées bancaires
+ImportDataset_company_3=Coordonnées bancaires des tiers
 ImportDataset_company_4=Tiers/Commerciaux (Affectation des Commerciaux aux Tiers)
 PriceLevel=Niveau de prix
 DeliveryAddress=Adresse de livraison
@@ -407,6 +419,7 @@ ProductsIntoElements=Liste des produits/services dans %s
 CurrentOutstandingBill=Montant encours
 OutstandingBill=Montant encours autorisé
 OutstandingBillReached=Montant encours autorisé dépassé
+OrderMinAmount=Montant minimum pour la commande
 MonkeyNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn pour les codes clients et %syymm-nnnn pour les codes fournisseurs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
 LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout moment.
 ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...)
@@ -417,5 +430,5 @@ ThirdpartiesMergeSuccess=Les tiers ont été fusionnés
 SaleRepresentativeLogin=Login du commercial
 SaleRepresentativeFirstname=Prénom du commercial
 SaleRepresentativeLastname=Nom du commercial
-ErrorThirdpartiesMerge=Une erreur est survenue lors de la suppression de ce tiers. La modification n'a pas pu être effectuée.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Nouveau code client ou fournisseur proposé en cas de doublon de code
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index ea961bbc521..a5711142a70 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -31,9 +31,9 @@ Credit=Crédit
 Piece=Pièce
 AmountHTVATRealReceived=HT collectée
 AmountHTVATRealPaid=HT payé
-VATToPay=Tax sales
+VATToPay=TVA ventes
 VATReceived=TVA collectée
-VATToCollect=TVA payée
+VATToCollect=TVA achats
 VATSummary=Balance de TVA
 VATPaid=TVA payée
 LT1Summary=Résumé taxe 2
@@ -103,6 +103,7 @@ LT2PaymentsES=Règlements IRPF
 VATPayment=Règlement TVA
 VATPayments=Règlements TVA
 VATRefund=Remboursement TVA
+NewVATPayment=New sales tax payment
 Refund=Rembourser
 SocialContributionsPayments=Paiements de charges fiscales/sociales
 ShowVatPayment=Affiche paiement TVA
@@ -164,20 +165,25 @@ RulesResultBookkeepingPersonalized=Cela inclut les enregistrements dans votre Gr
 SeePageForSetup=Voir le menu <a href="%s"> %s </a> pour la configuration
 DepositsAreNotIncluded=- Les factures d'acomptes ne sont pas incluses
 DepositsAreIncluded=- Les factures d'acomptes sont incluses
-LT2ReportByCustomersInInputOutputModeES=Rapport par client des IRPF
-LT1ReportByCustomersInInputOutputModeES=Rapport par tiers des RE
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Rapport par tiers des RE
+LT2ReportByCustomersES=Rapport par client des IRPF
+VATReport=Rapport TVA
+VATReportByPeriods=Rapport de TVA par période
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Rapport par client des TVA collectées et payées
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
-LT1ReportByQuartersInInputOutputMode=Rapport par taux de RE
-LT2ReportByQuartersInInputOutputMode=Rapport par taux de IRPF
+VATReportByQuartersInInputOutputMode=Rapport par taux des TVA collectées et payées
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Rapport par taux de RE
+LT2ReportByQuartersES=Rapport par taux de IRPF
 SeeVATReportInInputOutputMode=Cliquer sur <b>%sTVA encaissement%s</b> pour mode de calcul standard
 SeeVATReportInDueDebtMode=Cliquer sur <b>%sTVA sur débit%s</b> pour mode de calcul avec option sur les débits
 RulesVATInServices=- Pour les services, le rapport inclut les TVA des règlements effectivement reçus ou émis en se basant sur la date du règlement.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATInProducts=- Pour les biens matériels, il inclut les TVA des factures en se basant sur la date de facture.
 RulesVATDueServices=- Pour les services, le rapport inclut les TVA des factures dues, payées ou non en se basant sur la date de facture.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- Pour les biens matériels, il inclut les TVA des factures en se basant sur la date de facture.
 OptionVatInfoModuleComptabilite=Remarque : Pour les biens matériels, il faudrait utiliser la date de livraison pour être plus juste.
 ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/facture
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index ace54bbd82a..d707a0cc313 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -14,7 +14,7 @@ FileToLaunchCronJobs=Ligne de commande pour vérifier et lancer les travaux prog
 CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser l'entrée suivante en crontab pour exécuter la ligne de commande toutes les 5 minutes
 CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tache pour lancer cette commande toute les 5 minutes.
 CronMethodDoesNotExists=La classe %s ne contient aucune méthode %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobDefDesc=Les travaux planifiés sont définis dans le fichier descripteur de module. Lorsque le module est activé, ils sont chargés et disponibles afin que vous puissiez administrer les travaux à partir du menu des outils d'administration %s.
 CronJobProfiles=Liste des profils de travaux planifiés prédéfinis
 # Menu
 EnabledAndDisabled=Activés et désactivés
@@ -62,10 +62,10 @@ CronTaskInactive=Cette tâche est désactivée
 CronId=Id
 CronClassFile=Nom de fichier intégrant la classe
 CronModuleHelp=Nom du dossier du module dans Dolibarr (fonctionne aussi avec les modules externes). <BR>Par exemple, pour appeler la méthode d'appel des produits Dolibarr /htdocs/<u>product</u>/class/product.class.php, la valeur du module est <br><i>product</i>.
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronClassFileHelp=Le chemin relatif et le nom du fichier à charger (le chemin d'accès est relatif au répertoire racine du serveur Web). <BR> Par exemple, pour appeler la méthode fetch de l'objet Product htdocs/product/class/<u> product.class.php</u>, la valeur du nom de fichier de classe est<br> <i> product/class/product.class.php</i>
 CronObjectHelp=Le nom de l'objet à charger. <BR> Par exemple pour appeler la méthode de récupération de l'objet Produut Dolibarr /htdocs/product/class/product.class.php, la valeur du nom de fichier de classe est <br> <i> Product </i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronMethodHelp=La méthode objet à lancer. <BR> Par exemple, pour appeler la méthode fetch de l'objet Dolibarr Product /htdocs/product/class/product.class.php, la valeur pour la méthode est<br><i>fetch</i>
+CronArgsHelp=Les arguments de la méthode. <BR> 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<br> <i>0, RefProduit</i>
 CronCommandHelp=La commande système a exécuter.
 CronCreateJob=Créer un nouveau travail planifié
 CronFrom=A partir du
@@ -74,9 +74,10 @@ CronFrom=A partir du
 CronType=Type de travail planifié
 CronType_method=Appelle d'une méthode d'une classe Dolibarr
 CronType_command=Commande terminal
-CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s
+CronCannotLoadClass=Impossible de charger le fichier %s (pour charger l'objet %s)
+CronCannotLoadObject=Le fichier de classe %s a été chargé, mais l'objet %s n'a pas été trouvé dedans
 UseMenuModuleToolsToAddCronJobs=Aller à la page "Accueil - Outils administration - Travaux planifiées" pour voir la listes des travaux programmées et les modifier.
 JobDisabled=Travail désactivé
 MakeLocalDatabaseDumpShort=Sauvegarde locale de base
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Créez un fichier dump de base local. Les paramètres sont: compression ('gz' ou 'bz' ou 'none'), type de sauvegarde ('mysql' ou 'pgsql'), 1, 'auto' ou nom du fichier à générer, nb de fichiers de sauvegarde à garder
 WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à %s heures avant d'être exécutés.
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 83a92bcf767..daba395b326 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Afficher répertoire
 DeleteSection=Suppression répertoire
 ConfirmDeleteSection=Confirmez-vous la suppression du répertoire <b>%s</b> ?
 ECMDirectoryForFiles=Répertoire relatif pour les fichiers
+CannotRemoveDirectoryContainsFilesOrDirs=Suppression impossible car il contient des fichiers ou des sous-répertoires
 CannotRemoveDirectoryContainsFiles=Suppression impossible car des fichiers sont présents
 ECMFileManager=Gestionnaire de fichier
-ECMSelectASection=Sélectionner un répertoire sur l'arbre de gauche…
+ECMSelectASection=Sélectionner un répertoire dans l'arborescence...
 DirNotSynchronizedSyncFirst=Ce répertoire a été crée ou modifié en dehors du module GED. Cliquer sur le bouton "Rafraîchir" afin de resyncroniser les informations sur disque et la base pour voir le contenu de ce répertoire.
 ReSyncListOfDir=Resynchroniser la liste des répertoires
 HashOfFileContent=Hash du contenu du fichier
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 9941fc8d08f..c3c3f55deb4 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -44,7 +44,7 @@ ErrorFailedToWriteInDir=Impossible d'écrire dans le répertoire %s
 ErrorFoundBadEmailInFile=Syntaxe d'email incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s)
 ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Peut-être est-il associé à des éléments de Dolibarr.
 ErrorFieldsRequired=Des champs obligatoires n'ont pas été renseignés
-ErrorSubjectIsRequired=L'adresse email topic est requise
+ErrorSubjectIsRequired=Le sujet du mail est obligatoire
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
 ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage.
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Le matching Dolibarr-LDAP est incomplet.
 ErrorLDAPMakeManualTest=Un fichier .ldif a été généré dans le répertoire %s. Essayez de charger ce fichier manuellement depuis la ligne de commande pour plus de détail sur l'erreur.
 ErrorCantSaveADoneUserWithZeroPercentage=Impossible de sauver une action à l'état non commencé avec un utilisateur défini comme ayant fait l'action.
 ErrorRefAlreadyExists=La référence utilisée pour la création existe déjà
-ErrorPleaseTypeBankTransactionReportName=Choisissez le relevé bancaire sur lequel la ligne est rapportées (Format AAAAMM ou AAAAMMJJ)
+ErrorPleaseTypeBankTransactionReportName=Choisissez le nom du relevé bancaire sur lequel la ligne est rapportées (Format AAAAMM ou AAAAMMJJ)
 ErrorRecordHasChildren=Impossible de supprimer l'enregistrement car il possède des enregistrements fils.
 ErrorRecordHasAtLeastOneChildOfType=L'objet a au moins un enfant de type %s
 ErrorRecordIsUsedCantDelete=Ne peut effacer l'enregistrement.  Ce dernier est déjà utilisé ou inclut dans un autre élément.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Echec de l'ajout de %s à la liste Mailman %s ou b
 ErrorFailedToRemoveToMailmanList=Echec de la suppression de %s de la liste Mailman %s ou base SPIP
 ErrorNewValueCantMatchOldValue=La nouvelle valeur ne peut être égale à l'ancienne
 ErrorFailedToValidatePasswordReset=Echec de la réinitialisation du mot de passe. Il est possible que ce lien ait déjà été utilisé (l'utilisation de ce lien ne fonctionne qu'une fois). Si ce n'est pas le cas, essayez de recommencer le processus de réinitialisation de mot de passe depuis le début.
-ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de données. Vérifier que Mysql est bien lancé (dans la plupart des cas, vous pouvez le lancer depuis la ligne de commande par la commande 'sudo /etc/init.d/mysql start').
+ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de données. Vérifier que votre serveur est bien lancé (par exemple, avec MySQL/MariaDB, vous pouvez le lancer depuis la ligne de commande avec 'sudo service mysql start').
 ErrorFailedToAddContact=Echec à l'ajout du contact
 ErrorDateMustBeBeforeToday=La date ne peut pas être supérieure à aujourd'hui
 ErrorPaymentModeDefinedToWithoutSetup=Un mode de paiement a été défini de type %s mais la configuration du module Facture n'a pas été complétée pour définir les informations affichées pour ce mode de paiment.
@@ -206,7 +206,9 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Vous devez choisir si l'article e
 ErrorDiscountLargerThanRemainToPaySplitItBefore=La réduction que vous essayez d'appliquer est supérieure au montant du paiement. Auparavant, divisez le rabais en 2 rabais plus petits.
 ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut que la clé de partage a été modifié ou le fichier a été récemment supprimé.
 ErrorProductBarCodeAlreadyExists=Le code-barre du produit %s existe déjà sur une autre référence de produit
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un produit virtuel pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
+ErrorDescRequiredForFreeProductLines=La description est obligatoire pour les lignes avec un produit non prédéfini
+ErrorObjectMustHaveStatusValidToBeCanceled=L'objet %s doit être au statut 'Validé' pour être annulé
 
 # Warnings
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
@@ -229,3 +231,4 @@ WarningSomeLinesWithNullHourlyRate=Des temps ont été enregistrés par des util
 WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par sécurité, vous devrez vous identifiez avec votre nouvel identifiant avant l'action suivante.
 WarningAnEntryAlreadyExistForTransKey=Une donnée identique existe déjà pour la traduction du code dans cette langue
 WarningNumberOfRecipientIsRestrictedInMassAction=Attention, le nombre de destinataires différents est limité à <b>%s</b> lorsque vous utilisez les actions en masse sur les listes
+WarningDateOfLineMustBeInExpenseReportRange=Attention, la date de la ligne n'est pas dans la plage de la note de frais
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 57d57c06bef..808c35ce9d0 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -16,7 +16,12 @@ CancelCP=Annulée
 RefuseCP=Refusée
 ValidatorCP=Approbateur
 ListeCP=Liste des demandes de congés
+LeaveId=ID demande de congès
 ReviewedByCP=Sera approuvé par
+UserForApprovalID=ID de l'utilisateur d'approbation
+UserForApprovalFirstname=Prénom de l'utilisateur d'approbation
+UserForApprovalLastname=Nom de l'utilisateur d'approbation
+UserForApprovalLogin=Login de l'utilisateur d'approbation
 DescCP=Description
 SendRequestCP=Créer une demande de congés
 DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jour(s)</b> avant la date de ceux-ci.
@@ -30,11 +35,14 @@ ErrorUserViewCP=Vous n'êtes pas autorisé à lire cette demande de congés.
 InfosWorkflowCP=Informations du workflow
 RequestByCP=Demandée par
 TitreRequestCP=Demande de congés
+TypeOfLeaveId=Type de la demande de congès
+TypeOfLeaveCode=Code du type de congès
+TypeOfLeaveLabel=Libellé du type de congès
 NbUseDaysCP=Nombre de jours de congés consommés
 NbUseDaysCPShort=Jours consommés
-NbUseDaysCPShortInMonth=Jours consommés dans le mois
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+NbUseDaysCPShortInMonth=Jours consommés pour le mois
+DateStartInMonth=Date de début pour le mois
+DateEndInMonth=Date de fin pour le mois
 EditCP=Modifier
 DeleteCP=Supprimer
 ActionRefuseCP=Refuser
@@ -43,7 +51,7 @@ StatutCP=Statut
 TitleDeleteCP=Supprimer la demande de Congés
 ConfirmDeleteCP=Confirmer la suppression de cette demande de congés ?
 ErrorCantDeleteCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés.
-CantCreateCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés.
+CantCreateCP=Erreur, vous n'avez pas le droit de créer une demande de congés.
 InvalidValidatorCP=Vous devez choisir un approbateur pour votre demande de congés.
 NoDateDebut=Vous devez choisir une date de début.
 NoDateFin=Vous devez choisir une date de fin.
@@ -54,7 +62,7 @@ DateValidCP=Date d'approbation
 TitleToValidCP=Envoyer la demande de congés
 ConfirmToValidCP=Êtes-vous sûr de vouloir valider la demande de congés ?
 TitleRefuseCP=Refuser la demande de congés
-ConfirmRefuseCP=Êtes-vous sûr de vouloir valider la demande de congés ?
+ConfirmRefuseCP=Êtes-vous sûr de vouloir refuser la demande de congés ?
 NoMotifRefuseCP=Vous devez choisir un motif pour refuser cette demande.
 TitleCancelCP=Annuler la demande de congés
 ConfirmCancelCP=Êtes-vous sûr de vouloir annuler la demande de congés ?
@@ -63,6 +71,7 @@ DateRefusCP=Date du refus
 DateCancelCP=Date de l'annulation
 DefineEventUserCP=Attribuer un congé exceptionnel à un utilisateur
 addEventToUserCP=Attribuer ce congé
+NotTheAssignedApprover=Vous n'êtes pas l'approbateur affecté
 MotifCP=Motif
 UserCP=Utilisateur
 ErrorAddEventToUserCP=Une erreur est survenue durant l'ajout du congé exceptionnel.
@@ -85,11 +94,12 @@ EmployeeFirstname=Prénom du salarié
 TypeWasDisabledOrRemoved=Le type de congés (id %s) a été désactivé ou supprimé
 LastHolidays=Les %s dernières demandes de congés
 AllHolidays=Toutes les demandes de congés
-LEAVE_PAID=Congé payés
-LEAVE_SICK=Arrêt maladie
+HalfDay=Demi journée
+NotTheAssignedApprover=Vous n'êtes pas l'approbateur affecté
+LEAVE_PAID=Congés payés
+LEAVE_SICK=Congé maladie
 LEAVE_OTHER=Autre congé
-LEAVE_PAID_FR=congé payés
-
+LEAVE_PAID_FR=Congés payés
 ## Configuration du Module ##
 LastUpdateCP=Dernière mise à jour automatique de l'allocation des congés
 MonthOfLastMonthlyUpdate=Mois de la dernière mise à jour automatique des attributions de congés
@@ -103,11 +113,11 @@ HolidaysToValidate=Valider les demandes de congés
 HolidaysToValidateBody=Veuillez trouver ci-dessous une demande de congés à valider.
 HolidaysToValidateDelay=Cette demande de congés a été effectuée dans un délai de moins de %s jours avant ceux-ci.
 HolidaysToValidateAlertSolde=L'utilisateur ayant fait cette demande de congés payés n'a pas le solde requis.
-HolidaysValidated=Valider demande de congés
+HolidaysValidated=Validation de la demande de congés
 HolidaysValidatedBody=Votre demande de congés du %s au %s vient d'être approuvée.
-HolidaysRefused=Accès refusé
+HolidaysRefused=Congés refusés
 HolidaysRefusedBody=Votre demande de congés payés %s à %s vient d'être refusée pour le motif suivant :
-HolidaysCanceled=Abandonner la demande de congés
+HolidaysCanceled=Abandon de la demande de congés
 HolidaysCanceledBody=Votre demande de congés du %s au %s a été annulée.
 FollowedByACounter=1: Ce type de congé doit être suivis par un compteur. Le compteur est incrémenté manuellement ou automatiquement et quand une demande de congé est validée, le compteur est décrémenté.<br>0: Non suivi par un compteur.
 NoLeaveWithCounterDefined=Il n'y a pas de type de congés définis qui requiert un suivi par un compteur
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index fe568be51f6..48d92644763 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -138,7 +138,7 @@ KeepDefaultValuesWamp=Si vous utilisez l'installeur automatique DoliWamp, les do
 KeepDefaultValuesDeb=Vous utilisez l'assistant d'installation depuis un environnement Linux (Ubuntu, Debian, Fedor...). Les valeurs présentes ici sont pré-remplies. Seul le mot de passe d'accès du propriétaire de la base de données doit être renseigné. Les autres paramètres ne doivent être modifiés qu'en connaissance de cause.
 KeepDefaultValuesMamp=Vous utilisez l'assistant d'installation DoliMamp. Les valeurs présentes ici sont pré-remplies. Leur modification ne doit être effectuée qu'en connaissance de cause.
 KeepDefaultValuesProxmox=Vous utilisez l'assistant d'installation depuis une application Proxmox. Les valeurs présentes ici sont pré-remplies. Leur modification ne doit être effectuée qu'en connaissance de cause.
-UpgradeExternalModule=Lancer le processus de mise à jour d'un module externe
+UpgradeExternalModule=Lancement du processus de mise à jour de modules externes
 SetAtLeastOneOptionAsUrlParameter=Définissez au moins une option en tant que paramètre dans l'URL. Par exemple: '... repair.php?standard=confirmed'
 NothingToDelete=Rien a supprimer
 NothingToDo=Rien à faire
@@ -196,6 +196,8 @@ MigrationEvents=Migration des évènements pour ajouter les propriétaires dans
 MigrationEventsContact=Migration des événements pour ajouter le contact de l'événement dans la table d'affectation
 MigrationRemiseEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise
 MigrationRemiseExceptEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise_except"
+MigrationUserRightsEntity=Mise à jour du champ entity de llx_user_rights
+MigrationUserGroupRightsEntity=Mise à jour du champ entity de llx_usergroup_rights
 MigrationReloadModule=Rechargement du module %s
 MigrationResetBlockedLog=Réinitialiser le module BlockedLog pour l'algorithme v7
 ShowNotAvailableOptions=Afficher les choix non disponibles
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index cf4c2e16191..e8dcbfa13b4 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -50,6 +50,6 @@ ConfigLoan=Configuration du module Emprunt
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable remboursement capital d'un emprunt par défaut
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable paiement d'intérêt d'un emprunt par défaut
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable paiement de l'assurance d'un emprunt par défaut
-FinancialCommitment=Financial commitment
-CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
+FinancialCommitment=Echéancier
+CreateCalcSchedule=Créer / Modifier échéancier de prêt
+InterestAmount=Montant des intérêts
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 8a223525f9f..b4454b00234 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -73,11 +73,12 @@ OnlyPDFattachmentSupported=Si les documents PDF ont déjà été générés pour
 AllRecipientSelected=Les destinataires des %s enregistrements sélectionnés (si leur email est connu).
 GroupEmails=Regroupement emails
 OneEmailPerRecipient=Un e-mail par destinataire (par défaut, un e-mail par enregistrement sélectionné)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+WarningIfYouCheckOneRecipientPerEmail=Attention, si vous cochez cette case, cela signifie qu'un seul email sera envoyé pour plusieurs enregistrements différents, donc, si votre message contient des variables de substitution qui se réfèrent aux données d'un enregistrement, il devient impossible de les remplacer.
 ResultOfMailSending=Résultat de l'envoi d'EMail en masse
 NbSelected=Nb sélectionné
 NbIgnored=Nb ignoré
 NbSent=Nb envoyé
+SentXXXmessages=%s message(s) envoyé(s).
 ConfirmUnvalidateEmailing=Êtes-vous sûr de vouloir repasser l'emailing <b>%s</b> au statut brouillon ?
 MailingModuleDescContactsWithThirdpartyFilter=Contact avec filtres des tiers
 MailingModuleDescContactsByCompanyCategory=Contacts/adresses par tags/catégorie de tiers
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Nombre courant d'emails de contacts cibles
 UseFormatFileEmailToTarget=Le fichier d'import doit être au format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Saisissez une chaîne de caractères au format <strong>email;nom;prénom;autre</strong>
 MailAdvTargetRecipients=Destinataires (sélection avancée)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtTitle=Remplissez les champs de saisie pour pré-sélectionner les tiers ou contacts/adresses cibles
 AdvTgtSearchTextHelp=Astuces de recherche : <br>- x<b>%%</b> pour rechercher tous les termes commençant par x,<br>- <b>;</b> comme séparateur de valeurs recherchées,<br>- <b>!</b> pour exclure une valeur de la recherche : <br> Exemple : <b>jean;joe;jim%%;!jimo;!jima%</b> affichera tous les résultats <i>jean</i> et <i>joe</i>, ceux commençant par <i>jim</i> en excluant <i>jimo</i> et <i>jima</i>.
 AdvTgtSearchIntHelp=Utiliser un intervalle pour sélectionner un entier ou décimal
 AdvTgtMinVal=Valeur minimum
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 4d73b8e71bb..6fba224525e 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Paramètre %s non défini
 ErrorUnknown=Erreur inconnue
 ErrorSQL=Erreur SQL
 ErrorLogoFileNotFound=Le fichier logo '%s' n'a pas été trouvé
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToGlobalSetup=Allez dans la Configuration 'Société/Organisation' pour corriger
 ErrorGoToModuleSetup=Allez dans la Configuration du module pour corriger
 ErrorFailedToSendMail=Échec de l'envoi de l'email (émetteur=%s, destinataire=%s)
 ErrorFileNotUploaded=Le fichier n'a pas été transféré. Vérifiez que sa taille ne dépasse pas le maxium autorisé, que l'espace disque est disponible et qu'un fichier du même nom n'existe pas déjà.
@@ -70,6 +70,8 @@ SetDate=Définir date
 SelectDate=Sélectionnez une date
 SeeAlso=Voir aussi %s
 SeeHere=Voir ici
+ClickHere=Cliquer ici
+Here=Ici
 Apply=Appliquer
 BackgroundColorByDefault=Couleur de fond
 FileRenamed=Le fichier a été renommé avec succès
@@ -185,7 +187,7 @@ ToLink=Lier
 Select=Sélectionner
 Choose=Choisir
 Resize=Redimensionner
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=Redimensionner ou Recadrer
 Recenter=Recadrer
 Author=Auteur
 User=Utilisateur
@@ -326,10 +328,10 @@ Default=Défaut
 DefaultValue=Valeur par défaut
 DefaultValues=Valeurs par défaut
 Price=Prix
-PriceCurrency=Price (currency)
+PriceCurrency=Prix ​​(devise)
 UnitPrice=Prix unitaire
 UnitPriceHT=Prix unitaire HT
-UnitPriceHTCurrency=Unit price (net) (currency)
+UnitPriceHTCurrency=Prix ​​unitaire (HT) (devise)
 UnitPriceTTC=Prix unitaire TTC
 PriceU=P.U.
 PriceUHT=P.U. HT
@@ -337,7 +339,7 @@ PriceUHTCurrency=P.U. (devise)
 PriceUTTC=P.U TTC
 Amount=Montant
 AmountInvoice=Montant facture
-AmountInvoiced=Amount invoiced
+AmountInvoiced=Montant facturé
 AmountPayment=Montant paiement
 AmountHTShort=Montant HT
 AmountTTCShort=Montant TTC
@@ -357,7 +359,7 @@ AmountLT2ES=Montant IRPF
 AmountTotal=Montant total
 AmountAverage=Montant moyen
 PriceQtyMinHT=Prix quantité min. HT
-PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
+PriceQtyMinHTCurrency=Prix quantité min. (HT) (devise)
 Percentage=Pourcentage
 Total=Total
 SubTotal=Sous-total
@@ -394,8 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Taux TVA
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
+VATCode=Code Taux TVA
+VATNPR=TVA NPR
 DefaultTaxRate=Taux de taxe par défaut
 Average=Moyenne
 Sum=Somme
@@ -426,8 +428,8 @@ ActionRunningShort=En cours
 ActionDoneShort=Terminé
 ActionUncomplete=Incomplets
 LatestLinkedEvents=Les %s derniers événements liés
-CompanyFoundation=Company/Organization
-Accountant=Accountant
+CompanyFoundation=Société/Organisation
+Accountant=Comptable
 ContactsForCompany=Contacts de ce tiers
 ContactsAddressesForCompany=Contacts/adresses de ce tiers
 AddressesForCompany=Adresses de ce tiers
@@ -436,7 +438,7 @@ ActionsOnMember=Événements vis à vis de cet adhérent
 ActionsOnProduct=Événements liés au produit
 NActionsLate=%s en retard
 ToDo=À faire
-Completed=Completed
+Completed=Terminé
 Running=En cours
 RequestAlreadyDone=Requête déjà enregistrée
 Filter=Filtre
@@ -716,7 +718,7 @@ CoreErrorTitle=Erreur système
 CoreErrorMessage=Désolé, une erreur s'est produite. Contacter votre administrateur système pour vérifier les logs ou désactiver l'option $dolibarr_main_prod=1 pour obtenir plus d'information.
 CreditCard=Carte de crédit
 ValidatePayment=Valider ce règlement
-CreditOrDebitCard=Credit or debit card
+CreditOrDebitCard=Carte de crédit ou débit
 FieldsWithAreMandatory=Les champs marqués par un <b>%s</b> sont obligatoires
 FieldsWithIsForPublic=Les champs marqués par <b>%s</b> seront affichés sur la liste publique des membres. Si vous ne le souhaitez pas, décochez la case "public".
 AccordingToGeoIPDatabase=(obtenu par conversion GeoIP)
@@ -821,9 +823,8 @@ ConfirmMassDeletion=Confirmation de suppression en masse
 ConfirmMassDeletionQuestion=Êtes-vous sur de vouloir supprimer la(les) %s valeur(s) sélectionnée(s) ?
 RelatedObjects=Objets liés
 ClassifyBilled=Classer facturé
-ClassifyUnbilled=Classify unbilled
+ClassifyUnbilled=Classer non facturé
 Progress=Progression
-ClickHere=Cliquer ici
 FrontOffice=Front office
 BackOffice=Back office
 View=Vue
@@ -865,7 +866,7 @@ FileNotShared=Fichier non partagé en public
 Project=Projet
 Projects=Projets
 Rights=Permissions
-LineNb=Line nb
+LineNb=No ligne
 IncotermLabel=Incoterms
 # Week day
 Monday=Lundi
@@ -932,11 +933,13 @@ CommentDeleted=Commentaire supprimé
 Everybody=Tout le monde
 PayedBy=Payé par
 PayedTo=Payé à
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
+Monthly=Mensuel
+Quarterly=Trimestriel
+Annual=Annuel
 Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
-AssignedTo=Affecté à
+Remote=Distant
+LocalAndRemote=Local et distant
+KeyboardShortcut=Raccourci clavier
+AssignedTo=Assigné à
+Deletedraft=Supprimer brouillon
+ConfirmMassDraftDeletion=Confirmation de suppression brouillons en masse
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index 5663553f4d6..6120e57cacd 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Le taux doit être une valeure numérique
 markRateShouldBeLesserThan100=Le taux de marque doit être inférieur à 100
 ShowMarginInfos=Afficher les infos de marges
 CheckMargins=Détails des marges
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=Le rapport de la marge par utilisateur utilise le lien entre les tiers et les représentants commerciaux pour calculer la marge de chaque représentant. Étant donné que certains tiers peuvent ne pas avoir de représentant de vente dédié et que certaines tiers peuvent être liés à plusieurs, certains montants peuvent ne pas être inclus dans ce rapport (s'il n'y a pas de commercial), certains peuvent apparaître sur des lignes différentes (pour chaque commercial).
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 47e399f1d06..247aaaaa36a 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -114,21 +114,21 @@ SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscription
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
+YourMembershipRequestWasReceived=Votre demande d'adhésion a été reçue.
+YourMembershipWasValidated=Votre adhésion a été enregistrée
 YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=You membership was canceled
+SubscriptionReminderEmail=Rappel de cotisation
+YourMembershipWasCanceled=Your membership was canceled
 CardContent=Contenu de votre fiche adhérent
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipRequestWasReceived=Nous vous informons que votre demande d'adhésion a bien été reçue. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
+ThisIsContentOfYourCard=Ceci est un rappel des informations que nous avons vos concernant. N'hésitez pas à nous contacter en cas d'erreur.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet de l'email reçu en cas d'auto-inscription d'un invité
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email reçu en cas d'auto-inscription d'un invité
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modèle Email à utiliser pour envoyer un email à un adhérent sur auto-adhésion de l'adhérent
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
@@ -191,8 +191,8 @@ NoVatOnSubscription=Pas de TVA sur les adhésions
 MEMBER_PAYONLINE_SENDEMAIL=E-mail pour avertir des confirmations de validation d'un règlement d'une adhésion (exemple : paiementrecu@exemple.fr)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit/Service utilisé pour la ligne de cotisation dans la facture: %s
 NameOrCompany=Nom ou société
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
+SubscriptionRecorded=Adhésion enregistré
+NoEmailSentToMember=Aucun e-mail envoyé à l'adhérent
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
 SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 43315ae45d6..6b6ff9b4248 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -81,7 +81,7 @@ SearchAllDesc=Le champ doit-il être utilisé pour effectuer une recherche à pa
 SpecDefDesc=Entrez ici toute la documentation que vous souhaitez joindre au module et qui n'a pas encore été définis dans d'autres onglets. Vous pouvez utiliser .md ou, mieux, la syntaxe enrichie .asciidoc.
 LanguageDefDesc=Entrez dans ces fichiers, toutes les clés et la traduction pour chaque fichier de langue.
 MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+PermissionsDefDesc=Définissez ici les nouvelles permissions fournies par votre module (une fois définies, elles sont visibles dans la configuration des permissions %s)
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Définissez dans le fichier trigger le code que vous souhaitez exécuter pour chaque événement métier exécuté.
 SeeIDsInUse=Voir les IDs utilisés dans votre installation
@@ -90,7 +90,7 @@ ToolkitForDevelopers=Boîte à outils pour développeurs Dolibarr
 TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to use the native module builder wizard. Just enable the module and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu. Warning: This is a developer feature, bad use may breaks your application.
 SeeTopRightMenu=Voir<span class="fa fa-bug"></span> à droite de votre barre de menu principal
 AddLanguageFile=Ajouter le fichier de langue
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+YouCanUseTranslationKey=Vous pouvez utiliser ici une clé qui est la clé de traduction trouvée dans le fichier de langue (voir l'onglet "Langues")
 DropTableIfEmpty=(Supprimer la table si vide)
 TableDoesNotExists=La table %s n'existe pas
 TableDropped=La table %s a été supprimée
diff --git a/htdocs/langs/fr_FR/multicurrency.lang b/htdocs/langs/fr_FR/multicurrency.lang
index c833ae46bf9..3e4718a561e 100644
--- a/htdocs/langs/fr_FR/multicurrency.lang
+++ b/htdocs/langs/fr_FR/multicurrency.lang
@@ -7,7 +7,7 @@ multicurrency_syncronize_error=Erreur de synchronisation %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilisez la date du document pour trouver le taux de change, au lieu d'utiliser dernier taux connu
 multicurrency_useOriginTx=Quand un objet est créé à partir d'un autre, garder le taux original de l'objet source (sinon utiliser le dernier taux connu)
 CurrencyLayerAccount=API CurrencyLayer
-CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br>If you use a free account you can't change the <b>currency source</b> (USD by default)<br>But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br><br>You are limited at 1000 synchronizations per month
+CurrencyLayerAccount_help_to_synchronize=Vous devez créer un compte sur leur site web pour pouvoir utiliser cette fonctionnalité.<br />Obtenez votre <b>Clé API</b><br />Si vous utilisez un compte gratuit, vous ne pouvez pas changer la <b>devise source</b>(USD par défaut)<br />Mais si votre devise principale n'est pas USD, vous pouvez utiliser une <b>devise source alternative</b> pour forcer votre devise principale<br /><br /> Vous êtes limité à 1000 synchronisations par mois.
 multicurrency_appId=Clé API
 multicurrency_appCurrencySource=Devise source
 multicurrency_alternateCurrencySource=Devise du document source
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index f833fa3b64c..e36977947d2 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -152,7 +152,7 @@ OrderCreated=Vos commandes ont été générées
 OrderFail=Une erreur s'est produite pendant la création de vos commandes
 CreateOrders=Créer commandes
 ToBillSeveralOrderSelectCustomer=Pour créer une facture pour plusieurs commandes, cliquez d'abord sur le client, puis choisir "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=L'option (issue du module Workflow) pour définir automatiquement les commandes à 'Facturé' que une facture est validée, est désactivée, aussi vous devrez donc définir le statut de la commande sur 'Facturé' manuellement.
 IfValidateInvoiceIsNoOrderStayUnbilled=Si la validation de facture est à "Non", la commande restera au statut "Non facturé" jusqu'à ce que la facture soit validée.
 CloseReceivedSupplierOrdersAutomatically=Fermer la commande "%s" automatiquement si tous les produits ont été reçus.
 SetShippingMode=Définir la méthode d'expédition
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index d34ca3c3498..b39175a16c3 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Déconnecté. Aller à la page de connexion ...
 MessageForm=Message sur l'écran de paiement en ligne
 MessageOK=Message sur page de retour de paiement validé
 MessageKO=Message sur page de retour de paiement annulé
+ContentOfDirectoryIsNotEmpty=Le contenu de ce répertoire n'est pas vide.
+DeleteAlsoContentRecursively=Cochez pour supprimer tout le contenu de manière récursive
 
 YearOfInvoice=Année de la date de facturation
 PreviousYearOfInvoice=Année précédente de la date de facturation
@@ -78,8 +80,8 @@ LinkedObject=Objet lié
 NbOfActiveNotifications=Nombre de notifications (nb de destinataires emails)
 PredefinedMailTest=__(Hello)__,\nCeci est un mail de test envoyé à __EMAIL__.\nLes deux lignes sont séparées par un saut de ligne.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nCeci est un message de <b>test</b> (le mot test doit être en gras).<br>Les 2 lignes sont séparées par un retour à la ligne.<br><br>__SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nVeuillez trouver, ci-joint, la facture __REF__\n\nVoici le lien pour un paiement en ligne au cas ou celle-ci n'aurait pas encore été payé:\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNous voulons porter à votre connaissance le fait que la facture __REF__ semble non payée. Aussi, voici la facture à nouveau en pièce jointe pour rappel.\n\nVoici le lien pour un paiement en ligne:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nVous trouverez ci-joint la facture __REF__\n\nVoici le lien pour effectuer votre paiement en ligne si elle n'est pas déjà été payée:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNous souhaitons vous prévenir que la facture __REF__ ne semble pas avoir été payée. Voici donc la facture en pièce jointe, à titre de rappel.\n\nVoici le lien pour effectuer votre paiement en ligne:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nVeuillez trouver, ci-joint, la proposition commerciale __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nVeuillez trouver, ci-joint, une demande de prix avec la référence __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nVeuillez trouver, ci-joint, la commande __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -162,7 +164,7 @@ SizeUnitinch=pouce
 SizeUnitfoot=pied
 SizeUnitpoint=point
 BugTracker=Suivi de tickets
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+SendNewPasswordDesc=Ce formulaire permet de faire une demande pour un nouveau mot de passe. Elle sera envoyée à votre adresse email.<br>La modification du mot de passe ne sera effective qu'après avoir cliqué sur le lien de confirmation dans cet email.<br>Surveillez votre messagerie.
 BackToLoginPage=Retour page de connexion
 AuthenticationDoesNotAllowSendNewPassword=Le mode d'authentification de Dolibarr est configuré à "<b>%s</b>".<br>Dans ce mode, Dolibarr n'a pas la possibilité de connaître ni de modifier votre mot de passe.<br>Contactez votre administrateur pour connaitre les modalités de changement.
 EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre PHP pour pouvoir activer cette option.
@@ -214,6 +216,7 @@ StartUpload=Transférer
 CancelUpload=Annuler le transfert
 FileIsTooBig=Le fichier est trop volumineux
 PleaseBePatient=Merci de patienter quelques instants…
+NewPassword=Nouveau mot de passe
 ResetPassword=Réinitialiser le mot de passe
 RequestToResetPasswordReceived=Une demande de modification de mot de passe a été reçue
 NewKeyIs=Voici vos nouveaux identifiants pour vous connecter
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL de la page
 WEBSITE_TITLE=Titre
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Mots clés
+LinesToImport=Lignes à importer
diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang
index dded657e3d6..bfb9f49b49b 100644
--- a/htdocs/langs/fr_FR/paypal.lang
+++ b/htdocs/langs/fr_FR/paypal.lang
@@ -30,6 +30,6 @@ ErrorCode=Code erreur
 ErrorSeverityCode=Code d'erreur sévérité
 OnlinePaymentSystem=Système de paiement en ligne
 PaypalLiveEnabled=Paypal live activé (sinon mode test/bac à sable)
-PaypalImportPayment=Import Paypal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+PaypalImportPayment=Importer paiements Paypal
+PostActionAfterPayment=Actions complémentaires après paiement
+ARollbackWasPerformedOnPostActions=Une annulation a été effectuée sur toutes les actions Post paiement. Vous devez compléter les actions complémentaires manuellement si elles sont nécessaires.
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index ee33f184c92..78cc8cead40 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -27,7 +27,7 @@ ProductAccountancySellExportCode=Code comptable (vente à l'export)
 ProductOrService=Produit ou Service
 ProductsAndServices=Produits et Services
 ProductsOrServices=Produits ou Services
-ProductsPipeServices=Products | Services
+ProductsPipeServices=Produits | Services
 ProductsOnSaleOnly=Uniquement produits en vente
 ProductsOnPurchaseOnly=Produits seulement en achat
 ProductsNotOnSell=Produits hors vente et hors achat
@@ -123,7 +123,7 @@ ConfirmDeleteProductLine=Êtes-vous sûr de vouloir effacer cette ligne produit
 ProductSpecial=Special
 QtyMin=Quantité minimum
 PriceQtyMin=Prix quantité min. (sans remise)
-PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
+PriceQtyMinCurrency=Prix ​​pour cette quantité min. (sans remise) (devise)
 VATRateForSupplierProduct=Taux TVA (pour ce produit/fournisseur)
 DiscountQtyMin=Remise par défaut quantité min.
 NoPriceDefinedForThisSupplier=Aucun prix/qté défini pour ce fournisseur/produit
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 7884e4eb696..986bf806d70 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Contacts projet
 ProjectsImContactFor=Projets dont je suis un contact explicite
 AllAllowedProjects=Tout projet que je peux lire (les miens + public)
 AllProjects=Tous les projets
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=Cette vue est limitée aux projets pour lesquels vous êtres un contact affecté
 ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
 TasksOnProjectsPublicDesc=Cette vue affiche toutes les tâches de projets selon vos permissions utilisateur
 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).
 TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos permissions d'utilisateur vous accordent la permission de voir tout).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=Cette vue est restreinte aux projets ou tâches pour lesquels vous êtes un contact affecté.
 OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
 ClosedProjectsAreHidden=Les projets fermés ne sont pas visible.
 TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
@@ -55,7 +55,7 @@ TasksOnOpenedProject=Tâches sur les projets ouverts
 WorkloadNotDefined=Charge de travail non définie
 NewTimeSpent=Temps consommés
 MyTimeSpent=Mon consommé
-BillTime=Bill the time spent
+BillTime=Facturer le temps passé
 Tasks=Tâches
 Task=Tâche
 TaskDateStart=Date de début de tâche
@@ -92,7 +92,7 @@ ListDonationsAssociatedProject=Liste des dons associés au projet
 ListVariousPaymentsAssociatedProject=Liste des frais divers liés au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
 ListTaskTimeUserProject=Liste du temps consommé sur les tâches d'un projet
-ListTaskTimeForTask=List of time consumed on task
+ListTaskTimeForTask=Liste du temps consommé sur les tâches
 ActivityOnProjectToday=Activité projet aujourd'hui
 ActivityOnProjectYesterday=Activité projet hier
 ActivityOnProjectThisWeek=Activité sur les projets cette semaine
@@ -100,7 +100,7 @@ ActivityOnProjectThisMonth=Activité sur les projets ce mois
 ActivityOnProjectThisYear=Activité sur les projets cette année
 ChildOfProjectTask=Fille du projet/tâche
 ChildOfTask=Enfant de la tâche
-TaskHasChild=Task has child
+TaskHasChild=La tâche a des fils
 NotOwnerOfProject=Non responsable de ce projet privé
 AffectedTo=Affecté à
 CantRemoveProject=Ce projet ne peut être supprimé car il est référencé par de nombreux objets (factures, commandes ou autre). voir la liste sur l'onglet Reférents.
@@ -140,7 +140,7 @@ ProjectReportDate=Reporter les dates des tâches en fonction de la date de dépa
 ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
 ProjectsAndTasksLines=Projets et tâches
 ProjectCreatedInDolibarr=Projet %s créé
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=Projet %s validé
 ProjectModifiedInDolibarr=Projet %s modifié
 TaskCreatedInDolibarr=Tâche %s créée
 TaskModifiedInDolibarr=Tâche %s modifiée
@@ -215,14 +215,15 @@ OppStatusPENDING=En attente
 OppStatusWON=Gagné
 OppStatusLOST=Perdu
 Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values :</u><br>- Keep empty: Can link any project of the company (default)<br>- "all" : Can link any projects, even project of other companies<br>- A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Permettre de lier un projet à une autre société <br> <br> <u> Valeurs supportées: </u> <br> - Conserver vide: Peut lier à n'importe quel projet de l'entreprise (défaut) <br> - "all": Peut lier à tous les projets, même le projet d'autres sociétés <br> - Une liste de tiers ID séparés par des virgules: Peut lier à tous les projets de ces tiers définis (Exemple: 123,4795,53) <br>
 LatestProjects=Les %s derniers projets
 LatestModifiedProjects=Les %s derniers projets modifiés
 OtherFilteredTasks=Autres tâches filtrées
-NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
+NoAssignedTasks=Aucune tâche assignée (assignez un projet/tâche depuis la liste déroulante utilisateur en haut pour pouvoir saisir du temps dessus)
 # Comments trans
 AllowCommentOnTask=Autoriser les utilisateurs à ajouter des commentaires sur les tâches
 AllowCommentOnProject=Autoriser les commentaires utilisateur sur les projets
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
+DontHavePermissionForCloseProject=Vous n'êtes pas autorisé à fermer le projet %s
+DontHaveTheValidateStatus=Le projet %s doit être ouvert pour être fermé
+RecordsClosed=%s projet(s) fermé(s)
+SendProjectRef=A propos du projet %s
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 3c7fe6f6584..065e6e28af1 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Édition entrepôt
 MenuNewWarehouse=Nouvel entrepôt
 WarehouseSource=Entrepôt source
 WarehouseSourceNotDefined=Aucun entrepôt défini,
+AddWarehouse=Créer entrepôt
 AddOne=En ajouter un
+DefaultWarehouse=Entrepôt par défaut
 WarehouseTarget=Entrepôt destination
 ValidateSending=Valider expédition
 CancelSending=Annuler expédition
@@ -22,6 +24,7 @@ Movements=Mouvements
 ErrorWarehouseRefRequired=Le nom de référence de l'entrepôt est obligatoire
 ListOfWarehouses=Liste des entrepôts
 ListOfStockMovements=Liste des mouvements de stock
+ListOfInventories=Liste des inventaires
 MovementId=Id du mouvement
 StockMovementForId=ID mouvement %d
 ListMouvementStockProject=Liste des mouvements de stocks associés au projet
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index 537ce42a4f3..24991a94246 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -44,11 +44,12 @@ StripeLiveEnabled=Mode live activé (sinon mode test/bac a sable)
 StripeImportPayment=Import Stripe payments
 ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
 StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_TEST_ID=Stripe Connect ID client (ca _...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect ID client (ca _...)
 BankAccountForBankTransfer=Bank account for fund payouts
 StripeAccount=Stripe account
 StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
 StripeCustomerId=Stripe customer id
 StripePaymentModes=Stripe payment modes
 LocalID=Local ID
diff --git a/htdocs/langs/fr_FR/ticketsup.lang b/htdocs/langs/fr_FR/ticketsup.lang
index f8edb3e2dd4..c53b53bd759 100644
--- a/htdocs/langs/fr_FR/ticketsup.lang
+++ b/htdocs/langs/fr_FR/ticketsup.lang
@@ -18,11 +18,11 @@
 # Generic
 #
 
-Module56000Name=Billets
+Module56000Name=Gestionnaire de tickets
 Module56000Desc=Système de ticket pour de l'assistance ou une demande d'accompagnement
 
 Permission56001=Voir tickets
-Permission56002=Modifier des billets
+Permission56002=Modifier des tickets
 Permission56003=Supprimer tickets
 Permission56004=Gérer les tickets
 Permission56005=See tickets of all third parties (not effective for external users, always be limited to the thirdparty they depend on)
@@ -42,16 +42,17 @@ TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Élevé
 TicketSeverityShortBLOCKING=Critique/Bloquant
 
-ErrorBadEmailAddress=Field '%s' incorrect
+ErrorBadEmailAddress=Champ '%s' incorrect
 MenuTicketsupMyAssign=Mes tickets
-MenuTicketsupMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+MenuTicketsupMyAssignNonClosed=Mes tickets ouverts
+MenuListNonClosed=Tickets ouverts
 
 TypeContact_ticketsup_internal_CONTRIBUTOR=Contributeur
 TypeContact_ticketsup_internal_SUPPORTTEC=Utilisateur assigné
 TypeContact_ticketsup_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticketsup_external_CONTRIBUTOR=External contributor
+TypeContact_ticketsup_external_CONTRIBUTOR=Contributeur externe
 
+OriginEmail=Email source
 Notify_TICKETMESSAGE_SENTBYMAIL=Envoyée la réponse par email
 
 # Status
@@ -81,10 +82,10 @@ TicketsupSetupPage=
 TicketsupPublicAccess=A public interface requiring no identification is available at the following url
 TicketsupSetupDictionaries=The type of application categories and severity level are configurable from dictionaries
 TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
+TicketParamMail=Configuration de la messagerie
+TicketEmailNotificationFrom=Email from de notification
 TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationTo=Email de notification à
 TicketEmailNotificationToHelp=Send email notifications to this address.
 TicketNewEmailBodyLabel=Text message sent after creating a ticket (public interface)
 TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
@@ -98,10 +99,10 @@ TicketPublicInterfaceTextHomeLabelAdmin=Texte de bienvenu dans l'interface publi
 TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
 TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
 TicketPublicInterfaceTopicLabelAdmin=Titre de l'interface
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTopicHelp=Ce texte apparaîtra comme titre sur l'interface publique.
 TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
 TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicketSup=Extra attributes
+ExtraFieldsTicketSup=Attributs complémentaires
 TicketSupCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL contant equal to 1
 TicketsDisableEmail=Do not send ticket creation or message send emails
 TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
@@ -114,8 +115,6 @@ TicketsShowCompanyLogo=Afficher le logo de la société dans l'interface publiqu
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
 TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
 TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
-TicketsShowExtrafieldsIntoPublicArea=Show Extras fields in the public interface
-TicketsShowExtrafieldsIntoPublicAreaHelp=When this option is enabled, additional attributes defined on the tickets will be shown in the public interface of ticket creation.
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the thirdparty they depend on)
 TicketsLimitViewAssignedOnlyHelp=Seuls les tickets affectés à l'utilisateur actuel seront visibles. Ne s'applique pas à un utilisateur disposant de droits de gestion des tickets.
 TicketsActivatePublicInterface=Activer l'interface publique
@@ -123,13 +122,11 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketSupNumberingModules=Tickets numbering module
-TicketNotifyTiersAtCreation=Notify thirdparty at creation
+TicketNotifyTiersAtCreation=Notifier le tiers à la création
 
 #
 # About page
 #
-About=À propos
-TicketSupAbout=À propos du module Ticket
 TicketSupAboutModule=The development of this module has been initiated by the company Libr&thic.
 TicketSupAboutModuleHelp=You can get help by using the contact form on the website <a href="http://librethic.io">librethic.io</a>
 TicketSupAboutModuleImprove=Feel free to suggest improvements! Please visit <a href="https://code.librethic.io/Dolibarr/modules/ticketsup">the project page</a> on Doliforge website to report bugs and add tasks.
@@ -144,16 +141,16 @@ TicketAssignedToMeInfos=Cette page présente la liste des tickets assignés à l
 NoTicketsFound=Aucun ticket trouvé
 TicketViewAllTickets=Voir tous les tickets
 TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
+TicketStatByStatus=Tickets par statut
 
 #
 # Ticket card
 #
-Ticketsup=Incident ticket
+Ticketsup=Ticket
 TicketCard=Ticket card
-CreateTicket=Créez un nouveau billet
-EditTicket=Modifier un billet
-TicketsManagement=Gestion de billets
+CreateTicket=Créer nouveau ticket
+EditTicket=Modifier ticket
+TicketsManagement=Gestion de tickets
 CreatedBy=Créé par
 NewTicket=Nouveau ticket
 SubjectAnswerToTicket=Réponse ticket
@@ -161,12 +158,12 @@ TicketTypeRequest=Request type
 TicketCategory=Catégorie
 SeeTicket=Voir le ticket
 TicketMarkedAsRead=Le ticket a été marqué comme lu
-TicketReadOn=Read on
+TicketReadOn=Lu
 TicketCloseOn=Fermé le
 MarkAsRead=Mark ticket as read
-TicketMarkedAsReadButLogActionNotSaved=Ticket marked as closed but no action saved
-TicketHistory=Historique de billets
-AssignUser=Assign to user
+TicketMarkedAsReadButLogActionNotSaved=Ticket marqué comme Clos mais aucune action enregistrée
+TicketHistory=Historique des tickets
+AssignUser=Assigner à l'utilisateur
 TicketAssigned=Le ticket est à présent assigné
 TicketChangeType=Change type
 TicketChangeCategory=Changer la catégorie
@@ -185,7 +182,7 @@ ShowTicket=Voir le ticket
 RelatedTickets=Tickets liés
 TicketAddIntervention=Créer intervention
 CloseTicket=Fermer le ticket
-CloseATicket=Fermer un billet
+CloseATicket=Fermer un ticket
 ConfirmCloseAticket=Confirmer la fermeture du ticket
 ConfirmDeleteTicket=Confirmez la suppression du ticket
 TicketDeletedSuccess=Ticket supprimé avec succès
@@ -196,7 +193,7 @@ TicketDurationAutoInfos=Duration calculated automatically from intervention rela
 TicketUpdated=Ticket mis à jour
 SendMessageByEmail=Envoyer ce message par email
 TicketNewMessage=Nouveau message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+ErrorMailRecipientIsEmptyForSendTicketMessage=Le destinataire est vide. Aucun e-mail envoyé
 TicketGoIntoContactTab=Please go into "Contacts" tab to select them
 TicketMessageMailIntro=Introduction
 TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
@@ -205,17 +202,17 @@ TicketMessageMailIntroText=<p> Bonjour </ p> Une nouvelle réponse a été ajout
 TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
 TicketMessageMailSignature=Signature
 TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Cordialement,</p><p>--</p>
+TicketMessageMailSignatureText=<p> Cordialement, </p> <p> -- </p>
 TicketMessageMailSignatureLabelAdmin=Signature of response email
 TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
 TicketMessageHelp=Only this text will be saved in the message list on ticket card.
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TicketTimeToRead=Time elapsed before ticket read
+TicketTimeToRead=Temps écoulé avant la lecture du ticket
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents liés
 ConfirmReOpenTicket=Voulez-vous ré-ouvrir ce ticket ?
 TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s :
-TicketAssignedToYou=Ticket assigned
+TicketAssignedToYou=Ticket attribué
 TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
 MarkMessageAsPrivate=Mark message as private
 TicketMessagePrivateHelp=This message will not display to external users
@@ -223,19 +220,19 @@ TicketEmailOriginIssuer=Issuer at origin of the tickets
 InitialMessage=Message initial
 LinkToAContract=Link to a contract
 TicketSupPleaseSelectAContract=Sélectionner un contrat
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party are defined
+UnableToCreateInterIfNoSocid=Impossible de créer une intervention si aucun tiers n'est défini
 TicketMailExchanges=Mail exchanges
 TicketInitialMessageModified=Message initial modifié
 TicketMessageSuccesfullyUpdated=Message successfully updated
 TicketChangeStatus=Changer l'état
 TicketConfirmChangeStatus=Confirm the status change : %s ?
 TicketLogStatusChanged=Status changed : %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
+TicketNotNotifyTiersAtCreate=Ne pas notifier l'entreprise à la création
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket read by %s
+TicketLogMesgReadBy=Ticket lu par %s
 NoLogForThisTicket=No log for this ticket yet
 TicketLogAssignedTo=Ticket assigned to %s
 TicketAssignedButLogActionNotSaved=Ticket assigned but no log saved !
@@ -248,19 +245,19 @@ TicketLogReopen=Ticket ré-ouvert
 # Public pages
 #
 TicketSystem=Gestionnaire de tickets
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
+ShowListTicketWithTrackId=Afficher la liste des tickets à partir de l'ID de suivi
+ShowTicketWithTrackId=Afficher le ticket à partir de l'ID de suivi
 TicketPublicDesc=You can create a support ticket or check from an existing ID.
-YourTicketSuccessfullySaved=Le billet a été enregistré avec succès
+YourTicketSuccessfullySaved=Le ticket a été enregistré avec succès
 MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s.
 PleaseRememberThisId=Merci de conserver le code de suivi du ticket, il vous sera peut-être nécessaire ultérieurement
 TicketNewEmailSubject=Ticket creation confirmation
-TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailSubjectCustomer=Nouveau ticket
 TicketNewEmailBody=Ceci est un message automatique pour confirmer l'enregistrement de votre ticket.
 TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
 TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number : %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackId=Numéro de suivi du ticket : %s
+TicketNewEmailBodyInfosTrackUrl=Vous pouvez voir la progression du ticket en cliquant sur le lien ci-dessus.
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Merci de ne pas répondre directement à ce courriel ! Utilisez le lien pour répondre via l'interface.
 TicketPublicInfoCreateTicket=This form allows you to record a trouble ticket in our management system.
@@ -268,7 +265,7 @@ TicketPublicPleaseBeAccuratelyDescribe=Veuillez décrire avec précision le prob
 TicketPublicMsgViewLogIn=Merci d'entrer le code de suivi du ticket
 TicketTrackId=Tracking ID
 OneOfTicketTrackId=One of yours tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found !
+ErrorTicketNotFound=Ticket avec numéro de suivi %s non trouvé!
 Subject=Sujet
 ViewTicket=Voir le ticket
 ViewMyTicketList=Voir la liste de mes tickets
@@ -279,7 +276,7 @@ SeeThisTicketIntomanagementInterface=See ticket in management interface
 TicketPublicInterfaceForbidden=Accès à cette partie : interdit
 
 # notifications
-TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailSubject=Ticket %s mis à jour
 TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
 TicketNotificationRecipient=Notification recipient
 TicketNotificationLogMessage=Log message
@@ -290,7 +287,7 @@ TicketNotificationNumberEmailSent=Email de notification envoyé: %s
 #
 # Boxes
 #
-BoxLastTicketsup=Latest created tickets
+BoxLastTicketsup=Derniers tickets créés
 BoxLastTicketsupDescription=Latest %s created tickets
 BoxLastTicketsupContent=
 BoxLastTicketsupNoRecordedTickets=Pas de ticket non lu
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 909aee4ec55..92d6f44dd8d 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Afficher la note de frais
 NewTrip=Nouvelle note de frais
 LastExpenseReports=Les %s dernières notes de frais
 AllExpenseReports=Toutes les notes de frais
-CompanyVisited=Company/organization visited
+CompanyVisited=Société/organisation visitée
 FeesKilometersOrAmout=Montant ou kilomètres
 DeleteTrip=Supprimer les notes de frais / déplacements
 ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer cette note de frais ?
@@ -21,17 +21,17 @@ ListToApprove=En attente d'approbation
 ExpensesArea=Espace notes 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.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForApprovalMessage=Une nouvelle note de frais a été soumis et attend d'être approuvé. <br> - Utilisateur: %s <br> - Période: %s <br> Cliquez ici pour valider: %s
 ExpenseReportWaitingForReApproval=Une note de frais a été resoumise pour approbation
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=Une note de frais a été enregistrée et est en attente à nouveau d'approbation.<br>Le %s, vous avez refusé d'approuver la note de frais pour la raison suivante: %s<br>Une nouvelle version a été soumise et attend d'être approuvé.<br> Utilisateur : %s<br>- Période : %s<br>Cliquez ici pour valider la note de frais %s
 ExpenseReportApproved=Une note de frais a été approuvée
-ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportApprovedMessage=La note de frais %s a été approuvée.<br>- Utilisateur : %s<br>- Approuvée par : %s<br>Cliquez ici pour afficher la note de frais %s
 ExpenseReportRefused=Une note de frais a été refusée
-ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportRefusedMessage=La note de frais %s a été refusée.<br>- Utilisateur : %s<br>- Refusée par : %s<br>- Motif du refus : %s<br>Cliquez ici pour afficher la note de frais: %s
 ExpenseReportCanceled=Une note de frais a été annulée
-ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceledMessage=La note de frais %s a été annulée.<br>- Utilisateur : %s<br>- Annulée par : %s<br>- Motif de l'annulation :%s<br>Cliquez ici pour afficher la note de frais %s
 ExpenseReportPaid=Une note de frais a été réglée
-ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+ExpenseReportPaidMessage=La note de frais %s a été réglée.<br>- Utilisateur : %s<br>- Réglée par : %s<br>Cliquez ici pour afficher la note de frais %s
 TripId=Id note de frais
 AnyOtherInThisListCanValidate=Personne à informer pour la validation.
 TripSociete=Information société
@@ -74,7 +74,7 @@ EX_CAM_VP=Entretien et réparation
 DefaultCategoryCar=Mode de déplacement par défaut
 DefaultRangeNumber=Numéro de plage par défaut
 
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+Error_EXPENSEREPORT_ADDON_NotDefined=Erreur, la règle pour la numérotation des notes de frais n'a pas été définie dans la configuration du module 'Notes de Frais'
 ErrorDoubleDeclaration=Vous avez déclaré une autre note de frais dans une période similaire.
 AucuneLigne=Aucune note de frais déclarée
 
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 18fe319ee95..e0f461cd196 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -69,8 +69,8 @@ InternalUser=Utilisateur interne
 ExportDataset_user_1=Utilisateurs Dolibarr et attributs
 DomainUser=Utilisateur du domaine %s
 Reactivate=Réactiver
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=Ce formulaire permet de créer un utilisateur interne à votre société/institution. Pour créer un utilisateur externe (client, fournisseur, ...), utilisez le bouton 'Créer compte utilisateur' qui se trouve sur la fiche du contact du tiers.
+InternalExternalDesc=Un utilisateur <b>interne</b> est un utilisateur qui fait partie de votre société/institution.<br>Un utilisateur <b>externe</b> est un compte utilisateur pour une client, fournisseur ou autre. <br><br>Dans les deux cas, les permissions déterminent les accès aux fonctionnalités de Dolibarr. De plus, les utilisateurs externes peuvent avoir un gestionnaire de menu différent des utilisateurs internes (Voir Accueil > configuration > Affichage)
 PermissionInheritedFromAGroup=La permission est accordée car héritée d'un groupe auquel appartient l'utilisateur.
 Inherited=Hérité
 UserWillBeInternalUser=L'utilisateur créé sera un utilisateur interne (car non lié à un tiers en particulier)
@@ -93,7 +93,7 @@ NameToCreate=Nom du tiers à créer
 YourRole=Vos rôles
 YourQuotaOfUsersIsReached=Votre quota d'utilisateurs actifs est atteint !
 NbOfUsers=Nombre d'utilisateurs
-NbOfPermissions=Nb of permissions
+NbOfPermissions=Nb d'autorisations
 DontDowngradeSuperAdmin=Seul un superadministrateur peut rétrograder un superadministrateur
 HierarchicalResponsible=Responsable hiérarchique
 HierarchicView=Vue hiérarchique
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 6c69896c70d..cdcf638b84a 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Créer ici autant d'entrée que de nombre différents de sites
 DeleteWebsite=Effacer site web
 ConfirmDeleteWebsite=Êtes-vous sûr de vouloir supprimer ce site web. Toutes les pages et le contenu seront également supprimés.
 WEBSITE_TYPE_CONTAINER=Type de page / conteneur
+WEBSITE_PAGE_EXAMPLE=Page Web à utiliser comme exemple
 WEBSITE_PAGENAME=Nom/alias de la page
+WEBSITE_ALIASALT=Noms de page / alias alternatifs
 WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe
 WEBSITE_CSS_INLINE=Contenu du fichier CSS (commun à toute les pages)
 WEBSITE_JS_INLINE=Contenu du fichier Javascript (commun à toutes les pages)
@@ -34,20 +36,24 @@ ViewPageInNewTab=Pré-visualiser la page dans un nouvel onglet
 SetAsHomePage=Définir comme page d'accueil
 RealURL=URL réelle
 ViewWebsiteInProduction=Pré-visualiser le site web en utilisant l'URL de la page d'accueil
-SetHereVirtualHost=Si vous pouvez créer, sur votre serveur web (Apache, Nginx, ...), un hôte virtuel dédié avec PHP activé et un répertoire racine sur <strong> %s </strong> <br>, alors entrez ici le nom de cet hôte virtuel que vous avez créé, de sorte que l'aperçu puisse également être fait en utilisant l'accès direct au serveur Web, et non seulement en utilisant le serveur Dolibarr.
-PreviewSiteServedByWebServer=Prévisualiser %s dans un nouvel onglet.<br><br>. Le %s sera servi par un serveur web externe ( comme Apache, Nginx, IIS ). Vous pouvez installer et configurer ce serveur avant de pointer sur le répertoire : <br><strong>%s</strong><br> URL servie par un serveur externe: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Aperçu %s dans un nouvel onglet.<br><br>Le %s sera servi par le serveur Dolibarr donc aucun serveur Web supplémentaire (comme Apache, Nginx, IIS) n'est nécessaire.<br>L'inconvénient est que l'URL des pages ne sont pas sexy et commencent par un chemin de votre Dolibarr.<br>URL servie par Dolibarr:<br><strong>%s</strong><br><br>Pour utiliser votre propre serveur web externe pour servir ce site web, créez un virtual host sur vote serveur web qui pointe sur le répertoire<br><strong>%s</strong><br> ensuite entrez le nom de ce virtual host et cliquer sur le bouton d'affichage de l'aperçu.
+SetHereVirtualHost=Si vous pouvez créer, sur votre serveur web (Apache, Nginx, ...), un hôte virtuel dédié avec PHP activé et un répertoire racine sur <br> <strong> %s </strong><br> , alors entrez ici le nom de cet hôte virtuel que vous avez créé, de sorte que l'aperçu puisse également être fait en utilisant l'accès direct au serveur Web, et non seulement en utilisant le serveur Dolibarr.
+YouCanAlsoTestWithPHPS=Sur un environnement de développement, vous pouvez préférer tester le site avec le serveur web PHP intégré (PHP 5.5 requis) en exécutant <br><strong> php -S 0.0.0.0:8080 -t %s </strong>
+CheckVirtualHostPerms=Vérifiez également que le virtual host a la permission <strong> %s </strong> sur les fichiers dans <strong> %s </strong>
+ReadPerm=Lu
+WritePerm=Écrire
+PreviewSiteServedByWebServer=<u>Prévisualiser %s dans un nouvel onglet.</u><br><br>. Le %s sera servi par un serveur web externe (comme Apache, Nginx, IIS). Vous pouvez installer et configurer ce serveur auparavant pour pointer sur le répertoire : <br><strong>%s</strong><br> URL servie par un serveur externe: <br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par le serveur Dolibarr donc aucun serveur Web supplémentaire (comme Apache, Nginx, IIS) n'est nécessaire.<br>L'inconvénient est que l'URL des pages ne sont pas sexy et commencent par un chemin de votre Dolibarr.<br>URL servie par Dolibarr:<br><strong>%s</strong><br><br>Pour utiliser votre propre serveur web externe pour servir ce site web, créez un virtual host sur vote serveur web qui pointe sur le répertoire<br><strong>%s</strong><br> ensuite entrez le nom de ce virtual host et cliquer sur le bouton d'affichage de l'aperçu.
 VirtualHostUrlNotDefined=URL du virtual host servit par le serveur web externe non défini
 NoPageYet=Pas de page pour l'instant
 SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe 
 YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source".
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span>Vous pouvez inclure du code PHP dans le source en utilisant le tags <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span>Vous pouvez aussi inclure le contenu d'une autre page/containeur avec la syntaxe suivante:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span>Vous pouvez faire une redirection sur une autre Page/Containeur avec la syntax: <br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span>Pour inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire documents/ecm (besoin d'être loggué), la syntaxe est:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier dans documents/mdedias (répertoire ouvert au publique), la syntaxe est:<br><strong>, &lt;a href="/document.php?modulepart=medias&file=[relative_dir]/filename.ext"&gt;.</strong><br>Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage du fichier), la syntaxe est:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span>Pour inclure une <strong>image</strong>stockée dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>viewimage.php</strong>: Example, pour une image dans documents/medias (accès ouvert), la syntax est:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Cloner la page/contenair
 CloneSite=Cloner le site
 SiteAdded=Site web ajouté
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+ConfirmClonePage=Veuillez entrer le code/alias de la nouvelle page et s'il s'agit d'une traduction de la page clonée.
 PageIsANewTranslation=La nouvelle page est une traduction de la page en cours ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+LanguageMustNotBeSameThanClonedPage=Vous clonez une page comme traduction. La langue de la nouvelle page doit être différente de la langue de la page source.
 ParentPageId=Id de la page parent
 WebsiteId=ID site web
 CreateByFetchingExternalPage=Créer une page / un conteneur en récupérant une page à partir d'une URL externe ...
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Retour à la liste pour le Tiers
 DisableSiteFirst=Désactiver le site Web d'abord
 MyContainerTitle=Titre de mon site web
 AnotherContainer=Un autre conteneur
+WEBSITE_USE_WEBSITE_ACCOUNTS=Activer la table des comptes du site Web
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activer la table pour stocker les comptes de site Web (login/pass) pour chaque site / tiers
+YouMustDefineTheHomePage=Vous devez d'abord définir la page d'accueil par défaut
+OnlyEditionOfSourceForGrabbedContentFuture=Note: seule l'édition de source HTML sera possible lorsqu'un contenu de page est initiliasé par aspiration d'une page externe (l'éditeur de WYSIWYG ne sera pas disponible)
+OnlyEditionOfSourceForGrabbedContent=Seule l'édition de source HTML est possible lorsque le contenu a été aspiré depuis un site externe
+GrabImagesInto=Aspirer aussi les images trouvées dans les css et la page.
+ImagesShouldBeSavedInto=Les images doivent être sauvegardées dans le répertoire
+WebsiteRootOfImages=Répertoire racine pour les images de site Web
+SubdirOfPage=Sous-répertoire dédié à la page
+AliasPageAlreadyExists=L'alias de page <strong> %s </strong> existe déjà
+CorporateHomePage=Page d'accueil Entreprise
+EmptyPage=Page vide
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index f1b42a988da..e54489273b7 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Les %s derniers bons de prélèvements
 MakeWithdrawRequest=Faire une demande de prélèvement
 WithdrawRequestsDone=%s demandes de prélèvements enregistrées
 ThirdPartyBankCode=Code banque du tiers
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawed=Aucune facture traitée avec succès. Vérifiez que les factures sont sur les sociétés avec un BAN par défaut valide et que le BAN a un RUM avec le mode <strong> %s </strong>.
 ClassCredited=Classer crédité
 ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce bon de prélèvement comme crédité sur votre compte bancaire ?
 TransData=Date de transmission
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=Cette action enregistrera les règlements des fa
 StatisticsByLineStatus=Statistiques par statut des lignes
 RUM=RUM
 RUMLong=Référence Unique de Mandat
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=Si vide, le numéro de RUM sera généré une fois les informations de compte bancaire enregistrées
 WithdrawMode=Mode de prélévement (FRST ou RECUR)
 WithdrawRequestAmount=Montant de la demande de prélèvement
 WithdrawRequestErrorNilAmount=Impossible de créer une demande de prélèvement pour un montant nul
@@ -98,10 +98,10 @@ ModeFRST=Paiement unitaire
 PleaseCheckOne=Cocher un choix uniquement
 DirectDebitOrderCreated=Ordre de prélèvement %s créé
 AmountRequested=Montant réclamé
-SEPARCUR=SEPA CUR
+SEPARCUR=SEPA RCUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
+ExecutionDate=Date d'éxecution
+CreateForSepa=Crée fichier de prélèvement automatique
 
 ### Notifications
 InfoCreditSubject=Crédit prélèvement %s à la banque
diff --git a/htdocs/langs/fr_NC/compta.lang b/htdocs/langs/fr_NC/compta.lang
index 1f0ce226a50..f22e834c4a5 100644
--- a/htdocs/langs/fr_NC/compta.lang
+++ b/htdocs/langs/fr_NC/compta.lang
@@ -11,9 +11,7 @@ VATPayments=Règlements TSS
 ShowVatPayment=Affiche paiement TSS
 RulesResultInOut=- Il inclut les règlements effectivement réalisés pour les factures, les charges et la TSS.<br>- Il se base sur la date de règlement de ces factures, charges et TSS.
 VATReportByCustomersInInputOutputMode=Rapport par client des TSS collectées et payées (TSS sur encaissement)
-VATReportByCustomersInDueDebtMode=Rapport par client des TSS collectées et payées (TSS sur débit)
 VATReportByQuartersInInputOutputMode=Rapport par taux des TSS collectées et payées (TSS sur encaissement)
-VATReportByQuartersInDueDebtMode=Rapport par taux des TSS collectées et payées (TSS sur débit)
 SeeVATReportInInputOutputMode=Voir le rapport <b>%sTSS encaissement%s</b> pour mode de calcul standard
 SeeVATReportInDueDebtMode=Voir le rapport <b>%sTSS sur débit%s</b> pour mode de calcul avec option sur les débits
 RulesVATInServices=- Pour les services, le rapport inclut les TSS des règlements effectivement reçus ou émis en se basant sur la date du règlement.
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 79b821a2ac2..d896b96efb5 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=שגיאה, לא ניתן להשתמש באפשרות @ אם רצף {yy} {מ&quot;מ} או {yyyy} {מ&quot;מ} אינו מסכה.
 UMask=UMask פרמטר עבור קבצים חדשים על יוניקס / לינוקס / BSD מערכת הקבצים.
 UMaskExplanation=פרמטר זה מאפשר לך להגדיר הרשאות כברירת מחדל על קבצים שנוצרו על ידי Dolibarr בשרת (במהלך הטעינה למשל). <br> זה חייב להיות ערך אוקטלי (לדוגמה, 0666 אמצעי קריאה וכתיבה לכולם). <br> פרמטר זה הוא חסר תועלת על שרת Windows.
-SeeWikiForAllTeam=תסתכל על דף Wiki עבור רשימה מלאה של כל השחקנים והארגון שלהם
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= עיכוב במטמון בתגובה יצוא שניות (0 או ריק מטמון לא)
 DisableLinkToHelpCenter=הסתרת הקישור <b>&quot;זקוק לעזרה או תמיכה&quot;</b> בעמוד הכניסה
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=משתמשים להקות
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=לקרוא חשבוניות של לקוחות
@@ -833,11 +838,11 @@ Permission1251=הפעל יבוא המוני של נתונים חיצוניים 
 Permission1321=יצוא חשבוניות הלקוח, תכונות ותשלומים
 Permission1322=Reopen a paid bill
 Permission1421=ייצוא הזמנות של לקוחות ותכונות
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=תנאי תשלום
 DictionaryPaymentModes=תשלום מצבי
 DictionaryTypeContact=צור סוגים
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=נייר פורמטים
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=מע&quot;מ ניהול
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=כברירת מחדל המע&quot;מ המוצע הוא 0 אשר ניתן להשתמש בהם במקרים כמו עמותות, אנשים ou חברות קטנות.
-VATIsUsedExampleFR=בצרפת, זה אומר חברות או ארגונים שיש להם מערכת הכספים האמיתי (פשוטה נדל או רגיל). מערכת שבה מע&quot;מ מוכרז.
-VATIsNotUsedExampleFR=בצרפת, זה אומר שהם עמותות מע&quot;מ לא הכריז או חברות, ארגונים או מקצועות חופשיים שבחרו מערכת ארגונית מיקרו הכספים (מע&quot;מ זיכיון) ושילם מע&quot;מ זיכיון ללא כל הצהרה מע&quot;מ. בחירה זו תציג את התייחסות &quot;מע&quot;מ רלוונטי ללא - אמנות-293B של CGI&quot; על חשבוניות.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=שרת
 DriverType=הנהג סוג
 SummarySystem=מערכת מידע סיכום
 SummaryConst=רשימה של כל הפרמטרים ההתקנה Dolibarr
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= התפריט הסטנדרטי מנהל
 DefaultMenuSmartphoneManager=התפריט החכם המנהל
 Skin=העור נושא
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=חפש בצורה קבועה בתפריט השמאלי
 DefaultLanguage=ברירת המחדל של השפה להשתמש (קוד שפה)
 EnableMultilangInterface=אפשר ממשק רב לשוני
 EnableShowLogo=הצג את הלוגו בתפריט השמאלי
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=שם
 CompanyAddress=כתובת
 CompanyZip=רוכסן
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=מערכת מידע הוא מידע טכני שונות נכנסת למצב קריאה בלבד ונראה לעין עבור מנהלי בלבד.
 SystemAreaForAdminOnly=אזור זה זמין עבור המשתמשים מנהל בלבד. אף אחד הרשאות Dolibarr יכול להפחית את המגבלה.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=אתה יכול לבחור בכל פרמטר הקשור מבט Dolibarr ולהרגיש כאן
 AvailableModules=Available app/modules
 ToActivateModule=כדי להפעיל מודולים, ללכת על שטח ההתקנה (ראשי-> התקנה-> Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=שם קובץ ונתיב
 YouCanUseDOL_DATA_ROOT=ניתן להשתמש DOL_DATA_ROOT / dolibarr.log עבור קובץ יומן בספרייה Dolibarr &quot;מסמכים&quot;. ניתן להגדיר בדרך אחרת כדי לאחסן קובץ זה.
 ErrorUnknownSyslogConstant=%s קבועים אינו ידוע Syslog מתמיד
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=מודול תרומה ההתקנה
 DonationsReceiptModel=תבנית של קבלת תרומה
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=בגלל המע&quot;מ
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=במע&quot;מ: <br> - על משלוח של סחורות (אנו משתמשים תאריך החשבונית) <br> - על תשלומים עבור שירותים
 OptionVatDebitOptionDesc=במע&quot;מ: <br> - על משלוח של סחורות (אנו משתמשים תאריך החשבונית) <br> - על החשבונית (חיוב) עבור שירותים
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=על משלוח
 OnPayment=על התשלום
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=תאריך חשבונית שימוש
 Buy=לקנות
 Sell=למכור
 InvoiceDateUsed=תאריך חשבונית שימוש
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index 792ff743ba1..c86026cebae 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 25706c15252..e9cbd8488b9 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 6342e2bda29..8cceada84d2 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=הצעות
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=לקוח פוטנציאל
 CustomerCard=Customer Card
 Customer=לקוח
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 18e5d251372..eaac9f843df 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index 884e077b96e..d2da7ded67e 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/he_IL/loan.lang b/htdocs/langs/he_IL/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/he_IL/loan.lang
+++ b/htdocs/langs/he_IL/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 8ed985bf813..8b7dc0a80dd 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 4735ab97007..16f15894aaa 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=קשר
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=פרוייקטים
 Rights=הרשאות
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=צדדים שלישיים
 SearchIntoContacts=אנשי קשר
 SearchIntoMembers=משתמשים
 SearchIntoUsers=משתמשים
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/he_IL/margins.lang b/htdocs/langs/he_IL/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/he_IL/margins.lang
+++ b/htdocs/langs/he_IL/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index 5c723b79a41..950a254ee12 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 9e2e535c8b0..a4a24bd15c4 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=תאור
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/he_IL/paypal.lang b/htdocs/langs/he_IL/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/he_IL/paypal.lang
+++ b/htdocs/langs/he_IL/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 55f4d1a722e..c1d70eac85d 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index c8b4890691f..0546fbe0642 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/he_IL/propal.lang b/htdocs/langs/he_IL/propal.lang
index 85e373e799d..ded0433f7cb 100644
--- a/htdocs/langs/he_IL/propal.lang
+++ b/htdocs/langs/he_IL/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/he_IL/salaries.lang
+++ b/htdocs/langs/he_IL/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 2c31a21097f..fc48523ce6a 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/he_IL/stripe.lang b/htdocs/langs/he_IL/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/he_IL/stripe.lang
+++ b/htdocs/langs/he_IL/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang
index bd51e00b8d4..9aa4248c006 100644
--- a/htdocs/langs/he_IL/trips.lang
+++ b/htdocs/langs/he_IL/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index fcb80b0c9ad..8079ad14787 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -69,8 +69,8 @@ InternalUser=פנימית המשתמש
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 29462bb5162..87b7fc3b839 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Grafikon za račune
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Komitent
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Godina za obrisati
 DelJournal=Dnevnik za obrisati
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Financijski izvještaj uključujući sve tipove plačanja po bankovnom računom
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Račun komitenta
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete obrisati obračunski račun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Primjeni masovne kategorije
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Vrsta
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Prodaja
 AccountingJournalType3=Nabava
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Podešeni format izvoza nije podržan
 BookeppingLineAlreayExists=Stavke već postoje u knjigovodstvu
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index f24f48773be..445e546f208 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Greška, ne možete koristiti opciju @ ako sekvence {yy}{mm} ili {yyyy}{mm} nisu u predlošku.
 UMask=Umask parametar za nove datoteke na Unix/Linux/BSD/Mac sistemu.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Pogledajte wiki stranicu za kompletan popis svih sudionika i njihovih organizacija
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Sakrij poveznicu "<b>Trebate li pomoć ili podršku</b>" na stranici prijave
 DisableLinkToHelp=Sakrij poveznicu na online pomoć "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Promjeni cijene sa baznom referentnom vrijednosti definira
 MassConvert=Pokreni masovnu konverziju
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Datum i vrijeme
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Poveži s objektom
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Biblioteka korištena za kreiranje PDF-a
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Koristi 3 koraka odobravanja kada je iznos (bez poreza) veći od...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Korisnici i grupe
 Module0Desc=Upravljanje korisnicima/zaposlenicima i grupama
@@ -619,6 +622,8 @@ Module59000Name=Marže
 Module59000Desc=Modul za upravljanje maržama
 Module60000Name=Provizije
 Module60000Desc=Modul za upravljanje provizijama
+Module62000Name=Incoterm
+Module62000Desc=Dodaj mogučnosti za upravljanje Incoterm-om
 Module63000Name=Sredstva
 Module63000Desc=Upravljanje sredstvima (pisači, vozila, prostorije, ...) koje možete djeliti s događajima
 Permission11=Čitaj račune kupca
@@ -833,11 +838,11 @@ Permission1251=Pokreni masovni uvoz vanjskih podataka u bazu (učitavanje podata
 Permission1321=Izvezi račune kupaca, atribute i plačanja
 Permission1322=Reopen a paid bill
 Permission1421=Izvezi narudžbe kupaca i atribute
-Permission20001=Čitaj zahtjeve odsutnosti (vaš i vaših podređenih)
-Permission20002=Kreiraj/izmjeni vaše zahtjeve odsutnosti
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Obriši zahtjeve odsutnosti
-Permission20004=Čitaj zahtjeve odsutnosti (svih korisnika)
-Permission20005=Kreiraj/izmjeni zahtjeve odsutnosti za sve 
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin zahtjevi odsutnosti ( podešavanje i saldo ) 
 Permission23001=Pročitaj planirani posao
 Permission23002=Kreiraj/izmjeni Planirani posao
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Iznosi biljega
 DictionaryPaymentConditions=Uvjeti plaćanja
 DictionaryPaymentModes=Naćini plaćanja
 DictionaryTypeContact=Tipovi Kontakata/adresa
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formati papira
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Upravljanje PDV
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Stopa
 LocalTax1IsNotUsed=Nemoj koristit drugi porez
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Tip upr. programa
 SummarySystem=Sažetak informacija o sistemu
 SummaryConst=Popis svih Dolibarr parametara podešavanja
-MenuCompanySetup=Tvrtka/Organizacija
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Upravitelj standardnog izbornika
 DefaultMenuSmartphoneManager=Upravitelj mobilnog izbornika
 Skin=Skin teme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Stalni obrazac za pretraživanje na ljevom izborniku
 DefaultLanguage=Zadani jezik za korištenje (kod jezika)
 EnableMultilangInterface=Omogući višejezično sučelje
 EnableShowLogo=Prikaži logo na ljevom izborniku
-CompanyInfo=Company/organisation information
-CompanyIds=Tvrtka/Organizacija profil
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Naziv
 CompanyAddress=Adresa
 CompanyZip=PBR
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Dostupne aplikacije/moduli
 ToActivateModule=Za aktivaciju modula, idite na podešavanja (Naslovna->Podešavanje->Moduli).
@@ -1441,6 +1448,9 @@ SyslogFilename=Naziv datoteke i putanja
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Podešavanje modula donacija
 DonationsReceiptModel=Predložak za donacijsku primku
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Neuspješna inicijalizacija izbornika
 ##### Tax #####
 TaxSetup=Podešavanje modula poreza, društvenih ili fiskalnih poreza i dividendi
 OptionVatMode=PDV koji dospjeva
-OptionVATDefault=Gotovinska osnova
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Obračunska osnova
 OptionVatDefaultDesc=PDV koji dospjeva: <br>- kod isporuke dobara (koristimo datum računa)<br>-kod plaćanja za usluge
 OptionVatDebitOptionDesc=PDV koji dospjeva: <br>- kod isporuke dobara (koristimo datum računa)<br>-kod računa (zaduženja) za usluge
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Vrijeme PDV obaveze zadano ovisno o odabranim opcijama:
 OnDelivery=Po isporuci
 OnPayment=Po uplati
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Korišten datum računa
 Buy=Kupi
 Sell=Prodaj
 InvoiceDateUsed=Korišten datum računa
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Konto prodaje
 AccountancyCodeBuy=Konto nabave
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Prikaži kao zadano na popisu
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index 4b5d43a32e7..87739869d1b 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Isporuka %s je ovjerena
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Možete isto dodati sljedeće paramete za filtriranje prikazan
 AgendaUrlOptions3=<b>logina=%s</b> da se ograniči prikaz na akcije u vlasništvu korisnika <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> da se ograniči prikaz na akcije dodjeljene projektu <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Prikaži rođendane kontakata
 AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
@@ -109,7 +112,7 @@ ExportCal=Izvezi kalendar
 ExtSites=Uvezi vanjski kalendar
 ExtSitesEnableThisTool=Prikaz vanjskih kalendara ( postavljenih u globalnim postavkama) u podsjetniku. Ne utječe na vanjske kalendare definirane od strane korisnika.
 ExtSitesNbOfAgenda=Broj kalendara
-AgendaExtNb=Calendar broj %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL za pristup .ical datoteki
 ExtSiteNoLabel=Bez opisa
 VisibleTimeRange=Vidljivi vremenski raspon
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 803c0d95fb7..47e36984250 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Uplaćeno natrag
 DeletePayment=Izbriši plaćanje
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Plaćanja dobavljačima
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -91,7 +92,7 @@ PaymentAmount=Iznos plaćanja
 ValidatePayment=Ovjeri plaćanje
 PaymentHigherThanReminderToPay=Plaćanje je veće nego podsjetnik za plaćanje
 HelpPaymentHigherThanReminderToPay=Pažnja, iznos plaćanja jednog ili više računa je veći nego ostatak plaćanja. <br> Promjenite Vaš unos, u suprotnom potvrdite i razmislite o kreiranju odborenja za primljeni višak za svaki pretplaćeni račun.
-HelpPaymentHigherThanReminderToPaySupplier=Upozorenje! Iznos uplate za jedan ili više računa viši je od iznosa preostalog za plaćanje. <br>izmjenite unos ili potvrdite.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Označi kao plaćeno
 ClassifyPaidPartially=Označi kao djelomično plaćeno
 ClassifyCanceled=Označi kao napušteno
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Pretvori u budući popust
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Upiši zaprimljeno plaćanje kupca
 EnterPaymentDueToCustomer=Napravi 
 DisabledBecauseRemainderToPayIsZero=Isključeno jer preostalo dugovanje je nula.
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status generiranih računa
 BillStatusDraft=Skica (potrebno potvrditi)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Plaćeno (spremno za konačni račun)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Napušteno
 BillStatusValidated=Ovjereno (potrebno platiti)
 BillStatusStarted=Započeto
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=U toku
 AmountExpected=Utvrđen iznos
 ExcessReceived=Previše primljeno
+ExcessPaid=Excess paid
 EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća)
 EscompteOfferedShort=Rabat
 SendBillRef=Podnošenje računa %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Popust iz bonifikacije %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ovaj kredit se može koristit na računu prije ovjere
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Novi apsolutni popust
 NewRelativeDiscount=Novi relativni popust
+DiscountType=Discount type
 NoteReason=Bilješka/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobrio
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Adresa za naplatu
 HelpEscompte=Ovaj popust zajamčen je jer je kupac izvršio plaćanje prije roka.
 HelpAbandonBadCustomer=Ovaj iznos neće biti plaćen (kupac je loš kupac) i smatra se kao gubitak.
@@ -341,10 +348,10 @@ NextDateToExecution=Datum generiranja sljedećeg računa
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Datum zadnjeg generiranja
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Maksimalni br. generiranja računa
-NbOfGenerationDone=Br. već generiranih računa
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Dosegnut maksimalan br. generiranih računa
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Automatska ovjera računa
 GeneratedFromRecurringInvoice=Pretplatnički račun generiran iz predloška %s
 DateIsNotEnough=Datum nije još dosegnut
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 8d496d9d818..e3280d88f23 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -43,7 +43,8 @@ Individual=Privatna osoba
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Matična tvrtka
 Subsidiaries=Podružnice
-ReportByCustomers=Izvještaj od kupaca
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Izvještaj po stopi
 CivilityCode=Kod uljudnosti
 RegisteredOffice=Registriran ured
@@ -75,10 +76,12 @@ Town=Grad
 Web=Web
 Poste= Pozicija
 DefaultLang=Primarni jezik
-VATIsUsed=Porez se koristi
-VATIsNotUsed=Porez se ne korisit
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Komitent nije kupac niti dobavljač, nema raspoloživih upućenih objekata
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Ponude
 OverAllOrders=Narudžbe
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Porezni broj
-VATIntraShort=Porezni broj
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Sintaksa je u redu
+VATReturn=VAT return
 ProspectCustomer=Potencijalni / Kupac
 Prospect=Potencijalni kupac
 CustomerCard=Kartica kupca
 Customer=Kupac
 CustomerRelativeDiscount=Relativni popust kupcu
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Apsolutni popust
 CompanyHasRelativeDiscount=Ovaj kupac ima predefiniran popust od <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ovaj kupac nema predefiniran relativni popust
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Ovaj kupac još uvijek ima odobrenje za <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Ovaj kupac nema dostupan kreditni popust
-CustomerAbsoluteDiscountAllUsers=Apsolutni popusti (odobreni svim korisnicima)
-CustomerAbsoluteDiscountMy=Apsolutni popust (Vaše odobrenje)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Ništa
 Supplier=Dobavljač
 AddContact=Kreiraj kontakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Nema pristup Dolibarr-u
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakti i svojstva
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontakti/adrese (komitenti ili ne) i atributi
-ImportDataset_company_3=Bankovni podaci
-ImportDataset_company_4=Komitenti/Prodajni predstavnici (Odnosi se na korisnike prodajne predstavnike prema tvrtkama)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Razina cijene
 DeliveryAddress=Adresa dostave
 AddAddress=Dodaj adresu
@@ -406,15 +419,16 @@ ProductsIntoElements=Popis proizvoda/usluga u %s
 CurrentOutstandingBill=Trenutno otvoreni računi
 OutstandingBill=Maksimalno za otvorene račune
 OutstandingBillReached=Dosegnut maksimum neplačenih računa
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Vraća broj u formatu %syymm-nnnn za kod kupca i %syymm-nnnn za kod dobavljača gdje je yy godina, mm je mjesec i nnnn je sljedni broj bez prekida i bez mogučnosti povratka na 0
 LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati u bilo koje vrijeme.
 ManagingDirectors=Ime vlasnika(ce) ( CEO, direktor, predsjednik uprave...)
 MergeOriginThirdparty=Dupliciran komitent (komitent koji želite obrisati)
 MergeThirdparties=Spoji komitente
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Komitenti su spojeni
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Korisničko ime predstavnika
 SaleRepresentativeFirstname=Ime prodajnog predstavnika
 SaleRepresentativeLastname=Prezime prodajnog predstavnika
-ErrorThirdpartiesMerge=Dogodila se greška kod brisanja komitenta. Provjerite zapise. Promjene su poništene.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 2036b34de13..e54450dfd18 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -31,7 +31,7 @@ Credit=Kredit
 Piece=Računovodstveni dok.
 AmountHTVATRealReceived=Nije naplaćeno
 AmountHTVATRealPaid=Neto plaćeno
-VATToPay=PDV prodaje
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF plaćanja
 VATPayment=Plaćanje poreza prodaje
 VATPayments=Plaćanja poreza kod prodaje
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Povrat
 SocialContributionsPayments=Plaćanja društveni/fiskalni porez
 ShowVatPayment=Prikaži PDV plaćanja
@@ -157,30 +158,34 @@ RulesResultDue=- Uključuje neplačene račune, troškove, PDV, donacije bez obz
 RulesResultInOut=- Uključuje stvarne uplate po računima, troškove, PDV i plaće. <br>- Baziran je po datumu plaćanja računa, troškova, PDV-a i plaćama. Datum donacje za donacije.
 RulesCADue=- Uključuje dospjeće računa kupca bez obzira da li je plaćena ili ne.<br>- Baziran je po datumu ovjere tih računa.<br> 
 RulesCAIn=- Uključuje sva efektivna plaćanja računa zaprimljena od klijenata.<br>- Baziran je po datumu plaćanja tih računa<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Izvještaj po IRPF komitenta
-LT1ReportByCustomersInInputOutputModeES=Izvještaj po RE komitenta
-VATReport=PDV izvještaj 
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Izvještaj po RE komitenta
+LT2ReportByCustomersES=Izvještaj po IRPF komitenta
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Izvještaj prikupljenog i plaćenog PDV-a kupaca
-VATReportByCustomersInDueDebtMode=Izvještaj prikupljenog i plaćenog PDV-a kupaca
-VATReportByQuartersInInputOutputMode=Izvještaj po prikupljenog i plaćenog stopi PDV-a
-LT1ReportByQuartersInInputOutputMode=Izvještaj po RE stopi
-LT2ReportByQuartersInInputOutputMode=Izvještaj po IRPF stopi
-VATReportByQuartersInDueDebtMode=Izvještaj po prikupljenog i plaćenog stopi PDV-a
-LT1ReportByQuartersInDueDebtMode=Izvještaj po RE stopi
-LT2ReportByQuartersInDueDebtMode=Izvještaj po IRPF stopi
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Izvještaj po RE stopi
+LT2ReportByQuartersES=Izvještaj po IRPF stopi
 SeeVATReportInInputOutputMode=Vidi izvještaj <b>%sPDV pokrivanje%s</b> za standardni izračun
 SeeVATReportInDueDebtMode=Vidi izvještaj <b>%sProtoka PDV%s</b> za izračun sa opcijom protoka
 RulesVATInServices=- Za usluge, izvještaj uključuje propisani PDV stvarno primljen ili izdan baziran po datumu plaćanja. 
-RulesVATInProducts=- Za materjalna dobra, uključuje PDV računa bazirano po datumu računa.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Za usluge, izvještaj uključuje PDV dospjelih računa, plaćene ili neplaćene, bazirano po datumu računa.
-RulesVATDueProducts=- Za materjalna dobra, uključuje PDV računa, bazirano po datumu računa.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Napomena: Za materijalna dobra, koristite datum isporuke kako bi bilo točnije.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/račun
 NotUsedForGoods=Nije korišteno na robi
 ProposalStats=Statistike na ponudama
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=Sukladno dobavljaču, odaberite prikladnu metodu za
 TurnoverPerProductInCommitmentAccountingNotRelevant=Izvještaj prometa po proizvodu, kada koristite <b>gotovinsko računovodstvo</b> način nije točno. Ovaj izvještaj je dostupan samo kada koristite <b>Predano računovodstvo</b> (vidi podešavanjke modula računovodstva).
 CalculationMode=Način izračuna
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Greška: Nije pronađen bankovni račun
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 5852a132499..12342e7a76d 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Nema registriranih poslova
 CronPriority=Prioritet
 CronLabel=Oznaka
 CronNbRun=Br. pokretanja
-CronMaxRun=Max br. pokretanja
+CronMaxRun=Max number launch
 CronEach=Svakih
 JobFinished=Posao pokrenut i završen
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Od
 CronType=Tip posla
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Nemoguće učitati klasu %s ili objekt %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Idite na izbornik "Home - Admin tools - Scheduled jobs" za prikaz i uređivanje planiranih poslova.
 JobDisabled=Posao onemogućen
 MakeLocalDatabaseDumpShort=Lakalni backup baze
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index e79fb19fed5..d5e86a4fa10 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/hr_HR/loan.lang b/htdocs/langs/hr_HR/loan.lang
index e7efe85f4dd..5c19c6d5b96 100644
--- a/htdocs/langs/hr_HR/loan.lang
+++ b/htdocs/langs/hr_HR/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Konfiguracija modula kredita
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 5c9b894da2f..16388324482 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index cdc2a1158da..6a0a6dd9b4e 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Značajka %s nije određena
 ErrorUnknown=Nepoznata greška
 ErrorSQL=Greška na SQL-u
 ErrorLogoFileNotFound=Datoteka s logom '%s' nije pronađena
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Idite na postavke modula kako bi ste ovo popravili
 ErrorFailedToSendMail=Elektronska pošta nije poslana (pošiljatelj=%s, primatelj=%s)
 ErrorFileNotUploaded=Datoteka nije učitana. Proverite da veličina ne prelazi dozvoljenu, da imate slobodnog mjesta na disku i da u ovoj mapi nema datoteke sa istim imenom.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, nisu definirane porezne stope za
 ErrorNoSocialContributionForSellerCountry=Greška, nisu definirani društveni/fiskalni porezi za zemlju '%s'.
 ErrorFailedToSaveFile=Greška, neuspješno snimanje datoteke.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Niste autorizirani za ovu akciju.
 SetDate=Postavi datum
 SelectDate=Izaberi datum
 SeeAlso=Vidi također %s
 SeeHere=Vidi ovdje
+ClickHere=Klikni ovdje
+Here=Here
 Apply=Primjeni
 BackgroundColorByDefault=Zadana boja pozadine
 FileRenamed=Ime datoteke uspješno promijenjeno
@@ -185,6 +187,7 @@ ToLink=Poveznica
 Select=Odaberi
 Choose=Izaberi
 Resize=Promjeni veličinu
+ResizeOrCrop=Resize or Crop
 Recenter=Centriraj
 Author=Autor
 User=Korisnik
@@ -325,8 +328,10 @@ Default=Zadano
 DefaultValue=Zadana vrijednost
 DefaultValues=Default values
 Price=Cijena
+PriceCurrency=Price (currency)
 UnitPrice=Jedinična cijena
 UnitPriceHT=Jedinična cijena (neto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Jedinična cijena
 PriceU=J.C.
 PriceUHT=J.C. (neto)
@@ -334,6 +339,7 @@ PriceUHTCurrency=J.C. (valuta)
 PriceUTTC=J.C. (s porezom)
 Amount=Iznos
 AmountInvoice=Iznos računa
+AmountInvoiced=Amount invoiced
 AmountPayment=Iznos plaćanja
 AmountHTShort=Iznos (neto)
 AmountTTCShort=Iznos (s porezom)
@@ -353,6 +359,7 @@ AmountLT2ES=Iznos IRPF
 AmountTotal=Ukupan iznos
 AmountAverage=Prosječan iznos
 PriceQtyMinHT=Cijena količinska min. (neto od poreza)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Postotak
 Total=Ukupno
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Stopa poreza
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Prosjek
 Sum=Zbroj
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Završeno
 ActionUncomplete=Nekompletno
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Tvrtka/Organizacija
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kontakti komitenta
 ContactsAddressesForCompany=Kontakti/adrese komitenta
 AddressesForCompany=Adrese komitenta
@@ -427,6 +437,9 @@ ActionsOnCompany=Događaji povezani s komitentom
 ActionsOnMember=Događaji za člana
 ActionsOnProduct=Events about this product
 NActionsLate=%s kasni
+ToDo=Za napraviti
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Zahtjev je već pohranjen
 Filter=Filter
 FilterOnInto=Kriterij pretraživanja '<strong>%s</strong>' unutar polja %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Upozorenje, nalazite se u načinu održavanja, ta
 CoreErrorTitle=Sistemska greška
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kreditna kartica
+ValidatePayment=Ovjeri plaćanje
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Polja s <b>%s</b> su obavezna
 FieldsWithIsForPublic=Polja sa <b>%s</b> su prikazani na javnom popisu članova. Ako to ne želite, odznačite kučicu "javno".
 AccordingToGeoIPDatabase=(sukladno GeoIP konverziji)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Povezani objekti
 ClassifyBilled=Označi kao naplaćena
+ClassifyUnbilled=Classify unbilled
 Progress=Napredak
-ClickHere=Klikni ovdje
 FrontOffice=Front office
 BackOffice=Back office
 View=Vidi
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekt
 Projects=Projekti
 Rights=Prava pristupa
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Ponedjeljak
 Tuesday=Utorak
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Svi
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Dodjeljeno korisniku
diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
index fd2448c31bc..713fd9d6b8c 100644
--- a/htdocs/langs/hr_HR/margins.lang
+++ b/htdocs/langs/hr_HR/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Stopa mora biti brojčana vrijednost
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Prikaži infomacije o marži
 CheckMargins=Detalji marže
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index be78c3987ae..567654b8068 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Popis ovjerenih javnih članova
 ErrorThisMemberIsNotPublic=Ovaj član nije javni
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Drugi član (ime: <b>%s</b>, login: <b>%s</b>) je već povezan s komitentom <b>%s</b>. Obrišite prije taj link jer komitent ne može biti povezan samo na jednog člana (i obrnuto).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Iz sigurnosnih razloga, morate dodjeliti dozvole svim korisnicima da mogu povezivati članove s korisnicima koji nisu vaši.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Sadržaj vaše članske kartice
 SetLinkToUser=Poveži s Dolibarr korisnikom
 SetLinkToThirdParty=Veza na Dolibarr komitenta
 MembersCards=Članske vizit kartice
@@ -108,17 +106,33 @@ PublicMemberCard=Javna članska kartica
 SubscriptionNotRecorded=Pretplata nije pohranjena
 AddSubscription=Kreiraj pretplatu
 ShowSubscription=Prikaži pretplatu
-SendAnEMailToMember=Pošalji članu e-poštu informacija
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Sadržaj vaše članske kartice
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=Naslov e-pošte za člansku autopretplatu
-DescADHERENT_AUTOREGISTER_MAIL=E-pošta za člansku autopretplatu
-DescADHERENT_MAIL_VALID_SUBJECT=Naslov e-pošte za potvrdu člana
-DescADHERENT_MAIL_VALID=E-pošta za potvrdu člana
-DescADHERENT_MAIL_COTIS_SUBJECT=Naslov e-pošte za pretplatu
-DescADHERENT_MAIL_COTIS=E-pošta za pretplatu
-DescADHERENT_MAIL_RESIL_SUBJECT=Naslov e-pošte za otkazivanje člana
-DescADHERENT_MAIL_RESIL=e-pošta za otkazivanje člana
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=E-pošta pošiljatelja za automatske poruke e-poštom
 DescADHERENT_ETIQUETTE_TYPE=Format stranice naljepnica
 DescADHERENT_ETIQUETTE_TEXT=Tekst za ispis na adresnim listovima člana
@@ -177,3 +191,8 @@ NoVatOnSubscription=Nema PDV-a za pretplate
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod koji se koristi za stavku pretplate na računu: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 7458997b274..fc810e160d1 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Naslov
 WEBSITE_DESCRIPTION=Opis
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/hr_HR/paypal.lang b/htdocs/langs/hr_HR/paypal.lang
index 23e4f195405..56cabe0207d 100644
--- a/htdocs/langs/hr_HR/paypal.lang
+++ b/htdocs/langs/hr_HR/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Samo PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Ovo je ID tranksakcije: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Kod greške
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index d17677bc1f5..e1666e06a5a 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi ili usluge
 ProductsOrServices=Proizvodi ili usluge
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Jeste li sigurni da želite izbrisati stavku proizvoda?
 ProductSpecial=Specijalni
 QtyMin=Najmanja količina
 PriceQtyMin=Cijena za ovu najmanju količinu (bez popusta)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Stopa PDV-a (za ovog dobavljača/proizvod)
 DiscountQtyMin=Osnovi popust za količinu
 NoPriceDefinedForThisSupplier=Cijena/količina nije određena za ovog dobavljača/proizvod
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index d0ac2f943c3..d39570462e1 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Kontakti projekta
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Svi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Ovaj popis predstavlja sve projekte za koje imate dozvolu.
 TasksOnProjectsPublicDesc=Ovaj popis predstavlja sve zadatke na projektima za koje imate dozvolu.
 ProjectsPublicTaskDesc=Ovaj popis predstavlja sve projekte i zadatke za koje imate dozvolu.
 ProjectsDesc=Ovaj popis predstavlja sve projekte (vaše korisničke dozvole odobravaju vam da vidite sve).
 TasksOnProjectsDesc=Ovaj popis predstavlja sve zadatke na svim projektima (vaše korisničke dozvole odobravaju vam da vidite sve).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Samo otvoreni projekti su vidljivi (projekti u skicama ili zatvorenog statusa nisu vidljivi).
 ClosedProjectsAreHidden=Zatvoreni projekti nisu vidljivi.
 TasksPublicDesc=Ovaj popis predstavlja sve projekte i zadatke za koje imate dozvolu.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Zadaci u otvorenim projektima
 WorkloadNotDefined=Opterećenje nije definirano
 NewTimeSpent=Vrijeme utrošeno
 MyTimeSpent=Moje utrošeno vrijeme
+BillTime=Bill the time spent
 Tasks=Zadaci
 Task=Zadatak
 TaskDateStart=Početak zadatka
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Popis donacija povezanih sa projektom
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Popis događaja povezanih sa projektom
 ListTaskTimeUserProject=Popis utrošenog vremena po zadacima projekta
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Današnja aktivnost na projektu
 ActivityOnProjectYesterday=Jučerašnja aktivnost na projektu
 ActivityOnProjectThisWeek=Aktivnosti na projektu ovog tjedna
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktivnosti na projektu ovog mjeseca
 ActivityOnProjectThisYear=Aktivnosti na projektu ove godine
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Nije vlasnik ovog privatnog projekta
 AffectedTo=Dodjeljeno 
 CantRemoveProject=Ovaj projekt se ne može maknuti jer je povezan sa drugim objektima (računi, narudžbe ili sl.). Vidite tab Izvora.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nemoguće pomaknuti datum zadatka sukladno novom početnom datumu projekta
 ProjectsAndTasksLines=Projekti i zadaci 
 ProjectCreatedInDolibarr=Projekt %s je kreiran
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Zadatak %s kreiran
 TaskModifiedInDolibarr=Zadatak %s izmjenjen
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index 5ec31c6e32c..039fa7767a6 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Potpisana (za naplatu)
 PropalStatusNotSigned=Nije potpisana (zatvorena)
 PropalStatusBilled=Naplaćena
 PropalStatusDraftShort=Skica
+PropalStatusValidatedShort=Ovjereno
 PropalStatusClosedShort=Zatvorena
 PropalStatusSignedShort=Potpisana
 PropalStatusNotSignedShort=Nije potpisana
diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
index c9594b89065..4eb47319af2 100644
--- a/htdocs/langs/hr_HR/salaries.lang
+++ b/htdocs/langs/hr_HR/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Ova vrijednost može se koristiti za izračun troškova utrošeno
 TJMDescription=Ova vrijednost je informativna i ne koristi se niti u jednom izračunu
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 5f241ca7799..67eb762a586 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Promjeni skladište
 MenuNewWarehouse=Novo skladište
 WarehouseSource=Izvorno skladište
 WarehouseSourceNotDefined=Skladište nije definirano,
+AddWarehouse=Create warehouse
 AddOne=Dodajte jedno
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Odredišno skladište
 ValidateSending=Obriši slanje
 CancelSending=Odustani od slanja
@@ -22,6 +24,7 @@ Movements=Kretanja
 ErrorWarehouseRefRequired=Referenca skladišta je obavezna
 ListOfWarehouses=Popis skladišta
 ListOfStockMovements=Popis kretanja zaliha
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/hr_HR/stripe.lang b/htdocs/langs/hr_HR/stripe.lang
index ac1117e279f..22409d7f777 100644
--- a/htdocs/langs/hr_HR/stripe.lang
+++ b/htdocs/langs/hr_HR/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index 5cb82e0bd08..ecf4da0dfc0 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Prikaži izvještaj troška
 NewTrip=Novi izvještaj troška
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Iznos ili kilometri
 DeleteTrip=Obriši izvještaj troška
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Čeka na odobrenje
 ExpensesArea=Sučelje izvještaja troška
 ClassifyRefunded=Označi 'Povrat'
 ExpenseReportWaitingForApproval=Novi izvještaj troška je predan za odobrenje
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Izvještaj troška ID
 AnyOtherInThisListCanValidate=Osoba za obavjest za ovjeru.
 TripSociete=Više o tvrtci
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Objavili ste još jedan izvještaj troška u sličnom razdoblju.
 AucuneLigne=Još nije objavljen izvještaj troška
 
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index d55cb710a32..fb8bfe7f5a6 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -69,8 +69,8 @@ InternalUser=Interni korisnik
 ExportDataset_user_1=Korisnici i svojstva
 DomainUser=Korisnik na domeni %s
 Reactivate=Reaktiviraj
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Dozvola odobrena jer je nasljeđeno od jedne od korisničkih grupa.
 Inherited=Nasljeđeno
 UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije vezan za određenog komitenta)
@@ -93,6 +93,7 @@ NameToCreate=Naziv komitenta za kreiranje
 YourRole=Vaše uloge
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je dostignuta !
 NbOfUsers=Broj korisnika
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
 HierarchicalResponsible=Nadglednik
 HierarchicView=Hijerarhijski prikaz
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index abbeb4e2c00..901f4bb47c6 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Kreirajte različitih unosa koliko god to želite ovisno koliko
 DeleteWebsite=Obriši Web mjesto
 ConfirmDeleteWebsite=Jeste li sigurni da želite obrisati ovo web mjesto. Sve stranice i sadržaj biti će isto obrisan.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Naziv stranice/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL vanjske CSS datoteke
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Pogledaj stranicu u novom tabu
 SetAsHomePage=Postavi kao početnu stranicu
 RealURL=Pravi URL
 ViewWebsiteInProduction=Pogledaj web lokaciju koristeći URL naslovnice
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index e091c0e54b0..a46f2041ab1 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za obradu
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Kod banke komitenta
-NoInvoiceCouldBeWithdrawed=Račun nije uspješno isplačen. Provjerite da li račun glasi na tvrtku s valjanim BAN-om.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Označi kao kreditirano
 ClassCreditedConfirm=Jeste li sigurni da želite svrstati račun za isplatu kao knjiženje na svoj bankovni račun ?
 TransData=Datum prijenosa
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistika statusa stavki
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index f90d3e64079..7ce7b42eca9 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Dátum
 Docref=Hivatkozás
-Code_tiers=Partner
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Partner számla
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Természet
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Eladások
 AccountingJournalType3=Beszerzések
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Készletnyilvántartás
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Képlet
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 8bace86a1ef..2a16ec835cb 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Hiba, nem tudja használni, ha az opció @ {sorozat} {nn mm ÉÉÉÉ} vagy {} {} mm nincs maszk.
 UMask=Umask paramétert az új fájlok a Unix / Linux / BSD fájlrendszer.
 UMaskExplanation=Ez a paraméter lehetővé teszi, hogy meghatározza jogosultságok beállítása alapértelmezés szerint létrehozott fájlok Dolibarr a szerver (feltöltés közben például). <br> Ennek kell lennie az oktális érték (például 0666 segítségével írni és olvasni mindenki számára). <br> Ez a paraméter haszontalan egy Windows szerverre.
-SeeWikiForAllTeam=Vessen egy pillantást a wiki oldalon a teljes lista az összes szereplő és a szervezetük
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Késleltetése caching export válasz másodpercben (0 vagy üres cache nélkül)
 DisableLinkToHelpCenter=Hide link <b>&quot;Segítségre van szüksége, vagy támogatják&quot;</b> a bejelentkezési oldalon
 DisableLinkToHelp=Az online segítség "<b>%s</b>" hivatkozásának elrejtése
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Tömeges konvertálás indítása
 String=Szöveg
 TextLong=Hosszú szöveg
+HtmlText=Html text
 Int=Egész
 Float=Lebegőpontos
 DateAndTime=Dátum és idő
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Felhasználók és csoportok
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margók
 Module59000Desc=Module to manage margins
 Module60000Name=Jutalékok
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Erőforrások
 Module63000Desc=Erőforrások kezelése (nyomtatók, autók, helyiségek ...) melyeket események kapcsán oszthat meg
 Permission11=Olvassa vevői számlák
@@ -833,11 +838,11 @@ Permission1251=Fuss tömeges import a külső adatok adatbázisba (adatok terhel
 Permission1321=Export vevői számlák, attribútumok és kifizetések
 Permission1322=Reopen a paid bill
 Permission1421=Export vevői megrendelések és attribútumok
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Fizetési feltételek
 DictionaryPaymentModes=Fizetési módok
 DictionaryTypeContact=Kapcsolat- és címtípusok
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ökoadó (WEEE)
 DictionaryPaperFormat=Papírméretek
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=ÁFA kezelés
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Alapértelmezésben a tervezett áfa 0, amelyet fel lehet használni olyan esetekre, mint az egyesületek, magánszemélyek ou kis cégek.
-VATIsUsedExampleFR=Franciaországban, az azt jelenti, vállalatok vagy szervezetek, amelyek a valós pénzügyi rendszer (egyszerűsített vagy normál valós valós). Egy rendszer, amelyekre a HÉA nyilvánítják.
-VATIsNotUsedExampleFR=Franciaországban, az azt jelenti, szervezetekkel, amelyek a nem bejelentett vagy ÁFA cégek, szervezetek vagy szabadfoglalkozásúak, hogy kiválasztotta a mikrovállalkozás fiskális rendszer (HÉA-franchise) és kifizetett franchise ÁFA nélkül ÁFA nyilatkozat. Ez a választás megjelenik a referencia &quot;Nem alkalmazandó hozzáadottérték-adó - art-293B CGI&quot; a számlákat.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Arány
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Szerver
 DriverType=Vezető típus
 SummarySystem=Rendszer információk összefoglaló
 SummaryConst=List of all Dolibarr beállítási paraméterek
-MenuCompanySetup=Vállalat/Szervezet
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Normál menü menedzser
 DefaultMenuSmartphoneManager=Smartphone Menükezelőben
 Skin=Bőr téma
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Állandó keresési űrlapot baloldali menüben
 DefaultLanguage=Alapértelmezett nyelv használatát (nyelv kód)
 EnableMultilangInterface=Engedélyezze a többnyelvű interfész
 EnableShowLogo=Mutasd logo a bal menüben
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Név
 CompanyAddress=Cím
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
 SystemAreaForAdminOnly=Ez a terület áll rendelkezésre a felhasználók csak rendszergazda. Egyik Dolibarr engedélyek csökkentheti ezt a határt.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Választhat minden paramétert kapcsolatos Dolibarr kinézetét itt
 AvailableModules=Available app/modules
 ToActivateModule=Ha aktiválni modulok, menjen a Setup Terület (Home-> Beállítások-> Modulok).
@@ -1441,6 +1448,9 @@ SyslogFilename=A fájl nevét és elérési útvonalát
 YouCanUseDOL_DATA_ROOT=Használhatja DOL_DATA_ROOT / dolibarr.log egy log fájlt Dolibarr &quot;Dokumentumok&quot; mappa. Beállíthatjuk, más utat kell tárolni ezt a fájlt.
 ErrorUnknownSyslogConstant=Constant %s nem ismert Syslog állandó
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Adomány modul beállítása
 DonationsReceiptModel=Sablon az adomány átvételét
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=ÁFA miatt
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=ÁFA oka: <br> - Utánvéttel áruk (az általunk használt számla dátum) <br> - A fizetési szolgáltatások
 OptionVatDebitOptionDesc=ÁFA oka: <br> - Utánvéttel áruk (az általunk használt számla dátum) <br> - A számla (debit) szolgáltatások
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=A szállítási
 OnPayment=A fizetési
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Számla dátuma használt
 Buy=Megvesz
 Sell=Eladás
 InvoiceDateUsed=Számla dátuma használt
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Eladás számviteli kódja
 AccountancyCodeBuy=Vétel számviteli kódja
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index e548def0cdb..98a549cf9b4 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=%s tag jóváhagyva
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=A %s szállítás jóváhagyva
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Az alábbi paramétereket hozzá lehet adni a kimenet szűrés
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Mutassa a születésnapokat a névjegyzékben
 AgendaHideBirthdayEvents=Rejtse el a születésnapokat a névjegyzékben 
 Busy=Elfoglalt
@@ -109,7 +112,7 @@ ExportCal=Export naptár
 ExtSites=Külső naptárak importálása
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Naptárak száma 
-AgendaExtNb=Naptár nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=Az iCal fájl URL elérése
 ExtSiteNoLabel=Nincs leírás
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 668f1c050ba..94aead7794b 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Visszafizetések
 DeletePayment=Fizetés törlése
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Beszállítók kifizetések
 ReceivedPayments=Fogadott befizetések
 ReceivedCustomersPayments=Vásárlóktól kapott befizetések
@@ -91,7 +92,7 @@ PaymentAmount=Fizetés összege
 ValidatePayment=Jóváhagyott fizetés
 PaymentHigherThanReminderToPay=Fizetés magasabb az emlékeztetőben leírtnál
 HelpPaymentHigherThanReminderToPay=Figyelem, a fizetett összeg egy vagy több számla esetén magasabb, mint a még fizetendő. <br> Szerkessze a bejegyzését, különben hagyja jóvá és gondolja meg egy jóváírás létrehozását a feleslegesen kapott minden túlfizetett számlákra.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Osztályozva mint 'Fizetve'
 ClassifyPaidPartially=Osztályozva mint 'Részben fizetve'
 ClassifyCanceled=Osztályozva mint 'Elhagyott'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Átalakít jövőbeni kedvezménnyé
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Írja be a vásárlótól kapott a fizetést
 EnterPaymentDueToCustomer=Legyen esedékes a vásárló fizetése
 DisabledBecauseRemainderToPayIsZero=Letiltva, mivel a maradék egyenleg 0.
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Tervezet (érvényesítés szükséges)
 BillStatusPaid=Fizetett
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Fizetett (készen a végszámlához)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Elveszett
 BillStatusValidated=Hitelesített (ki kell fizetni)
 BillStatusStarted=Indította
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Folyamatban
 AmountExpected=Követelt összeg
 ExcessReceived=Túlfizetés beérkezett
+ExcessPaid=Excess paid
 EscompteOffered=Árengedmény (kif. előtt tart)
 EscompteOfferedShort=Kedvezmény
 SendBillRef=Számla elküldése %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Kedvezmény a jóváírásból %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ez a fajta hitel felhasználható a számlán, mielőtt azok jóváhagyásra kerülnek
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Új abszolút kedvezmény
 NewRelativeDiscount=Új relatív kedvezmény
+DiscountType=Discount type
 NoteReason=Megjegyzés / Ok
 ReasonDiscount=Ok
 DiscountOfferedBy=Által nyújtott
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Szánmlázási cím
 HelpEscompte=Ez a kedvezmény egy engedmény a vevő részére, mert a befizetés már megtörtént előzőleg.
 HelpAbandonBadCustomer=Ez az összeg már Elveszett (kétes vevő), rendkívüli veszteségként leírva.
@@ -341,10 +348,10 @@ NextDateToExecution=Következő számlakészítés dátuma
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 60aad8e4cca..ca828df5ac7 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -43,7 +43,8 @@ Individual=Magánszemély
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Anyavállalat
 Subsidiaries=Leányvállalatok
-ReportByCustomers=Jelentés vevőnként
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Jelentés %-onként
 CivilityCode=Udvariassági kód
 RegisteredOffice=Bejegyzett iroda
@@ -75,10 +76,12 @@ Town=Város
 Web=Web
 Poste= Pozíció
 DefaultLang=Nyelv alapértelmezés szerint
-VATIsUsed=ÁFÁ-t használandó
-VATIsNotUsed=ÁFÁ-t nem használandó
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Cím kitöltése a harmadik férl címével
 ThirdpartyNotCustomerNotSupplierSoNoRef=A harmadik fél nem vevő sem szállító, nincs elérhető hivatkozási objektum
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Fizetési bank számla
 OverAllProposals=Javaslatok
 OverAllOrders=Megrendelések
@@ -239,7 +242,7 @@ ProfId3TN=Szakma Id 3 (Douane kód)
 ProfId4TN=Szakma Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Adószám
-VATIntraShort=Adószám
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Szintaxis érvényes
+VATReturn=VAT return
 ProspectCustomer=Jelentkező / Vevő
 Prospect=Jelentkező
 CustomerCard=Vevő-kártya
 Customer=Vevő
 CustomerRelativeDiscount=Relatív vásárlói kedvezmény
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relatív kedvezmény
 CustomerAbsoluteDiscountShort=Abszolút kedvezmény
 CompanyHasRelativeDiscount=A vevő alapértelmezett kedvezménye <b>%s%%</b>
 CompanyHasNoRelativeDiscount=A vevő nem rendelkezik relatív kedvezménnyel alapértelmezésben
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Ez a vevő még hitellel rendelkezik <b>%s %s</b>-ig
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=A vevőnek nincs kedvezménye vagy hitele
-CustomerAbsoluteDiscountAllUsers=Abszolút kedvezmények (minden felhasználó által megadott)
-CustomerAbsoluteDiscountMy=Abszolút kedvezmények (által nyújtott magad)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Nincs
 Supplier=Szállító
 AddContact=Kapcsolat létrehozása
@@ -377,9 +390,9 @@ NoDolibarrAccess=Nem Dolibarr hozzáférés
 ExportDataset_company_1=Harmadik fél (cégek / alapítványok / személyek) és tulajdonságai
 ExportDataset_company_2=Kapcsolatok és tulajdonságai
 ImportDataset_company_1=Harmadik fél (cégek / alapítványok / személyek) és tulajdonságai
-ImportDataset_company_2=Kapcsolatok/címek (partner vagy nem) és attribútumok
-ImportDataset_company_3=Banki adatok
-ImportDataset_company_4=Harmadik fél/Kereskedelmi képviselők (Hatással van a vaállalatokhoz tartozó  kereskedelmi képviselő felhasználókra)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Árszint
 DeliveryAddress=Szállítási cím
 AddAddress=Cím hozzáadása
@@ -406,15 +419,16 @@ ProductsIntoElements=Termékek / szolgáltatások listálya ide %s
 CurrentOutstandingBill=Jelenlegi kintlévőség
 OutstandingBill=Maximális kintlévőség
 OutstandingBillReached=Max. a kintlévőség elért
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Vevőkód a %yymm-nnnn, valamint a szállítókód a %syymm-nnnn szám formátumban, ahol yy év, mm a hónap és nnnn sorfolytonosan növekvő számsor, ami nem lehet nulla.
 LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
 MergeOriginThirdparty=Duplikált partner (a partnert törlésre kerül)
 MergeThirdparties=Partnerek egyesítése
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Partnerek egyesítése megtörtént
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Kereskedelmi képviselő bejelentkezés
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=Hiba történt a partner törlésekor. Ellenőrizd a log-ban. A változtatás visszavonva.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Új vásárló vagy beszállító javasolt a megkettőzött kóddal
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 6b4e02bb9fd..b88c1a9ce57 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -31,7 +31,7 @@ Credit=Hitel
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net gyűjtött
 AmountHTVATRealPaid=Net fizetett
-VATToPay=ÁFA értékesít
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF kifizetések
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Visszatérítés
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Mutasd ÁFA fizetési
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Magában foglalja mindazokat a tényleges kifizetések kézhez kapott számlák az ügyfelektől. <br> - Ennek alapja a fizetési határidőn ilyen számlák <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Jelentés a harmadik fél IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Jelentés a harmadik fél IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Lásd a jelentés <b>%sVAT encasement%s</b> egy standard számítási
 SeeVATReportInDueDebtMode=Lásd a jelentés <b>%sVAT a flow%s</b> egy számítást egy opció az áramlási
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- Az anyagi javak, tartalmazza az ÁFA számlák alapján a számla dátumát.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- A szolgáltatások, a jelentés tartalmaz ÁFA számlák miatt, fizetett vagy nem, a számla alapján a dátumot.
-RulesVATDueProducts=- Az anyagi javak, tartalmazza az ÁFA számlák alapján a számla dátumát.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Megjegyzés: A tárgyi eszközök, nem szabad használni a szállítás időpontját, hogy igazságosabb.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%% / Számla
 NotUsedForGoods=Nem használt termékek
 ProposalStats=Statisztika javaslatok
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Könyvelési periódus
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index c1bd82d8ade..ed8841745f0 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Nincsenek feladatok
 CronPriority=Prioritás
 CronLabel=Felirat
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Küldő
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index b8cd6b014b1..0a254aeb7a4 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr LDAP-egyezés nem teljes.
 ErrorLDAPMakeManualTest=Egy. LDIF fájlt keletkezett %s könyvtárban. Próbálja meg kézzel betölteni a parancssorból, hogy több információt hibákat.
 ErrorCantSaveADoneUserWithZeroPercentage=Nem lehet menteni akciót &quot;az alapszabály nem kezdődött el&quot;, ha a területen &quot;történik&quot; is ki van töltve.
 ErrorRefAlreadyExists=Ref használt létrehozására már létezik.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/hu_HU/loan.lang b/htdocs/langs/hu_HU/loan.lang
index 951a4faac9c..b4b8daa2e4a 100644
--- a/htdocs/langs/hu_HU/loan.lang
+++ b/htdocs/langs/hu_HU/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index e090ebea0e4..a10d9fded7e 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index af104017a17..f76aa73c216 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=%s paraméter nincs definiálva
 ErrorUnknown=Ismeretlen hiba
 ErrorSQL=SQL Hiba
 ErrorLogoFileNotFound='%s' logo fájl nincs meg
-ErrorGoToGlobalSetup=A 'Vállalat/Szervezet' beállításokban javíthatja
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Menj a Modul beállításokhoz a javítás érdekében
 ErrorFailedToSendMail=Nemsikerült elküldeni a levelet (feladó=%s, címzett=%s)
 ErrorFileNotUploaded=A Fájl nem lett feltöltve. Ellenőrizd, hogy a méret nem haladja -e meg a maximum méretet, van -e elég szabad hely és hogy a célkönyvtárban nincs -e még egy ugyan ilyen nevü fájl.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Hiba '%s' számára nincs Áfa meghatároz
 ErrorNoSocialContributionForSellerCountry=Hiba, nincsenek meghatározva társadalombiztosítási és adóügyi adattípusok a '%s' ország részére.
 ErrorFailedToSaveFile=Hiba, nem sikerült a fájl mentése.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Oldalankénti rekordok száma
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Nincs jogosultsága ehhez a tevékenységhez
 SetDate=Dátum beállítása
 SelectDate=Válasszon egy dátumot
 SeeAlso=Lásd még a %s
 SeeHere=Lásd itt
+ClickHere=Kattintson ide
+Here=Here
 Apply=Alkalmaz
 BackgroundColorByDefault=Alapértelmezett háttérszin
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Kiválaszt
 Choose=Kiválaszt
 Resize=Átméretezés
+ResizeOrCrop=Resize or Crop
 Recenter=Újra középre igazít
 Author=Szerző
 User=Felhasználó
@@ -325,8 +328,10 @@ Default=Alaptértelmezett
 DefaultValue=Alaptértelmezett érték
 DefaultValues=Alapértelmezett érték
 Price=Ár
+PriceCurrency=Price (currency)
 UnitPrice=Egység ár
 UnitPriceHT=Egység ár (nettó)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Egység ár
 PriceU=E.Á.
 PriceUHT=E.Á. (nettó)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=E.Á. (adóval)
 Amount=Mennyiség
 AmountInvoice=Számla mennyiség
+AmountInvoiced=Amount invoiced
 AmountPayment=Fizetés mennyiség
 AmountHTShort=Mennyiség (nettó)
 AmountTTCShort=Mennyiség (bruttó)
@@ -353,6 +359,7 @@ AmountLT2ES=IRPF mennyiség
 AmountTotal=Teljes mennyiség
 AmountAverage=Átlag mennyiség
 PriceQtyMinHT=Minimum mennyiségi ár (nettó)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Százalék
 Total=Végösszeg
 SubTotal=Részösszeg
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=ÁFA érték
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Átlag
 Sum=Szumma
@@ -419,7 +428,8 @@ ActionRunningShort=Folyamatban
 ActionDoneShort=Befejezett
 ActionUncomplete=Befejezetlen
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Vállalat/Szervezet
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kapcsolat/cím ehhez a harmadik félhez
 ContactsAddressesForCompany=Kapcsolat/cím ehhez a harmadik félhez
 AddressesForCompany=Cím ehhez a harmadik félhez
@@ -427,6 +437,9 @@ ActionsOnCompany=Ezzel a harmadik féllel kapcsolatos események
 ActionsOnMember=Események ezzel a taggal kapcsolatban
 ActionsOnProduct=Events about this product
 NActionsLate=%s késés
+ToDo=Tennivaló
+Completed=Completed
+Running=Folyamatban
 RequestAlreadyDone=A kérés már rögzítve
 Filter=Szűrő
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Figyelem, karbantartási mód, csak <b>%s</b> jel
 CoreErrorTitle=Rendszerhiba
 CoreErrorMessage=Sajnálatos hiba történt. Lépjen kapcsolatba a rendszergazdával a naplófájlok megtekintéséhez vagy állítsa 0-ra a $dolibarr_main_prod=1 paramétert részletesebb információkért !
 CreditCard=Hitelkártya
+ValidatePayment=Jóváhagyott fizetés
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=<b>%s</b>-al jelölt mezők kötelezőek
 FieldsWithIsForPublic=<b>%s</b>-al jelölt mezők publikusak. Ha ezt nem akarja jelölje be a "Publikus" dobozt.
 AccordingToGeoIPDatabase=(GeoIP converzió szerint)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Kapcsolódó objektumok
 ClassifyBilled=Minősítse kiszámlázottként
+ClassifyUnbilled=Classify unbilled
 Progress=Előrehaladás
-ClickHere=Kattintson ide
 FrontOffice=Front office
 BackOffice=Támogató iroda
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekt
 Projects=Projektek
 Rights=Engedélyek
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Hétfő
 Tuesday=Kedd
@@ -890,7 +907,7 @@ Select2MoreCharacters=vagy több karakter
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=További eredmények betöltése...
 Select2SearchInProgress=Keresés folyamatban...
-SearchIntoThirdparties=Partnerek
+SearchIntoThirdparties=Partner
 SearchIntoContacts=Kapcsolatok
 SearchIntoMembers=Tagok
 SearchIntoUsers=Felhasználók
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Mindenki
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Hozzárendelve
diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
index 55244fe07f7..f483e1a3ec6 100644
--- a/htdocs/langs/hu_HU/margins.lang
+++ b/htdocs/langs/hu_HU/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 55b10d1b68c..6027b2e0c2d 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -9,12 +9,10 @@ UserNotLinkedToMember=A felhasználó nem kapcsolódik egy tagja
 ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Tagok Jegyek
 FundationMembers=Alapítvány tagjai
-ListOfValidatedPublicMembers=Listája hitelesített nyilvános tagjai
+ListOfValidatedPublicMembers=Hitelesített nyilvános tagok listája
 ErrorThisMemberIsNotPublic=Ez a tag nem nyilvános
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Egy másik tag (név: <b>%s,</b> bejelentkezés: <b>%s)</b> már kapcsolódik egy harmadik fél <b>%s.</b> Vegye meg ezt a linket elsősorban azért, mert egy harmadik fél nem köthető csak egy tag (és fordítva).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Biztonsági okokból, meg kell szerkeszteni engedéllyel rendelkezik a minden felhasználó számára, hogy képes összekapcsolni egy tag a felhasználó, hogy nem a tiéd.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Tartalma a kártya tagja
 SetLinkToUser=Link a Dolibarr felhasználó
 SetLinkToThirdParty=Link egy harmadik fél Dolibarr
 MembersCards=Tagok névjegykártyák
@@ -23,13 +21,13 @@ MembersListToValid=Tagok listája tervezet (érvényesíteni kell)
 MembersListValid=Érvényes tagok listája
 MembersListUpToDate=Listája érvényes tagok naprakész előfizetés
 MembersListNotUpToDate=Tagok listája érvényes jegyzési elavult
-MembersListResiliated=List of terminated members
+MembersListResiliated=Kilépett tagok listája
 MembersListQualified=Képesítéssel rendelkező tagok listája
 MenuMembersToValidate=Draft tagjai
 MenuMembersValidated=Jóváhagyott tagjai
 MenuMembersUpToDate=Naprakész tagoknak
 MenuMembersNotUpToDate=Elavult tagok
-MenuMembersResiliated=Terminated members
+MenuMembersResiliated=Kilépett tagok
 MembersWithSubscriptionToReceive=Tagok előfizetés kapni
 DateSubscription=Előfizetés dátum
 DateEndSubscription=Előfizetés záró dátum
@@ -50,9 +48,9 @@ MemberStatusActiveLateShort=Lejárt
 MemberStatusPaid=Előfizetés naprakész
 MemberStatusPaidShort=Naprakész
 MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusResiliatedShort=Kilépett
 MembersStatusToValid=Draft tagjai
-MembersStatusResiliated=Terminated members
+MembersStatusResiliated=Kilépett tagok
 NewCotisation=Új hozzájárulás
 PaymentSubscription=Új járulékfizetési
 SubscriptionEndDate=Előfizetés zárónapjának
@@ -72,7 +70,7 @@ ListOfSubscriptions=Előfizetések listája
 SendCardByMail=Elküldöm e-mailben
 AddMember=Create member
 NoTypeDefinedGoToSetup=Nem tagja típust nem definiál. Lépjen be a Setup - Tagok típusok
-NewMemberType=Új tag írja
+NewMemberType=Új tagtípus
 WelcomeEMail=Üdvözöljük az e-mail
 SubscriptionRequired=Előfizetés szükséges
 DeleteType=Törlés
@@ -108,17 +106,33 @@ PublicMemberCard=Tagállamban közvélemény-kártya
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Mutasd előfizetés
-SendAnEMailToMember=Küldés e-mailben tájékoztatást tagja
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Tartalma a kártya tagja
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=E-mail tárgya a tagállamok autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=E-mail szolgáltatás tagja autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=E-mail tárgya a tagállamok hitelesítési
-DescADHERENT_MAIL_VALID=E-mail a tagállamok hitelesítési
-DescADHERENT_MAIL_COTIS_SUBJECT=E-mail tárgya az előfizetéses
-DescADHERENT_MAIL_COTIS=E-mail szolgáltatás előfizetése
-DescADHERENT_MAIL_RESIL_SUBJECT=E-mail tárgya a tagállamok resiliation
-DescADHERENT_MAIL_RESIL=E-mail szolgáltatás tagja resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Feladó e-mail címet automatikus e-maileket
 DescADHERENT_ETIQUETTE_TYPE=Oldal formátuma címkék
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -127,7 +141,7 @@ DescADHERENT_CARD_HEADER_TEXT=Nyomtatott szöveg tetején tag kártyák
 DescADHERENT_CARD_TEXT=Nyomtatott szöveg tagja kártyák (igazítsa a bal)
 DescADHERENT_CARD_TEXT_RIGHT=Nyomtatott szöveg tagja kártyák (igazítása jobb oldalon)
 DescADHERENT_CARD_FOOTER_TEXT=Nyomtatott szöveg alján tag kártyák
-ShowTypeCard=Mutasd típusú &quot;%s&quot;
+ShowTypeCard=Mutasd a '%s' típust
 HTPasswordExport=htpassword fájl létrehozása
 NoThirdPartyAssociatedToMember=Harmadik félnek nem társult a tag
 MembersAndSubscriptions= A tagok és Subscriptions
@@ -151,7 +165,7 @@ MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Tagok száma
 NoValidatedMemberYet=Nem hitelesített tagok található
 MembersByCountryDesc=Ez a képernyő megmutatja statisztikát tagok országokban. Grafikus függ azonban a Google online grafikon szolgáltatást és csak akkor elérhető, ha az internet kapcsolat működik.
-MembersByStateDesc=Ez a képernyő megmutatja statisztikát tagok állam / tartomány / kantonban.
+MembersByStateDesc=Ez a képernyő a tagok statisztikát mutatja állam / tartomány / kanton szerint.
 MembersByTownDesc=Ez a képernyő megmutatja statisztikát tagok városban.
 MembersStatisticsDesc=Válassza ki a kívánt statisztikákat olvasni ...
 MenuMembersStats=Statisztika
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 574fc34fbbf..965fd5825b0 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Üzenet érvényesített fizetési vissza oldal
 MessageKO=Üzenet a törölt kifizetési visszatérés oldal
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Csatolt objektum
 NbOfActiveNotifications=Figyelmeztetések száma (nyugtázott emailek száma)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Első feltöltés
 CancelUpload=Mégsem feltöltési
 FileIsTooBig=Fájlok túl nagy
 PleaseBePatient=Kerjük legyen türelemmel...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Cím
 WEBSITE_DESCRIPTION=Leírás
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/hu_HU/paypal.lang b/htdocs/langs/hu_HU/paypal.lang
index 4eacbd9d4f5..2164893cb57 100644
--- a/htdocs/langs/hu_HU/paypal.lang
+++ b/htdocs/langs/hu_HU/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Ez a tranzakció id: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add az url a Paypal fizetési amikor a dokumentumot postán
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index b6fc36340b5..d28377946c5 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Termék vagy Szolgáltatás
 ProductsAndServices=Termékek és Szolgáltatások
 ProductsOrServices=Termékek vagy Szolgáltatások
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Biztos törölni akarja ezt a termékvonalat?
 ProductSpecial=Különleges
 QtyMin=Min. mennyiség
 PriceQtyMin=A min. mennyiség ára (áreng. nélkül)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=ÁFA mértéke (beszállító/termék)
 DiscountQtyMin=A mennyiséghez tartozó alapértelmezett engedmény
 NoPriceDefinedForThisSupplier=Nincs ár/mennyiség meghatározva ehhez a beszállítóhoz/termékhez
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 6f1ca47124d..b82ed0d3565 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Projekt kapcsolatok
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Minden projekt
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
 ProjectsDesc=Ez a nézet minden projektet tartalmaz.
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Töltött idő
 MyTimeSpent=Az én eltöltött időm
+BillTime=Bill the time spent
 Tasks=Feladatok
 Task=Feladat
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=A projekthez tartozó cselekvések listája
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Heti projekt aktivitás
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Havi projekt aktivitás
 ActivityOnProjectThisYear=Évi projekt aktivitás
 ChildOfProjectTask=Projekt/Feladat gyermeke
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Nem tulajdonosa ennek a privát projektnek
 AffectedTo=Érinti
 CantRemoveProject=Ezt a projektet nem lehet eltávolítani mert valamilyen másik projekt hivatkozik rá. Referensek fül.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/hu_HU/propal.lang b/htdocs/langs/hu_HU/propal.lang
index f0bb2d845d4..c862fca765f 100644
--- a/htdocs/langs/hu_HU/propal.lang
+++ b/htdocs/langs/hu_HU/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Aláírt (szükséges számlázási)
 PropalStatusNotSigned=Nem írta alá (zárt)
 PropalStatusBilled=Kiszámlázott
 PropalStatusDraftShort=Tervezet
+PropalStatusValidatedShort=Hitelesítetve
 PropalStatusClosedShort=Zárva
 PropalStatusSignedShort=Aláírt
 PropalStatusNotSignedShort=Nem írták alá
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index da8394934f3..7e6d0bb0a25 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Raktár módosítása
 MenuNewWarehouse=Új raktár
 WarehouseSource=Forrás raktár
 WarehouseSourceNotDefined=Nincs meghatározva raktár,
+AddWarehouse=Create warehouse
 AddOne=Egyet adjon hozzá
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Cél raktár
 ValidateSending=Küldés jóváhagyása
 CancelSending=Küldés megszakítása
@@ -22,8 +24,9 @@ Movements=Mozgások
 ErrorWarehouseRefRequired=Raktár referencia név szükséges
 ListOfWarehouses=Raktárak listája
 ListOfStockMovements=Készlet mozgatások listája
+ListOfInventories=List of inventories
 MovementId=Movement ID
-StockMovementForId=Movement ID %d
+StockMovementForId=Mozgatás azonosítója %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Raktárak
 Location=Hely
@@ -36,7 +39,7 @@ Units=Egységek
 Unit=Egység
 StockCorrection=Stock correction
 CorrectStock=Jelenlegi készlet
-StockTransfer=Stock transfer
+StockTransfer=Készlet áthelyezés
 TransferStock=Készlet mozgatása
 MassStockTransferShort=Tömeges készletmozgatás
 StockMovement=Készletmozgás
@@ -45,12 +48,12 @@ LabelMovement=Mozgás címkéje
 NumberOfUnit=Egységek száma
 UnitPurchaseValue=Vételár
 StockTooLow=Készlet alacsony
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=A készlet határérték alá (%s) csökkent
 EnhancedValue=Érték
 PMPValue=Súlyozott átlagár
 PMPValueShort=SÁÉ
 EnhancedValueOfWarehouses=Raktárak értéke
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+UserWarehouseAutoCreate=Felhasználói raktár automatikus létrehozása felhasználó hozzáadásakor
 AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
 IndependantSubProductStock=A termék és származtatott elemeinek készlete egymástól függetlenek
 QtyDispatched=Mennyiség kiküldése
@@ -65,9 +68,9 @@ DeStockOnShipment=Tényleges készlet csökkentése kiszállítás jóváhagyás
 DeStockOnShipmentOnClosing=Csökkentse a valós készletet a "kiszállítás megtörtént" beállítása után
 ReStockOnBill=Tényleges készlet növelése számla/hitel jóváhagyásakor
 ReStockOnValidateOrder=Tényleges készlet növelése beszállítótól való rendelés jóváhagyásakor
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+ReStockOnDispatchOrder=Tényleges készlet növelése manuális raktárba való feladáskor miután a beszállítói rendelés beérkezett
 OrderStatusNotReadyToDispatch=A rendelés még nincs olyan állapotban, hogy kiküldhető legyen a raktárba.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+StockDiffPhysicTeoric=Magyarázat a fizikai és elméleti készlet közötti eltérésről
 NoPredefinedProductToDispatch=Nincs előredefiniált termék ehhez az objektumhoz. Tehát nincs szükség raktárba küldésre.
 DispatchVerb=Kiküldés
 StockLimitShort=Figyelmeztetés küszöbértéke
@@ -123,7 +126,7 @@ NbOfProductBeforePeriod=A %s termékből rendelkezésre álló mennyiség a kiv
 NbOfProductAfterPeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s után)
 MassMovement=Tömeges mozgatás
 SelectProductInAndOutWareHouse=Válasszon egy terméket, a mennyiségét, egy származási raktárat valamint egy cél raktárat, majd kattintson az "%s"-ra. Amint minden szükséges mozgatással elkészült, kattintson a "%s"-ra.
-RecordMovement=Record transfer
+RecordMovement=Mozgatás rögzítése
 ReceivingForSameOrder=Megrendelés nyugtái
 StockMovementRecorded=Rögzített készletmozgások
 RuleForStockAvailability=A készlet tartásának szabályai
@@ -135,7 +138,7 @@ DateMovement=Date of movement
 InventoryCode=Mozgás vagy leltár kód
 IsInPackage=Csomag tartalmazza
 WarehouseAllowNegativeTransfer=A készlet lehet negatív
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferIsNotEnough=Nincs elegendő készlete a forrásraktárban és a beállítások nem teszik lehetővé a negatív készletet
 ShowWarehouse=Raktár részletei
 MovementCorrectStock=A %s termék készlet-módosítása
 MovementTransferStock=A %s termék készletének mozgatása másik raktárba
@@ -143,7 +146,7 @@ InventoryCodeShort=Lelt./Mozg. kód
 NoPendingReceptionOnSupplierOrder=Nincs függőben lévő bevételezés mivel létezik nyitott beszállítói megrendelés
 ThisSerialAlreadyExistWithDifferentDate=A (<strong>%s</strong>) tétel/cikkszám már létezik de eltérő lejárati/eladási határidővel (jelenleg <strong>%s</strong> az imént  felvitt érték ellenben <strong>%s</strong>).
 OpenAll=Nyitott minden műveletre
-OpenInternal=Open only for internal actions
+OpenInternal=Nyitott csak belső műveletek számára
 UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
@@ -153,12 +156,12 @@ AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
 InventoryDate=Inventory date
 NewInventory=New inventory
-inventorySetup = Inventory Setup
+inventorySetup = Készlet beállítása
 inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
+inventoryTitle=Készletnyilvántartás
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 inventoryCreateDelete=Create/Delete inventory
@@ -171,10 +174,10 @@ inventoryConfirmCreate=Készít
 inventoryOfWarehouse=Inventory for warehouse : %s
 inventoryErrorQtyAdd=Error : one quantity is leaser than zero
 inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryWarningProductAlreadyExists=Ez a termék már szerepel a listában
 SelectCategory=Kategória szűrés
 SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
+inventoryOnDate=Készletnyilvántartás
 INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
@@ -186,7 +189,7 @@ TheoricalValue=Theorique qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RealQty=Real Qty
-RealValue=Real Value
+RealValue=Valós érték
 RegulatedQty=Regulated Qty
 AddInventoryProduct=Add product to inventory
 AddProduct=Hozzáadás
diff --git a/htdocs/langs/hu_HU/stripe.lang b/htdocs/langs/hu_HU/stripe.lang
index e0c2ed30e52..3f7283c96e9 100644
--- a/htdocs/langs/hu_HU/stripe.lang
+++ b/htdocs/langs/hu_HU/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
index 76dac84374d..3651ebd29f1 100644
--- a/htdocs/langs/hu_HU/trips.lang
+++ b/htdocs/langs/hu_HU/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Kilóméterek száma
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index ffff17d1bed..e9d5791516c 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -69,8 +69,8 @@ InternalUser=Belső felahsználó
 ExportDataset_user_1=Dolibarr felhasználók és tulajdonságaik
 DomainUser=Domain felhasználók %s
 Reactivate=Újra aktiválás
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Engedélyek megadva mert örökölte az egyik csoporttól.
 Inherited=Örökölve
 UserWillBeInternalUser=Létrehozta felhasználó lesz egy belső felhasználó (mivel nem kapcsolódik az adott harmadik fél)
@@ -93,6 +93,7 @@ NameToCreate=Létrehozandó harmadik fél neve
 YourRole=Szerepkörei
 YourQuotaOfUsersIsReached=Aktív felhasználói kvóta elérve!
 NbOfUsers=Nb felhasználók
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Csak egy superadmin lehet downgrade 1 superadmin
 HierarchicalResponsible=Felettes
 HierarchicView=Hierachia nézet
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 6fbbcee6a19..b895e197382 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=A honlap törlése
 ConfirmDeleteWebsite=Biztos benne, hogy le akarja törölni a honlapot? Az összes oldal és tartalom el fog veszni!
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Olvas
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 30b470ef8b3..619a99d9cd2 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Feldolgozásához
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Harmadik fél Bank kód
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Jóváírtan osztályozva
 ClassCreditedConfirm=Biztos, hogy jóvírtan akarja osztályozni a visszavonást a bankszámlájáról?
 TransData=Dátum Átviteli
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 49bc5c7852f..077b9fc9f8e 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Tabel Akun
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Tipe Dokumen
 Docdate=Tanggal
 Docref=Referensi
-Code_tiers=Pihak ketiga
 LabelAccount=Label Akun
 LabelOperation=Label operation
 Sens=Sen
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Pembayaran Nota Pelanggan
-ThirdPartyAccount=Akun pihak ketiga
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Kesalahan, Anda tidak dapat menghapus akun akun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Terapkan kategori secara massal
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Rumus
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Format ekspor yang diseting tidak sesuai untuk halaman ini
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 8eaf325ba90..4c86133a8cc 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Pengguna & Grup
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margin
 Module59000Desc=Module to manage margins
 Module60000Name=Komisi
 Module60000Desc=Module to manage commissions
+Module62000Name=Istilah Ekonomi Internasional
+Module62000Desc=Tambah fitur untuk mengatur Istilah Ekonomi Internasional
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Membaca Nota Pelanggan
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=Ringkasan Sistem Informasi
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Tampilkan Logo dimenu kiri
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Nama
 CompanyAddress=Alamat
 CompanyZip=Kode Pos
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 02db5741e98..2fe8e87f8a9 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 1b905bd1169..125f8cd1d52 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Dibayar kembali
 DeletePayment=Hapus pembayaran
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Semua pembayaran untuk semua pemasok / supplier
 ReceivedPayments=Semua pembayaran yang diterima
 ReceivedCustomersPayments=Semua pembayaran yang diterima dari semua pelanggan
@@ -91,7 +92,7 @@ PaymentAmount=Jumlah pembayaran
 ValidatePayment=Validasi pembayaran
 PaymentHigherThanReminderToPay=Pengingat untuk pembayaran yang lebih tinggi
 HelpPaymentHigherThanReminderToPay=Untuk diperhatikan, jumlah pembayaran baik yang hanya satu atau lebih dari satu tagihan yang lebih banyak dan mempunyai sisa untuk dibayar. <br> Ubah entri Anda, jika tidak mengkonfirmasikan dan terpikir untuk membuat sebuat catatan kredit kelebihan yang diterima untuk setiap tagihan yang mempunyai kelebihan bayar.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Menggolongkan 'Telah dibayar'
 ClassifyPaidPartially=Menggolongkan 'Telah dibayarkan sebagian'
 ClassifyCanceled=Menggolongkan 'Ditinggalkan'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Ubah kedalam diskon untuk selanjutnya
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Masukkan pembayaran yang diterima dari pelanggan
 EnterPaymentDueToCustomer=Buat tempo pembayaran ke pelanggan
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Konsep (harus di validasi)
 BillStatusPaid=Dibayar
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Dibayar (bersedia untuk tagihan terakhir)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Diabaikan
 BillStatusValidated=Sudah divalidasi (harus sudah dibayar)
 BillStatusStarted=Dimulai
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 2eae79e2146..c1757046f26 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Posisi
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposal
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Suplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 929146225cc..593293bbf7f 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -31,7 +31,7 @@ Credit=Kredit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 23daf5b607e..d58f659cbf8 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Dari
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/id_ID/loan.lang b/htdocs/langs/id_ID/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/id_ID/loan.lang
+++ b/htdocs/langs/id_ID/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 348aedc2280..a947035bbb8 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 5ee0036f3b6..d06768035f8 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Harga
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Jumlah
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Jumlah pembayaran
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validasi pembayaran
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Izin
+LineNb=Line no.
+IncotermLabel=Istilah Ekonomi Internasional
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Pihak Ketiga
 SearchIntoContacts=Contacts
 SearchIntoMembers=Anggota
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Ditugaskan untuk
diff --git a/htdocs/langs/id_ID/margins.lang b/htdocs/langs/id_ID/margins.lang
index 08ef80f3fbf..af89b4a7082 100644
--- a/htdocs/langs/id_ID/margins.lang
+++ b/htdocs/langs/id_ID/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 23cf51f2172..5cb7eda64b8 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index d308335ef13..08e48dcc66d 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Mohon tunggu
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Keterangan
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/id_ID/paypal.lang b/htdocs/langs/id_ID/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/id_ID/paypal.lang
+++ b/htdocs/langs/id_ID/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 6f4499d565e..1df9efe0083 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 2280edbf6ab..7445e3f4cc4 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/id_ID/propal.lang b/htdocs/langs/id_ID/propal.lang
index 797cf631fa5..27baa165daa 100644
--- a/htdocs/langs/id_ID/propal.lang
+++ b/htdocs/langs/id_ID/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Konsep
+PropalStatusValidatedShort=Divalidasi
 PropalStatusClosedShort=Ditutup
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 608165ea756..55f007ecfeb 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index ab423bc0e77..90c26c8cd8f 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/id_ID/stripe.lang b/htdocs/langs/id_ID/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/id_ID/stripe.lang
+++ b/htdocs/langs/id_ID/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang
index e8a667e10a0..792119bd1e6 100644
--- a/htdocs/langs/id_ID/trips.lang
+++ b/htdocs/langs/id_ID/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index 605e0001eb5..7ef9a152ccc 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -69,8 +69,8 @@ InternalUser=Pengguna internal
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index 325238e84e9..e3f72670cb5 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 16532eadc45..36ddabc6c69 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Náttúra
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Velta
 AccountingJournalType3=Innkaup
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 0c0838ddbc1..3809109931d 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Villa, get ekki notað valkost @ ef röð (YY) (mm) eða (áááá) (mm) er ekki í maska.
 UMask=UMask breytu fyrir nýja skrá á Unix / Linux / BSD skrá kerfi.
 UMaskExplanation=Þessi stika gerir þér kleift að tilgreina heimildir sjálfgefið á skrá skapa við Dolibarr á miðlara (á senda til dæmis). <br> Það hlýtur að vera octal gildi (til dæmis, 0666 þýðir að lesa og skrifa fyrir alla). <br> Þessi stika er gagnslaus á Gluggakista framreiðslumaður.
-SeeWikiForAllTeam=Taka a líta á the wiki síðuna fyrir fullan lista af öllum aðilum og samtökum þeirra
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Töf á flýtiminni útflutningur svar í sekúndum (0 eða tómt fyrir ekkert skyndiminni)
 DisableLinkToHelpCenter=Fela tengilinn <b>"Vantar þig aðstoð eða stuðning"</b> á innskráningarsíðu
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Notendur & hópar
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Gagnagrunnur
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Lesa reikningum
@@ -833,11 +838,11 @@ Permission1251=Setja massa innflutningi af ytri gögn inn í gagnagrunn (gögn 
 Permission1321=Útflutningur viðskiptavina reikninga, eiginleika og greiðslur
 Permission1322=Reopen a paid bill
 Permission1421=Útflutningur viðskiptavina pantanir og eiginleika
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Greiðsla skilyrði
 DictionaryPaymentModes=Greiðsla stillingar
 DictionaryTypeContact=Hafðu tegundir
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (raf-og rafeindabúnaðarúrgang)
 DictionaryPaperFormat=Pappír snið
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VSK Stjórn
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Sjálfgefið er fyrirhuguð VSK er 0 sem hægt er að nota til tilvikum eins og samtökum, einstaklingum OU lítil fyrirtæki.
-VATIsUsedExampleFR=Í Frakklandi, þá þýðir það fyrirtæki eða stofnanir sem hafa raunveruleg reikningsár kerfi (Simplified raunverulegur eða venjulegt alvöru). Kerfi þar sem VSK er lýst.
-VATIsNotUsedExampleFR=Í Frakklandi, það þýðir samtök sem eru ekki VSK lýst eða fyrirtæki, stofnanir eða frjálslynda starfsstéttum sem hafa valið ör framtak reikningsár kerfi (VSK í kosningaréttur) og greidd kosningaréttur VSK án VSK yfirlýsingu. Þetta val mun birta tilvísunarnúmer "Non viðeigandi VSK - list-293B af CGI" á reikningum.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Verð
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Bílstjóri tegund
 SummarySystem=System Information yfirlit
 SummaryConst=Listi yfir allar Dolibarr skipulag breytur
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard matseðill framkvæmdastjóri
 DefaultMenuSmartphoneManager=Smartphone matseðill framkvæmdastjóri
 Skin=Skin þema
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Varanleg leita mynd til vinstri valmynd
 DefaultLanguage=Sjálfgefið tungumál til að nota (tungumálið code)
 EnableMultilangInterface=Virkja Fjöltyng tengi
 EnableShowLogo=Sýna merki á vinstri valmynd
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Nafn
 CompanyAddress=Heimilisfang
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Kerfi upplýsingar er ýmis tæknilegar upplýsingar sem þú færð í lesa aðeins háttur og sýnileg Aðeins kerfisstjórar.
 SystemAreaForAdminOnly=Þetta svæði er í boði fyrir notendur stjórnandi aðeins. Ekkert af Dolibarr leyfi getur dregið þessi mörk.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Þú getur valið hvert stika sem tengist Dolibarr útlit og feel hér
 AvailableModules=Available app/modules
 ToActivateModule=Til að virkja mát, fara á svæðinu skipulag (Home-> Uppsetning-> mát).
@@ -1441,6 +1448,9 @@ SyslogFilename=Skráarnafn og slóði
 YouCanUseDOL_DATA_ROOT=Þú getur notað DOL_DATA_ROOT / dolibarr.log fyrir annálinn í Dolibarr "skjöl" skrá. Þú getur stillt mismunandi leið til að geyma þessa skrá.
 ErrorUnknownSyslogConstant=Constant %s  er ekki þekktur skrifað fasti
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Safnast mát skipulag
 DonationsReceiptModel=Snið af málefnið berst
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VSK vegna
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VSK er vegna: <br> - Á afhendingu / greiðslum fyrir vörur <br> - Um greiðslur fyrir þjónustu
 OptionVatDebitOptionDesc=VSK er vegna: <br> - Á afhendingu / greiðslum fyrir vörur <br> - Á nótum (skuldfærslu) fyrir þjónustu
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=Á afhendingu
 OnPayment=Um greiðslu
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Dagsetning reiknings notað
 Buy=Kaupa
 Sell=Selja
 InvoiceDateUsed=Dagsetning reiknings notað
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index fcd6df76d62..0b7ba3da88c 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Þú getur einnig bætt við eftirfarandi breytur til að sía
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Útflutningur dagbók
 ExtSites=Flytja ytri dagatöl
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Fjöldi dagatal
-AgendaExtNb=Dagatal nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=Slóð til að opna. Kvæmd skrá
 ExtSiteNoLabel=Engin lýsing
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index d67174c449e..efd9541aa1b 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Eyða greiðslu
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Birgjar greiðslur
 ReceivedPayments=Móttekin greiðslur
 ReceivedCustomersPayments=Greiðslur sem berast frá viðskiptavinum
@@ -91,7 +92,7 @@ PaymentAmount=Upphæð greiðslu
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Greiðsla hærri en áminning að borga
 HelpPaymentHigherThanReminderToPay=Attention, greiðslu magn af einni eða fleiri reikninga er hærra en annars staðar til að borga. <br> Breyta færslu þína staðfesta annað og hugsa um að búa til kredit mið af umfram fengið fyrir hverja overpaid reikninga.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Flokka 'Greiddur'
 ClassifyPaidPartially=Flokka 'Greiddur hluta'
 ClassifyCanceled=Flokka 'Yfirgefinn'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Umbreyta inn í framtíðina afsláttur
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Sláðu inn greiðslu frá viðskiptavini
 EnterPaymentDueToCustomer=Greiða vegna viðskiptavina
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Víxill (þarf að vera staðfest)
 BillStatusPaid=Greiddur
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Umreiknaðar í afslátt
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Yfirgefin
 BillStatusValidated=Staðfestar (þarf að vera greidd)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Upphæð krafa
 ExcessReceived=Umfram borist
+ExcessPaid=Excess paid
 EscompteOffered=Afsláttur í boði (greiðsla fyrir tíma)
 EscompteOfferedShort=Afsláttur
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Afslátt af lánsfé athugið %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Þess konar trúnaður er hægt að nota reikning fyrir staðfestingu þess
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New festa afsláttur
 NewRelativeDiscount=Nýr ættingi afsláttur
+DiscountType=Discount type
 NoteReason=Ath / Reason
 ReasonDiscount=Ástæða
 DiscountOfferedBy=Veitt
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill heimilisfang
 HelpEscompte=Þessi afsláttur er afsláttur veittur til viðskiptavina vegna greiðslu þess var áður litið.
 HelpAbandonBadCustomer=Þessi upphæð hefur verið yfirgefin (viðskiptavinur til vera a slæmur viðskiptavina) og er talið að sérstakar lausir.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index dfbf5f711a6..761479e52e1 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -43,7 +43,8 @@ Individual=Einstaklingur
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Móðurfélag
 Subsidiaries=Dótturfélög
-ReportByCustomers=Skýrsla viðskiptavina
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Skýrsla hlutfall
 CivilityCode=Civility kóða
 RegisteredOffice=Skráð skrifstofa
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Staða
 DefaultLang=Tungumál sjálfgefið
-VATIsUsed=VSK er notaður
-VATIsNotUsed=VSK er ekki notaður
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Tillögur
 OverAllOrders=Pantanir
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (Bân)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VSK-númer
-VATIntraShort=VSK-númer
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Setningafræði er í gildi
+VATReturn=VAT return
 ProspectCustomer=Prospect / viðskiptavinar
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Viðskiptavinur
 CustomerRelativeDiscount=Hlutfallsleg viðskiptavina afslátt
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Hlutfallsleg afsláttur
 CustomerAbsoluteDiscountShort=Alger afsláttur
 CompanyHasRelativeDiscount=Þessi viðskiptavinur hefur afslátt <b>af %s %%</b>
 CompanyHasNoRelativeDiscount=Þessi viðskiptavinur hefur ekki miðað afsláttur sjálfgefið
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Þessi viðskiptavinur er enn kredit athugasemdum eða fyrri innstæður <b>fyrir %s  %s </b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Þessi viðskiptavinur hefur ekki afslátt inneign í boði
-CustomerAbsoluteDiscountAllUsers=Alger afsláttur (veitir alla notendur)
-CustomerAbsoluteDiscountMy=Alger afsláttur (veitt við sjálfur)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Birgir
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=Nei Dolibarr aðgang
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Tengiliðir og eignir
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bankaupplýsingar
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Verðlag
 DeliveryAddress=Afhending heimilisfang
 AddAddress=Bæta við heimilisfangi
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Fara aftur numero með snið %s yymm-NNNN fyrir kóða viðskiptavina og %s yymm-NNNN fyrir númer birgja þar sem YY er ári, mm er mánuður og NNNN er röð án brot og ekki aftur snúið til 0.
 LeopardNumRefModelDesc=Viðskiptavinur / birgir númerið er ókeypis. Þessi kóði getur breytt hvenær sem er.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index b2d3b39130f..cca9918eb55 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -31,7 +31,7 @@ Credit=Greiðslukort
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net safnað
 AmountHTVATRealPaid=Net greitt
-VATToPay=VSK selur
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Greiðslur
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Sýna VSK greiðslu
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Það innheldur alla virka greiðslur reikninga sem berast frá viðskiptavini. <br> - Þetta er byggt á gjalddagi þessara reikninga <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Skýrsla um þriðja aðila IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Skýrsla um þriðja aðila IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Sjá <b>skýrslu %s VAT encasement %s </b> fyrir venjulega útreikninga
 SeeVATReportInDueDebtMode=Sjá <b>skýrslu %s VAT á% rennsli s</b> fyrir útreikninga með möguleika á rennsli
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- Fyrir eignir efni, nær það VSK reikninga á grundvelli dagsetningu reiknings.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Fyrir þjónustu í skýrslunni eru VSK reikninga vegna, greitt eða ekki, byggt á dagsetningu reiknings.
-RulesVATDueProducts=- Fyrir eignir efni, nær það VSK reikninga, byggt á dagsetningu reiknings.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Ath: Til að eign efni, ætti það að nota fæðingardag að vera fleiri sanngjarn.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/Reikningar
 NotUsedForGoods=Ekki nota á vörur
 ProposalStats=Tölur um tillögur
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 29a29ed92df..2d3b08fe463 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Forgangur
 CronLabel=Merki
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Frá
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 2d36993af48..70f72cc7258 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP samsvörun er ekki lokið.
 ErrorLDAPMakeManualTest=A. LDIF skrá hefur verið búin til í %s . Prófaðu að hlaða það handvirkt úr stjórn lína að hafa meiri upplýsingar um villur.
 ErrorCantSaveADoneUserWithZeroPercentage=Get ekki vistað aðgerð með "statut ekki farinn að" ef reitinn "gert með því að" er einnig fyllt.
 ErrorRefAlreadyExists=Ref notað sköpun er þegar til.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/is_IS/loan.lang b/htdocs/langs/is_IS/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/is_IS/loan.lang
+++ b/htdocs/langs/is_IS/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index deb40971af6..972af5ace7b 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 4450240c2bc..a0fca9fde2a 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Viðfang %s  ekki skilgreint
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Villa
 ErrorLogoFileNotFound=%s  Logo skrá 'fannst ekki
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Fara til Module skipulag til festa this
 ErrorFailedToSendMail=Ekki tókst að senda póst (sendandi = %s , símtól = %s )
 ErrorFileNotUploaded=Skrá var ekki send inn. Athugaðu að stærð hjartarskinn ekki fara yfir leyfileg mörk, sem laust pláss er í boði á diski og að það er ekki nú þegar skrá með sama nafni í þessari möppu.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Villa, enginn VSK hlutfall er skilgreind f
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Villa tókst að vista skrána.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Setja dagsetningu
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Smelltu hér
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default bakgrunnslit
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Velja
 Choose=Veldu
 Resize=Búa
+ResizeOrCrop=Resize or Crop
 Recenter=Endurmiðja
 Author=Author
 User=Notandi
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Sjálfgefið gildi
 DefaultValues=Default values
 Price=Verð
+PriceCurrency=Price (currency)
 UnitPrice=Eining verðs
 UnitPriceHT=Unit verð (nettó)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Eining verðs
 PriceU=UPP
 PriceUHT=UP (nettó)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Upphæð
 AmountInvoice=Invoice upphæð
+AmountInvoiced=Amount invoiced
 AmountPayment=Upphæð greiðslu
 AmountHTShort=Magn (nettó)
 AmountTTCShort=Magn (Inc skatt)
@@ -353,6 +359,7 @@ AmountLT2ES=Upphæð IRPF
 AmountTotal=Samtals upphæð
 AmountAverage=Meðalupphæð
 PriceQtyMinHT=Verð magn mín. (Að frádregnum skatti)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Prósenta
 Total=Samtals
 SubTotal=Millisamtala
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=VSK-hlutfall
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Meðaltal
 Sum=Summa
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Lokið
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Tengiliðir / adresses fyrir þessa þriðja aðila
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Actions um þessa þriðja aðila
 ActionsOnMember=Viðburðir um þennan notanda
 ActionsOnProduct=Events about this product
 NActionsLate=%s  seint
+ToDo=Til að gera
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Sía
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Aðvörun, ert þú í viðhald háttur, svo að
 CoreErrorTitle=Kerfi villa
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kreditkort
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Reitir <b>með %s </b> er nauðsynlegur
 FieldsWithIsForPublic=Reitir <b>með %s </b> eru birtar á almennings lista yfir meðlimi. Ef þú vilt þetta ekki skaltu athuga hvort "opinberar" reitinn.
 AccordingToGeoIPDatabase=(Samkvæmt GeoIP ummyndun)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Flokka billed
+ClassifyUnbilled=Classify unbilled
 Progress=Framfarir
-ClickHere=Smelltu hér
 FrontOffice=Front office
 BackOffice=Til baka skrifstofa
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Verkefni
 Rights=Heimildir
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Mánudagur
 Tuesday=Þriðjudagur
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Í þriðja aðila
 SearchIntoContacts=Tengiliðir
 SearchIntoMembers=Meðlimir
 SearchIntoUsers=Notendur
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Allir
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Áhrifum á
diff --git a/htdocs/langs/is_IS/margins.lang b/htdocs/langs/is_IS/margins.lang
index f3a5c207b1d..068b9c1e834 100644
--- a/htdocs/langs/is_IS/margins.lang
+++ b/htdocs/langs/is_IS/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 40ddd28efd3..b0e4a7a0740 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Listi yfir viðurkennd opinber meðlimir
 ErrorThisMemberIsNotPublic=Þessi aðili er ekki opinber
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Annar aðili <b>(nafn: %s , tenging: %s )</b> er nú þegar tengdur til þriðja <b>aðila %s .</b> Fjarlægja þennan tengil í fyrsta lagi vegna þriðja aðila má ekki vera bundin einungis meðlimur (og öfugt).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Af öryggisástæðum verður þú að vera veitt leyfi til að breyta öllum notendum að vera fær um að tengja félagi til notanda sem er ekki þinn.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Efni meðlimur kortið
 SetLinkToUser=Tengill á Dolibarr notanda
 SetLinkToThirdParty=Tengill á Dolibarr þriðja aðila
 MembersCards=Members prenta kort
@@ -108,17 +106,33 @@ PublicMemberCard=Aðildarríkin almenningi kort
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Sýna áskrift
-SendAnEMailToMember=Senda upplýsingar email til félagi
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Efni meðlimur kortið
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=Netfang efni fyrir aðildarríki autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=Tölvupóstur fyrir aðild autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=Netfang efni fyrir aðildarríki löggilding
-DescADHERENT_MAIL_VALID=Tölvupóstur fyrir aðild löggilding
-DescADHERENT_MAIL_COTIS_SUBJECT=Netfang efni fyrir áskrift
-DescADHERENT_MAIL_COTIS=Tölvupóstur fyrir áskrift
-DescADHERENT_MAIL_RESIL_SUBJECT=Netfang efni fyrir aðildarríki resiliation
-DescADHERENT_MAIL_RESIL=Tölvupóstur fyrir aðild resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sendandi Email fyrir sjálfvirka tölvupósti
 DescADHERENT_ETIQUETTE_TYPE=Snið af merki síðu
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 1739edd5be5..3eeb07a6f46 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Skilaboð á staðfest greiðslu aftur síðu
 MessageKO=Skilaboð á niður greiðslu aftur síðu
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Tengd mótmæla
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Byrja senda
 CancelUpload=Hætta við
 FileIsTooBig=Skrár er of stór
 PleaseBePatient=Vinsamlegast sýnið þolinmæði ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titill
 WEBSITE_DESCRIPTION=Lýsing
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/is_IS/paypal.lang b/htdocs/langs/is_IS/paypal.lang
index 78eba1f0181..c2709f2574b 100644
--- a/htdocs/langs/is_IS/paypal.lang
+++ b/htdocs/langs/is_IS/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Þetta er id viðskipta: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Bæta við slóð Paypal greiðslu þegar þú sendir skjal með pósti
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 5c21c8b2225..aac5945e14f 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Vara eða þjónusta
 ProductsAndServices=Vörur og þjónusta
 ProductsOrServices=Vara eða þjónusta
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Ertu viss um að þú viljir eyða þessari vöru línu
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price / Magn skilgreind fyrir þessa birgja / vara
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index c976d5c8845..5c21a2b2b72 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project tengiliðir
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Öll verkefni
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Þetta sýnir öll verkefni sem þú ert að fá að lesa.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Þetta sýnir öll verkefni og verkefni sem þú ert að fá að lesa.
 ProjectsDesc=Þetta sýnir öll verkefni (notandi heimildir veita þér leyfi til að skoða allt).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Þetta sýnir öll verkefni og verkefni sem þú ert að fá að lesa.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Tími
 MyTimeSpent=Minn tími var
+BillTime=Bill the time spent
 Tasks=Verkefni
 Task=Verkefni
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Listi yfir aðgerðir í tengslum við verkefnið
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Afþreying á verkefni í þessari viku
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Afþreying á verkefni í þessum mánuði
 ActivityOnProjectThisYear=Afþreying á verkefni á þessu ári
 ChildOfProjectTask=Barn verkefni / hlutverk
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Ekki eigandi þessa einka verkefni
 AffectedTo=Áhrifum á
 CantRemoveProject=Þetta verkefni er ekki hægt að fjarlægja eins og það er vísað af einhverjum öðrum hlutum (Reikningar, pantanir eða annað). Sjá Referers flipann.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/is_IS/propal.lang b/htdocs/langs/is_IS/propal.lang
index 9a463878f59..062b580f0be 100644
--- a/htdocs/langs/is_IS/propal.lang
+++ b/htdocs/langs/is_IS/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Undirritað (þarf greiðanda)
 PropalStatusNotSigned=Ekki skráð (lokað)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Víxill
+PropalStatusValidatedShort=Staðfest
 PropalStatusClosedShort=Loka
 PropalStatusSignedShort=Innsigli
 PropalStatusNotSignedShort=Ekki skráð
diff --git a/htdocs/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/is_IS/salaries.lang
+++ b/htdocs/langs/is_IS/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index c587c5facb1..000a7317a3a 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Breyta vörugeymsla
 MenuNewWarehouse=Nýr lager
 WarehouseSource=Heimild vörugeymsla
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Markmál vörugeymsla
 ValidateSending=Eyða sendingu
 CancelSending=Hætta við að senda
@@ -22,6 +24,7 @@ Movements=Hreyfing
 ErrorWarehouseRefRequired=Lager tilvísun nafn er krafist
 ListOfWarehouses=Listi yfir vöruhús
 ListOfStockMovements=Listi yfir hreyfingar lager
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/is_IS/stripe.lang b/htdocs/langs/is_IS/stripe.lang
index 3c76cf5cce2..ae525ef5107 100644
--- a/htdocs/langs/is_IS/stripe.lang
+++ b/htdocs/langs/is_IS/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang
index aa834266e35..9047f4b07ab 100644
--- a/htdocs/langs/is_IS/trips.lang
+++ b/htdocs/langs/is_IS/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Magn eða kílómetrar
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index 1c26670580b..d93334dfdc1 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -69,8 +69,8 @@ InternalUser=Innri notandi
 ExportDataset_user_1=notendur Dolibarr og eignir
 DomainUser=Lén notanda %s
 Reactivate=Endurvekja
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Heimild veitt vegna þess að arfur frá einni í hópnum notanda.
 Inherited=Arf
 UserWillBeInternalUser=Búið notandi vilja vera innri notanda (vegna þess að ekki tengd við ákveðna þriðja aðila)
@@ -93,6 +93,7 @@ NameToCreate=Nafn þriðja aðila til að stofna
 YourRole=hlutverk þín
 YourQuotaOfUsersIsReached=kvóta þinn af virkum notendum er náð!
 NbOfUsers=Nb notendur
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Aðeins superadmin getur lækkunar a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index 6b4e2ada84a..a5988f7f2af 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Lesa
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index d6fbb765662..85eec887369 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Til að ganga frá
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Í þriðja aðila bankakóði
-NoInvoiceCouldBeWithdrawed=Engin reikningur withdrawed með góðum árangri. Athugaðu að Reikningar eru fyrirtæki með gilt bann.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Flokka fært
 ClassCreditedConfirm=Ertu viss um að þú viljir að flokka þessa afturköllun berst sem lögð á bankareikning þinn?
 TransData=Date Sending
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 1d2e0a7915a..8abf4ecfda5 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -24,9 +24,9 @@ BackToChartofaccounts=Ritorna alla lista dell'account
 Chartofaccounts=Piano dei conti
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+InvoiceLabel=Etichetta fattura
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Altre informazioni
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account di contabilità predefinito per i serviz
 Doctype=Tipo documento
 Docdate=Data
 Docref=Riferimento
-Code_tiers=Terza parte
 LabelAccount=Etichetta account
 LabelOperation=Etichetta operazione
 Sens=Verso
@@ -169,18 +168,17 @@ DelYear=Anno da cancellare
 DelJournal=Giornale da cancellare
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Cancellare la voce nel Libro contabile 
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=Questo mostra le righe che sono collegate alle voci del piano dei conti e possono essere registrate nel piano contabile.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Pagamento fattura attiva
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Nuova transazione
 NumMvts=Numero della transazione
 ListeMvts=Lista dei movimenti
@@ -220,27 +218,31 @@ ErrorAccountancyCodeIsAlreadyUse=Errore, non puoi cancellare la voce del piano d
 MvtNotCorrectlyBalanced=Movimenti non correttamente bilanciati. Credito = %s. Debito = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transazioni scritte nel libro contabile
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=Lista di prodotti non collegati a nessun piano dei conti
 ChangeBinding=Cambia il piano dei conti
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Applica categorie di massa
 AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group
 CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Accounting journals
+AccountingJournals=Libri contabili
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Natura
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Vendite
 AccountingJournalType3=Acquisti
 AccountingJournalType4=Banca
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=Questo giornale è già in uso
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Alcune righe della fattura non sono collegato a un piano dei conti.
 ExportNotSupported=Il formato di esportazione configurato non è supportato in questa pagina
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index aad0645e49b..8164125ffa4 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -9,7 +9,7 @@ VersionExperimental=Sperimentale
 VersionDevelopment=Sviluppo
 VersionUnknown=Sconosciuta
 VersionRecommanded=Raccomandata
-FileCheck=Files integrity checker
+FileCheck=Controllo di integrità dei file
 FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
 FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
@@ -22,7 +22,7 @@ FilesMissing=File mancanti
 FilesUpdated=File aggiornati
 FilesModified=Files modificati
 FilesAdded=Files aggiunti
-FileCheckDolibarr=Check integrity of application files
+FileCheckDolibarr=Controlla l'integrità dei file dell'applicazione
 AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID di sessione
@@ -190,26 +190,26 @@ EncodeBinariesInHexa=Codificare dati binari in esadecimale
 IgnoreDuplicateRecords=Ignora errori per record duplicati (INSERT IGNORE)
 AutoDetectLang=Rileva automaticamente (lingua del browser)
 FeatureDisabledInDemo=Funzione disabilitata in modalità demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+FeatureAvailableOnlyOnStable=Feature disponibile solo nelle versioni stabili ufficiali
 BoxesDesc=I Widgets sono componenti che personalizzano le pagine aggiungendo delle informazioni.\nPuoi scegliere se mostrare il widget o meno cliccando 'Attiva' sulla la pagina di destinazione, o cliccando sul cestino per disattivarlo.
 OnlyActiveElementsAreShown=Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> .
 ModulesDesc=I moduli di Dolibarr definiscono quali funzionalità sono abilitate. Alcuni moduli, dopo la loro attivazione, richiedono dei permessi da abilitare agli utenti. Clicca su on/off per l'abilitazione del modulo.
 ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su siti web esterni...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Trova app/moduli esterni...
-ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopYourModule=Sviluppa il tuo modulo/app
 ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
 NewModule=Nuovo
 FreeModule=Free
-CompatibleUpTo=Compatible with version %s
+CompatibleUpTo=Compatibile con la versione %s
 NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 Updated=Aggiornato
 Nouveauté=Novelty
 AchatTelechargement=Aquista / Scarica
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
+GoModuleSetupArea=Per installare un nuovo modulo vai alla sezione moduli <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM
 DoliPartnersDesc=Elenco di aziende che forniscono moduli e funzionalità sviluppate su misura (Nota: chiunque sia esperto in programmazione PHP è in grado di fornire un contributo allo sviluppo per un progetto open source)
 WebSiteDesc=Siti Web in cui è possibile cercare altri moduli ...
@@ -241,7 +241,7 @@ OfficialDemo=Dolibarr demo online
 OfficialMarketPlace=Market ufficiale per moduli esterni e addon
 OfficialWebHostingService=Servizi di hosting web referenziati (Hosting Cloud)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Other resources
+OtherResources=Altre risorse
 ExternalResources=Risorse esterne
 SocialNetworks=Social Networks
 ForDocumentationSeeWiki=La documentazione per utenti e sviluppatori e le FAQ sono disponibili sul wiki di Dolibarr: <br/>Dai un'occhiata a <a href="%s" target="_blank"><b> %s</b></a>
@@ -257,7 +257,7 @@ Orientation=Orientamento
 SpaceX=Space X
 SpaceY=Space Y
 FontSize=Dimensione del testo
-Content=Content
+Content=Contenuto
 NoticePeriod=Periodo di avviso
 NewByMonth=New by month
 Emails=Email
@@ -320,7 +320,7 @@ YouCanSubmitFile=Per questo passaggio puoi inviare il file .zip del modulo qui:
 CurrentVersion=Versione attuale di Dolibarr
 CallUpdatePage=Vai alla pagina che aggiorna la struttura del database e dati su %s.
 LastStableVersion=Ultima versione stabile
-LastActivationDate=Latest activation date
+LastActivationDate=Ultima data di attivazione
 LastActivationAuthor=Ultimo
 LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Errore, non si può usare l'opzione @ se non c'è una sequenza {yy}{mm} o {yyyy}{mm} nello schema.
 UMask=Parametro umask per i nuovi file su Unix/Linux/BSD.
 UMaskExplanation=Questo parametro consente di definire i permessi impostati di default per i file creati da Dolibarr sul server (per esempio durante il caricamento).<br/>Il valore deve essere ottale (per esempio, 0.666 indica il permesso di lettura e scrittura per tutti).<br/>Questo parametro non si usa sui server Windows.
-SeeWikiForAllTeam=Date un'occhiata alla pagina wiki per la lista completa di tutti gli autori e la loro organizzazione
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Ritardo per il caching di esportazione (0 o vuoto per disabilitare la cache)
 DisableLinkToHelpCenter=Nascondi link <b>Hai bisogno di aiuto?</b> sulla pagina di accesso
 DisableLinkToHelp=Nascondi link  della guida online "<b>%s</b>"
@@ -350,7 +350,7 @@ AddCRIfTooLong=La lunghezza delle righe non viene controllata automaticamente. I
 ConfirmPurge=Vuoi davvero eseguire questa cancellazione?<br>Questa operazione eliminerà definitivamente tutti i dati senza possibilità di ripristino (ECM, allegati, ecc ...).
 MinLength=Durata minima
 LanguageFilesCachedIntoShmopSharedMemory=File Lang caricati nella memoria cache
-LanguageFile=Language file
+LanguageFile=File di Lingua
 ExamplesWithCurrentSetup=Esempi di funzionamento secondo la configurazione attuale
 ListOfDirectories=Elenco delle directory dei modelli OpenDocument
 ListOfDirectoriesForModelGenODT=Lista di cartelle contenenti file modello in formato OpenDocument.<br><br>Inserisci qui il percorso completo delle cartelle.<br>Digitare un 'Invio' tra ciascuna cartella.<br>Per aggiungere una cartella del modulo GED, inserire qui <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>I file in quelle cartelle devono terminare con <b>.odt</b> o <b>.ods</b>.
@@ -374,7 +374,7 @@ PDF=PDF
 PDFDesc=Si possono impostare tutte le opzioni globali relative alla generazione di file pdf
 PDFAddressForging=Regole per il forge di caselle di indirizzi
 HideAnyVATInformationOnPDF=Nascondi tutte le informazioni relative all'IVA sui pdf generati.
-PDFLocaltax=Rules for %s
+PDFLocaltax=Regole per %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Nascondi le descrizioni dei prodotti nel pdf generato
 HideRefOnPDF=Nascondi il ref. prodotto nei PDF generati
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
 MassConvert=Avvia conversione di massa
 String=Stringa
 TextLong=Testo Lungo
+HtmlText=Html text
 Int=Intero
 Float=Decimale
 DateAndTime=Data e ora
@@ -400,7 +401,7 @@ Boolean=booleano (una checkbox)
 ExtrafieldPhone = Tel.
 ExtrafieldPrice = Prezzo
 ExtrafieldMail = Email
-ExtrafieldUrl = Url
+ExtrafieldUrl = Indirizzo URL
 ExtrafieldSelect = Lista di selezione
 ExtrafieldSelectList = Seleziona dalla tabella
 ExtrafieldSeparator=Separatore (non è un campo)
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=La lista dei parametri deve contenere chiave univoca e valore.<br><br>Per esempio:<br>1, valore1<br>2, valore2<br>3, valore3<br>...
 ExtrafieldParamHelpradio=La lista dei parametri deve contenere chiave univoca e valore.<br><br>Per esempio:<br>1, valore1<br>2, valore2<br>3, valore3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Libreria utilizzata per generare PDF
-WarningUsingFPDF=Avviso: Il tuo <b>conf.php</b> contiene la direttiva <b>dolibarr_pdf_force_fpdf = 1.</b> Questo significa che si utilizza la libreria FPDF per generare file PDF. Questa libreria è obsoleta e non supporta un molte funzioni (Unicode, trasparenza dell'immagine, lingue cirillico, arabo e asiatico, ...), quindi potrebbero verificarsi errori durante la generazione di file PDF. <br> Per risolvere questo problema ed avere un supporto completo di generazione di file PDF, scarica <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , quindi commentare o rimuovere la riga <b>$ dolibarr_pdf_force_fpdf = 1,</b> e aggiungere invece <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
 LocalTaxDesc=Alcuni paesi applicano 2 or 3 tasse locali ad ogni fattura. Se questo è il caso, scegli il tipo di seconda e terza tassa ed il relativo valore. I possibili tipi sono:<br>1 : tassa locale applicata sui prodotti e servizi senza IVA (le tasse locali sono calcolate sull'importo al netto dell'IVA)<br>2 : tassa locale applicata sui prodotti e servizi IVA compresa (le tasse locali sono calcolate sull'importo + IVA) <br>3 : tassa locale applicata sui prodotti senza IVA (le tasse locali sono calcolate sull'importo al netto dell'IVA)<br>4 : tassa locale applicata sui prodotti IVA compresa (le tasse locali sono calcolate sull'importo + IVA)<br>5 : tassa locale applicata sui servizi senza IVA (le tasse locali sono calcolate sull'importo al netto dell'IVA)<br>6 : tassa locale applicata sui servizi IVA compresa (le tasse locali sono calcolate sull'importo + IVA)
 SMS=SMS
 LinkToTestClickToDial=Per testare l'indirizzo ClickToDial dell'utente <strong>%s</strong>, inserisci un numero di telefono
@@ -434,7 +435,7 @@ BarcodeInitForProductsOrServices=Mass barcode init or reset for products or serv
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %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?
+ConfirmEraseAllCurrentBarCode=Vuoi davvero eliminare tutti i valori attuali dei codici a barre?
 AllBarcodeReset=All barcode values have been removed
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
 EnableFileCache=Abilita file di cache
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=Attenzione: Alcuni providers(com Yahoo)  non ti consentono di inviare un'email da un altro server rispetto al server Yahoo se l'indirizzo email utilizzato come mittente è la tua email di Yahoo (come myemail@yahoo.com, myemail@yahoo.fr, ...). La tua configurazione corrente utilizza il server dell'applicazione per inviare e-mail, quindi alcuni destinatari (quello compatibile con il protocollo restrittivo DMARC) chiederanno a Yahoo se accettano la tua e-mail e Yahoo risponderà "no" perché il server non è un server Yahoo, quindi alcune delle tue email inviate potrebbero non essere accettate.<br> Se il tuo provider di posta elettronica (come Yahoo) ha questa restrizione, devi modificare l'impostazione di posta elettronica per scegliere l'altro metodo "server SMTP" e inserire il server SMTP e le credenziali fornite da Il tuo provider di posta elettronica (chiedere al tuo fornitore di Email di ottenere credenziali SMTP per il tuo account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Clicca per mostrare la descrizione
 DependsOn=A questo modulo serve il modulo
 RequiredBy=Questo modulo è richiesto dal modulo
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Allega file
 SendEmailsReminders=Invia promemoria agenda via email
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Utenti e gruppi
 Module0Desc=Gestione utenti/impiegati e gruppi
@@ -545,14 +548,14 @@ Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
 Module500Name=Spese speciali
 Module500Desc=Gestione delle sepse speciali (tasse, contributi, dividendi)
-Module510Name=Payment of employee wages
+Module510Name=Pagamento stipendi dipendenti
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Prestito
 Module520Desc=Gestione dei prestiti
 Module600Name=Notifiche di eventi lavorativi
 Module600Desc=Inviare notifiche EMail (generate da eventi aziendali) ad utenti (impostazione definita per ogni utente) o contatti di terze parti (impostazione definita per ogni terza parte) o a email predefinite
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
-Module610Name=Product Variants
+Module610Name=Varianti prodotto
 Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=Donazioni
 Module700Desc=Gestione donazioni
@@ -597,18 +600,18 @@ Module5000Name=Multiazienda
 Module5000Desc=Permette la gestione di diverse aziende
 Module6000Name=Flusso di lavoro
 Module6000Desc=Gestione flussi di lavoro
-Module10000Name=Websites
+Module10000Name=Siti web
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Gestione delle richieste di permesso
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Products lots
+Module39000Name=Lotti di prodotto
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50000Desc=Modulo per offrire una pagina di pagamento che accetti pagamenti con carte di credito o debito via PayBox. Può essere usato per tutti i pagamenti dei clienti o solo per alcune specifiche tipologie di pagamenti in Dolibarr (fatture, ordini, ...) 
 Module50100Name=Punti vendita
 Module50100Desc=Modulo per la creazione di un punto vendita (POS)
 Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50200Desc=Modulo per offrire una pagina di pagamento che accetti pagamenti PayPal (carte di credito o credito PayPal). Può essere usato per tutti i pagamenti dei clienti o solo per alcune specifiche tipologie di pagamenti in Dolibarr (fatture, ordini, ...) 
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
 Module54000Name=PrintIPP
@@ -619,6 +622,8 @@ Module59000Name=Margini
 Module59000Desc=Modulo per gestire margini
 Module60000Name=Commissioni
 Module60000Desc=Modulo per gestire commissioni
+Module62000Name=Incoterm
+Module62000Desc=Aggiunge funzioni per la gestione Incoterm
 Module63000Name=Risorse
 Module63000Desc=Gestione risorse (stampanti, automobili, locali, ...) e loro utilizzo all'interno degli eventi
 Permission11=Vedere le fatture attive
@@ -779,7 +784,7 @@ Permission404=Eliminare sconti
 Permission501=Read employee contracts/salaries
 Permission502=Create/modify employee contracts/salaries
 Permission511=Read payment of salaries
-Permission512=Create/modify payment of salaries
+Permission512=Crea/modifica pagamento stipendi
 Permission514=Delete salaries
 Permission517=Esporta stipendi
 Permission520=Read Loans
@@ -830,14 +835,14 @@ Permission1235=Inviare fatture fornitore tramite email
 Permission1236=Esportare fatture fornitore, attributi e pagamenti
 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
+Permission1321=Esportare fatture attive, attributi e pagamenti
 Permission1322=Riaprire le fatture pagate
 Permission1421=Esportare ordini cliente e attributi
-Permission20001=Vedere le richieste di ferie (tue e dei tuoi subordinati)
-Permission20002=Creare/modicare le richieste di ferie
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Eliminare le richieste di ferie
-Permission20004=Vedere tutte le richieste di ferie (anche di utenti non subordinati)
-Permission20005=Creaee/modificare le richieste di ferie per tutti
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Leggi lavoro pianificato
 Permission23002=Crea / Aggiorna lavoro pianificato
@@ -868,7 +873,7 @@ Permission59003=Read every user margin
 Permission63001=Leggi risorse
 Permission63002=Crea/modifica risorse
 Permission63003=Elimina risorsa
-Permission63004=Link resources to agenda events
+Permission63004=Collega le risorse agli eventi
 DictionaryCompanyType=Tipi dei soggetti terzi
 DictionaryCompanyJuridicalType=forma legale dei soggetti terzi
 DictionaryProspectLevel=Prospect potential level
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Ammontare dei valori bollati
 DictionaryPaymentConditions=Termini di pagamento
 DictionaryPaymentModes=Modalità di pagamento
 DictionaryTypeContact=Tipi di contatti/indirizzi
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotassa (WEEE)
 DictionaryPaperFormat=Formati di carta
 DictionaryFormatCards=Cards formats
@@ -895,7 +901,7 @@ DictionaryOrderMethods=Metodi di ordinazione
 DictionarySource=Origine delle proposte/ordini
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Modelli per piano dei conti
-DictionaryAccountancyJournal=Accounting journals
+DictionaryAccountancyJournal=Libri contabili
 DictionaryEMailTemplates=Modelli email
 DictionaryUnits=Unità
 DictionaryProspectStatus=Prospection status
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Gestione IVA
 VATIsUsedDesc=Per impostazione predefinita l'aliquota IVA usata per la creazione di prospetti, fatture, ordini, ecc. segue la regola attiva:<br> - Se il venditore non è un soggetto IVA, l'aliquota IVA è pari a 0.<br> - Se i paesi di vendita e di acquisto coincidono, il valore predefinito dell'aliquota IVA è quello del prodotto nel paese di vendita. <br> - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea ed i beni consistono in servizi di trasporto (auto, nave, aereo), il valore predefinito dell'aliquota IVA è 0 (L'IVA dovrebbe essere pagata dall'acquirente all'ufficio doganale del suo paese e non al venditore). <br> - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea e l'acquirente non è una società, l'aliquota IVA predefinita è quella del prodotto venduto. <br> - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea e l'acquirente è una società, l'aliquota IVA predefinita è 0.<br>In tutti gli altri casi l'aliquota IVA predefinita è 0.
 VATIsNotUsedDesc=Impostazione predefinita in cui l'aliquota IVA è pari a 0. Adatto a soggetti come associazioni, persone fisiche o piccole imprese con regime semplificato o a forfait.
-VATIsUsedExampleFR=In Francia si intendono le imprese o organizzazioni che hanno un vero e proprio sistema fiscale (Semplificato, nominale o normale). Un sistema in cui l'IVA à dichiarata.
-VATIsNotUsedExampleFR=In Francia le associazioni non sono tenute alla dichiarazione IVA, così come le società, le organizzazioni o i liberi professionisti che hanno scelto la microimpresa come sistema fiscale (IVA a forfait) e il versamento di una franchigia IVA senza alcuna dichiarazione IVA. In questo caso viene visualizzata la dicitura "non applicabile IVA - Art-293B del CGI" sulle fatture.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Tariffa
 LocalTax1IsNotUsed=Non usare seconda tassa
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Tipo di driver
 SummarySystem=Informazioni riassuntive sul sistema
 SummaryConst=Elenco di tutti i parametri di impostazione Dolibarr
-MenuCompanySetup=Società/Fondazione
+MenuCompanySetup=Società/Organizzazione
 DefaultMenuManager= Gestore dei menu standard
 DefaultMenuSmartphoneManager=Gestore dei menu Smartphone
 Skin=Tema
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra
 DefaultLanguage=La lingua da impostare come predefinita (codice lingua)
 EnableMultilangInterface=Attiva l'interfaccia multilingua
 EnableShowLogo=Abilita la visualizzazione del logo
-CompanyInfo=Informazioni società/fondazione
-CompanyIds=Identità società/fondazione
+CompanyInfo=Informazioni società/organizzazione
+CompanyIds=Company/organization identities
 CompanyName=Nome
 CompanyAddress=Indirizzo
 CompanyZip=CAP
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=I parametri di setup possono essere definiti solo da utenti di
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
 SystemAreaForAdminOnly=Questa sezione è disponibile solo agli utenti di tipo <b>amministratore</b>. Nessuna delle autorizzazioni disponibili può alterare questo limite.
 CompanyFundationDesc=In questa pagina puoi modificare tutte le informazioni della società o fondazione che intendi gestire (Per farlo clicca sui pulsanti "Modifica" o "Salva" in fondo alla pagina)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Qui è possibile scegliere i parametri relativi all'aspetto di Dolibarr
 AvailableModules=Moduli disponibili
 ToActivateModule=Per attivare i moduli, andare nell'area <b>Impostazioni</b> (Home->Impostazioni->Moduli).
@@ -1145,7 +1152,7 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=Nuova stringa di testo da utilizzare
 OriginalValueWas=La traduzione originale è stata sovrascritta. Il testo originale era:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Applicazioni/moduli attivi: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
 ClassNotFoundIntoPathWarning=La classe %s non è stata trovata al percorso PHP indicato
 YesInSummer=Si in estate
@@ -1184,8 +1191,8 @@ CompanySetup=Impostazioni modulo aziende
 CompanyCodeChecker=Modulo per la generazione e verifica dei codici di terzi  (cliente o fornitore)
 AccountCodeManager=Module for accounting code generation (customer or supplier)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescUser=* per utente, un utente alla volta.
+NotificationsDescContact=** per contatto di soggetti terzi (clienti o fornitori), un contatto alla volta.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Modelli per i documenti
 DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS per OpenOffice, KOffice, TextEdit, ecc...)
@@ -1195,7 +1202,7 @@ CompanyIdProfChecker=Unicità dell'identità
 MustBeUnique=Deve essere unico?
 MustBeMandatory=Obbligatorio per creare il soggetto terzo?
 MustBeInvoiceMandatory=Obbligatorio per convalidare le fatture?
-TechnicalServicesProvided=Technical services provided
+TechnicalServicesProvided=Servizi tecnici forniti
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un link per esportare <b>%s</b> è disponibile al seguente link: %s
 ##### Invoices #####
@@ -1308,7 +1315,7 @@ LDAPMemberDnExample=DN completo (per esempio: ou=members,dc=society,dc=com)
 LDAPMemberObjectClassList=Elenco delle objectClass
 LDAPMemberObjectClassListExample=Elenco dei record objectClass che definiscono gli attributi
 LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypepDnExample=DN completo (per esempio: ou=memberstypes,dc=example,dc=com)
 LDAPMemberTypeObjectClassList=Elenco delle objectClass
 LDAPMemberTypeObjectClassListExample=Elenco dei record objectClass che definiscono gli attributi
 LDAPUserObjectClassList=Elenco delle objectClass
@@ -1441,6 +1448,9 @@ SyslogFilename=Nome file e percorso
 YouCanUseDOL_DATA_ROOT=È possibile utilizzare DOL_DATA_ROOT/dolibarr.log come file di log per la directory "documenti". È anche possibile impostare un percorso diverso per tale file.
 ErrorUnknownSyslogConstant=La costante %s è sconosciuta a syslog.
 OnlyWindowsLOG_USER=Solo utenti Windows supportano LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Impostazioni modulo donazioni
 DonationsReceiptModel=Modello di ricevuta per donazioni
@@ -1532,15 +1542,17 @@ DetailTarget=Target del link (_blank, in una nuova finestra, ecc...)
 DetailLevel=Livello (-1:top menu, 0:header menu, >0 menu and sub menu)
 ModifMenu=Modifica Menu
 DeleteMenu=Elimina voce menu
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+ConfirmDeleteMenu=Vuoi davvero eliminare la voce di menu <b>%s</b>?
 FailedToInitializeMenu=Impossibile inizializzare menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Esigibilità dell'IVA
-OptionVATDefault=Contabilità per cassa
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Contabilità per competenza
 OptionVatDefaultDesc=L'IVA è dovuta:<br/> - sulla consegna/pagamento per i beni<br/>- sui pagamenti per i servizi
 OptionVatDebitOptionDesc=L'IVA è dovuta:<br/> - alla consegna/pagamento per i beni<br/>- alla fatturazione (a debito) per i servizi
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=Alla consegna
 OnPayment=Al pagamento
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Alla data della fattura
 Buy=Acquista
 Sell=Vendi
 InvoiceDateUsed=Data utilizzata per la fatturazione
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Codice contabilità vendite
 AccountancyCodeBuy=Codice contabilità acquisti
@@ -1598,7 +1610,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
+ApiExporerIs=Puoi controllare e testare le API all'indirizzo
 OnlyActiveElementsAreExposed=Vengono esposti solo elementi correlati ai moduli abilitati
 ApiKey=Key for API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1662,8 +1674,8 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 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".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
+ListOfNotificationsPerUser=Lista notifiche per utente
+ListOfNotificationsPerUserOrContact=Lista di notifiche per utente o per contatto
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
@@ -1698,17 +1710,17 @@ UrlTrackingDesc=If the provider or transport service offer a page or web site to
 OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
 TemplateForElement=L'elemento a cui è abbinato questo modello
 TypeOfTemplate=Tipo di modello
-TemplateIsVisibleByOwnerOnly=Template is visible by owner only
-VisibleEverywhere=Visible everywhere
+TemplateIsVisibleByOwnerOnly=Template visibile solo al proprietario
+VisibleEverywhere=Visibile ovunque
 VisibleNowhere=Visible nowhere
 FixTZ=Correzione del fuso orario
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
+ExpectedChecksum=Checksum previsto
+CurrentChecksum=Checksum attuale
 ForcedConstants=Required constant values
 MailToSendProposal=Inviare proposta cliente
 MailToSendOrder=Inviare ordine cliente
-MailToSendInvoice=Inviare fattura cliente
+MailToSendInvoice=Inviare fattura
 MailToSendShipment=Inviare spedizione
 MailToSendIntervention=Inviare intervento
 MailToSendSupplierRequestForQuotation=Inviare richiesta di preventivo a fornitore
@@ -1717,7 +1729,8 @@ MailToSendSupplierInvoice=Inviare fattura fornitore
 MailToSendContract=Per spedire un contratto
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
-MailToUser=To send email from user page
+MailToUser=Per inviare un mail dalla pagina utente
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Stai usando l'ultima versione stabile
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1744,9 +1757,9 @@ AddPermissions=Aggiungi autorizzazioni
 AddExportProfiles=Aggiungi profili di esportazione
 AddImportProfiles=Aggiungi profili di importazione
 AddOtherPagesOrServices=Aggiungi altre pagine o servizi
-AddModels=Add document or numbering templates
+AddModels=aggiungi template per documenti o per numerazione
 AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
+DetectionNotPossible=Rilevamento impossibile
 UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and must be provided on each API call)
 ListOfAvailableAPIs=Lista delle API disponibili
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
@@ -1754,19 +1767,23 @@ CommandIsNotInsideAllowedCommands=The command you try to run is not inside list
 LandingPage=Landing page
 SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
 ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permission defined
+UserHasNoPermissions=Questo utente non ha alcun permesso impostato
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
 WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_LEFT=Margine sinistro sul PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_TOP=Margine superiore sul PDF
 MAIN_PDF_MARGIN_BOTTOM=Margine inferiore su PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configurazione del modulo Risorse
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+UseSearchToSelectResource=Utilizza il form di ricerca per scegliere una risorsa (invece della lista a tendina)
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index dbf4cde376f..730a8530303 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Membro %s convalidato
 MemberModifiedInDolibarr=Membro %s modificato
 MemberResiliatedInDolibarr=Membro %s terminato
 MemberDeletedInDolibarr=Membro %s eliminato
-MemberSubscriptionAddedInDolibarr=Adesione membro %s aggiunta
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Spedizione %s convalidata
 ShipmentClassifyClosedInDolibarr=Spedizione %s classificata come fatturata
 ShipmentUnClassifyCloseddInDolibarr=Spedizione %s classificata come riaperta
@@ -97,7 +99,8 @@ AgendaUrlOptions1=È inoltre possibile aggiungere i seguenti parametri ai filtri
 AgendaUrlOptions3=<b>logina = %s</b> per limitare l'output alle azioni amministrate dall'utente<b>%s</b>
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> per limitare l'output alle azioni associate al progetto <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Visualizza i compleanni dei contatti
 AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti
 Busy=Occupato
@@ -109,7 +112,7 @@ ExportCal=Esporta calendario
 ExtSites=Calendari esterni
 ExtSitesEnableThisTool=Mostra calendari esterni (definiti nelle impostazioni generali) nell'agenda. Questo non influisce sui calendari esterni definiti dall'utente.
 ExtSitesNbOfAgenda=Numero di calendari
-AgendaExtNb=Calendario numero %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL per accedere al file ICal
 ExtSiteNoLabel=Nessuna descrizione
 VisibleTimeRange=Filtro orari visibili
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 76cf4469ab7..32b51ef793d 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Rimborsato
 DeletePayment=Elimina pagamento
 ConfirmDeletePayment=Vuoi davvero cancellare questo pagamento?
 ConfirmConvertToReduc=Vuoi trasformare questa nota di credito in uno sconto assoluto?<br/> L'importo di tale credito verrà salvato nello sconto assoluto del cliente e potrà essere utilizzato come sconto per una successiva fattura a questo cliente.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Pagamenti fornitori
 ReceivedPayments=Pagamenti ricevuti
 ReceivedCustomersPayments=Pagamenti ricevuti dai clienti
@@ -91,7 +92,7 @@ PaymentAmount=Importo del pagamento
 ValidatePayment=Convalidare questo pagamento?
 PaymentHigherThanReminderToPay=Pagamento superiore alla rimanenza da pagare
 HelpPaymentHigherThanReminderToPay=Attenzione, l'importo del pagamento di una o più fatture è più elevato rispetto al dovuto.<br/> Modifica l'importo, oppure conferma e crea una nota di credito per la differenza riscossa.
-HelpPaymentHigherThanReminderToPaySupplier=Attenzione, l'importo del pagamento di una o più fatture è più elevato rispetto al dovuto. <br> Modifica l'importo, altrimenti conferma.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classifica come "pagata"
 ClassifyPaidPartially=Classifica come "parzialmente pagata"
 ClassifyCanceled=Classifica come "abbandonata"
@@ -110,6 +111,7 @@ DoPayment=Registra pagamento
 DoPaymentBack=Emetti rimborso
 ConvertToReduc=Converti in futuro sconto
 ConvertExcessReceivedToReduc=Converti l'eccedenza ricevuta in un futuro sconto
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
 EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente
 DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Stato delle fatture generate
 BillStatusDraft=Bozza (deve essere convalidata)
 BillStatusPaid=Pagata
 BillStatusPaidBackOrConverted=Nota di credito rimborsata o convertita in sconto
-BillStatusConverted=Conv. in sconto
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Annullata
 BillStatusValidated=Convalidata (deve essere pagata)
 BillStatusStarted=Iniziata
@@ -164,7 +166,7 @@ LatestSupplierTemplateInvoices=Latest %s supplier template invoices
 LastCustomersBills=Ultime %s fatture attive
 LastSuppliersBills=Ultime %s fatture passive
 AllBills=Tutte le fatture
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Tutti i modelli delle fatture
 OtherBills=Altre fatture
 DraftBills=Fatture in bozza
 CustomersDraftInvoices=Bozze di fatture attive
@@ -220,6 +222,7 @@ RemainderToPayBack=Restante da rimborsare
 Rest=In attesa
 AmountExpected=Importo atteso
 ExcessReceived=Ricevuto in eccesso
+ExcessPaid=Excess paid
 EscompteOffered=Sconto offerto (pagamento prima del termine)
 EscompteOfferedShort=Sconto
 SendBillRef=Invio della fattura %s
@@ -283,16 +286,20 @@ Deposit=Anticipo
 Deposits=Anticipi
 DiscountFromCreditNote=Sconto da nota di credito per %s
 DiscountFromDeposit=Anticipi per fatture %s
-DiscountFromExcessReceived=Pagamenti dall'eccedenza ricevuta per la fattura %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Questo tipo di credito può essere utilizzato su fattura prima della sua convalida
 CreditNoteDepositUse=La fattura deve essere convalidata per l'utilizzo di questo credito
 NewGlobalDiscount=Nuovo sconto globale
 NewRelativeDiscount=Nuovo sconto relativo
+DiscountType=Discount type
 NoteReason=Note/Motivo
 ReasonDiscount=Motivo dello sconto
 DiscountOfferedBy=Sconto concesso da
 DiscountStillRemaining=Sconto ancora disponibile
 DiscountAlreadyCounted=Sconto già applicato
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Indirizzo di fatturazione
 HelpEscompte=Questo sconto è concesso al cliente perché il suo pagamento è stato effettuato prima del termine.
 HelpAbandonBadCustomer=Tale importo è stato abbandonato (cattivo cliente) ed è considerato come un abbandono imprevisto.
@@ -341,17 +348,17 @@ NextDateToExecution=Data per la prossima generazione di fattura
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Data dell'ultima generazione
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Numero massimo di generazione fatture
-NbOfGenerationDone=Numero di fatture generate già create
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Numero massimo di generazioni raggiunto
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Convalida le fatture automaticamente
 GeneratedFromRecurringInvoice=Fattura ricorrente %s generata dal modello
 DateIsNotEnough=Data non ancora raggiunta
 InvoiceGeneratedFromTemplate=Fattura %s generata da modello ricorrente %s
 WarningInvoiceDateInFuture=Attenzione, la data della fattura è successiva alla data odierna
 WarningInvoiceDateTooFarInFuture=Attenzione, la data della fattura è troppo lontana dalla data odierna
-ViewAvailableGlobalDiscounts=View available discounts
+ViewAvailableGlobalDiscounts=Mostra gli sconti disponibili
 # PaymentConditions
 Statut=Stato
 PaymentConditionShortRECEP=Rimessa diretta
@@ -508,7 +515,7 @@ PDFCrevetteSituationNumber=Situazione n°%s
 PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
 PDFCrevetteSituationInvoiceTitle=Fattura di avanzamento lavori
 PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
+TotalSituationInvoice=Totale avanzamento lavori
 invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Errore: aggiornamento prezzo della riga di fattura: %s
 ToCreateARecurringInvoice=Per creare una fattura ricorrente per questo contratto, creare inizialmente la bozza di fattura, poi convertirla in un modello di fattura e definire quindi la frequenza di generazione delle future fatture.
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index d4b9051c81c..bbc0e66f367 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -43,7 +43,8 @@ Individual=Privato
 ToCreateContactWithSameName=Sarà creato automaticamente un contatto/indirizzo con le stesse informazione del soggetto terzo. Nella maggior parte dei casi, anche se il soggetto terzo è una persona fisica, creare solo la terza parte è sufficiente.
 ParentCompany=Società madre
 Subsidiaries=Controllate
-ReportByCustomers=Report per clienti
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report per trimestre
 CivilityCode=Titolo
 RegisteredOffice=Sede legale
@@ -56,7 +57,7 @@ Address=Indirizzo
 State=Provincia/Cantone/Stato
 StateShort=Stato
 Region=Regione
-Region-State=Region - State
+Region-State=Regione - Stato
 Country=Paese
 CountryCode=Codice del paese
 CountryId=Id paese
@@ -75,10 +76,12 @@ Town=Città
 Web=Sito web
 Poste= Posizione
 DefaultLang=Lingua predefinita
-VATIsUsed=L'IVA viene utilizzata
-VATIsNotUsed=L'IVA non viene utilizzata
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Compila l'indirizzo con l'indirizzo del soggetto terzo
 ThirdpartyNotCustomerNotSupplierSoNoRef=Soggetto terzo né cliente né fornitore, nessun oggetto di riferimento disponibile
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Conto bancario usato per il pagamento:
 OverAllProposals=Proposte
 OverAllOrders=Ordini
@@ -239,7 +242,7 @@ ProfId3TN=Douane code
 ProfId4TN=RIB
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Id Professionale
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=N° Partita IVA
-VATIntraShort=P. IVA
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=La sintassi è valida
+VATReturn=VAT return
 ProspectCustomer=Cliente/Cliente potenziale
 Prospect=Cliente potenziale
 CustomerCard=Scheda del cliente
 Customer=Cliente
 CustomerRelativeDiscount=Sconto relativo del cliente
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Sconto relativo
 CustomerAbsoluteDiscountShort=Sconto assoluto
 CompanyHasRelativeDiscount=Il cliente ha uno sconto del <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Il cliente non ha alcuno sconto relativo impostato
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=Questo cliente ha degli sconti disponibili (note di crediti o anticipi) per un totale di <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Questo cliente ha uno sconto disponibile (commerciale, nota d'accredito) per <b>%s</b>%s
 CompanyHasCreditNote=Il cliente ha ancora note di credito per <b> %s %s </b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Il cliente non ha disponibile alcuno sconto assoluto per credito
-CustomerAbsoluteDiscountAllUsers=Sconti assoluti (concessi a tutti gli utenti)
-CustomerAbsoluteDiscountMy=Sconti assoluti (concessi a te)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Nessuno
 Supplier=Fornitore
 AddContact=Crea contatto
@@ -377,9 +390,9 @@ NoDolibarrAccess=Senza accesso a Dolibarr
 ExportDataset_company_1=Terze parti (Aziende/fondazioni/persone fisiche) e proprietà
 ExportDataset_company_2=Contatti e attributi
 ImportDataset_company_1=Terze parti (Aziende/fondazioni/persone fisiche) e proprietà
-ImportDataset_company_2=Contatti/Indirizzi (per terze parti e non) e attributi
-ImportDataset_company_3=Informazioni bancarie
-ImportDataset_company_4=Soggetto terzo/Agente di vendita (l'utente agente di vendita influisce sui soggetti terzi)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Livello dei prezzi
 DeliveryAddress=Indirizzo di consegna
 AddAddress=Aggiungi un indirizzo
@@ -406,15 +419,16 @@ ProductsIntoElements=Elenco dei prodotti/servizi in %s
 CurrentOutstandingBill=Fatture scadute
 OutstandingBill=Max. fattura in sospeso
 OutstandingBillReached=Raggiunto il massimo numero di fatture scadute
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn per codice cliente e %syymm-nnnn per il fornitore, in cui yy è  l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0.
 LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento.
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
 MergeOriginThirdparty=Duplica soggetto terzo (soggetto terzo che stai eliminando)
 MergeThirdparties=Unisci soggetti terzi
 ConfirmMergeThirdparties=Sei sicuro che vuoi fondere questo soggetto terzo in quello corrente? Tutti gli oggetti linkati (fatture, ordini, ...) saranno spostati al soggetto terzo corrente, poi il precedente verrà eliminato.
-ThirdpartiesMergeSuccess=I soggetti terzi sono stati uniti
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login del rappresentante commerciale
 SaleRepresentativeFirstname=Nome del commerciale
 SaleRepresentativeLastname=Cognome del commerciale
-ErrorThirdpartiesMerge=Si è verificato un errore durante l'eliminazione dei soggetti terzi. Per ulteriori dettagli controlla il log. Le modifiche sono state annullate.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Il nuovo codice cliente o codice fornitore suggerito è duplicato.
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 8960e9544e2..9d5e2d9279d 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -18,7 +18,7 @@ Accountsparent=Parent accounts
 Income=Entrate
 Outcome=Uscite
 MenuReportInOut=Entrate/Uscite
-ReportInOut=Balance of income and expenses
+ReportInOut=Bilancio di entrate e uscite
 ReportTurnover=Fatturato
 PaymentsNotLinkedToInvoice=I pagamenti non legati ad una fattura, quindi non legati ad alcun soggetto terzo
 PaymentsNotLinkedToUser=Pagamenti non legati ad alcun utente
@@ -31,7 +31,7 @@ Credit=Credito
 Piece=Documento contabile
 AmountHTVATRealReceived=Totale riscosso
 AmountHTVATRealPaid=Totale pagato
-VATToPay=IVA da pagare
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=Pagamenti IRPF (Spagna)
 VATPayment=Pagamento IVA
 VATPayments=Pagamenti IVA
 VATRefund=Rimborso IVA
+NewVATPayment=New sales tax payment
 Refund=Rimborso
 SocialContributionsPayments=Pagamenti tasse/contributi
 ShowVatPayment=Visualizza pagamento IVA
@@ -157,30 +158,34 @@ RulesResultDue=- Gli importi indicati sono tutti tasse incluse<br/>- Comprendono
 RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
 RulesCADue=- Comprende le fatture del cliente, che siano state pagate o meno.<br/>- Si basa sulla data di tali fatture.<br/>
 RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.<br/>- Si basa sulla data dei pagamenti.<br/>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=IRPF soggetti terzi(Spagna)
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=Dichiarazione IVA
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=IRPF soggetti terzi(Spagna)
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata
-VATReportByCustomersInDueDebtMode=Report per IVA cliente riscossa e pagata
-VATReportByQuartersInInputOutputMode=Report per tasso di IVA riscossa e pagata
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report per tasso di IVA riscossa e pagata
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Vedi il report <b>%sIVA pagata%s</b> per la modalità di calcolo standard
 SeeVATReportInDueDebtMode=Vedi il report <b>%sIVA a debito%s</b> per la modalità di calcolo crediti/debiti
 RulesVATInServices=- Per i servizi, il report include la regolazione dell'IVA incassata o differita.
-RulesVATInProducts=- Per i beni materiali, comprende l'IVA fatturata sulla base della data di fatturazione.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Per i servizi, comprende l'iva fatturata, pagata o meno, in base alla data di fatturazione.
-RulesVATDueProducts=- Per i beni materiali, comprende l'IVA fatturata, in base alla data di fatturazione.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Nota: Per i prodotti è più corretto usare la data di consegna.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/fattura
 NotUsedForGoods=Non utilizzati per le merci
 ProposalStats=Statistiche proposte commerciali
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Metodo di calcolo
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Codice contabile predefinito per la riscossione dell'IVA sulle vendite (usato se l'IVA non è definita nel dizionario)
-ACCOUNTING_VAT_BUY_ACCOUNT=Codice contabile predefinito per il recupero dell'IVA sugli acquisti (usato se l'IVA non è definita nel dizionario)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Codice contabile predefinito per il pagamento dell'IVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Scheda periodo di esercizio
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 95f8360a2f4..daa20b5b2d0 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -7,28 +7,28 @@ Permission23103 = Elimina processo pianificato
 Permission23104 = Esegui processo pianificato
 # Admin
 CronSetup= Impostazione delle azioni pianificate
-URLToLaunchCronJobs=URL per controllare ed eseguire i cron job
-OrToLaunchASpecificJob=O per lanciare un job specifico
-KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i job di cron
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+URLToLaunchCronJobs=URL per controllare ed eseguire i processi in cron
+OrToLaunchASpecificJob=O per lanciare un processo specifico
+KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i processi pianificati
+FileToLaunchCronJobs=Riga di comando per controllare e lanciare i processi pianificati in cron
 CronExplainHowToRunUnix=In ambienti Unix per lanciare il comando ogni 5 minuti dovresti usare la seguente riga di crontab
 CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows per lanciare il comando ogni 5 minuti dovresti usare le operazioni pianificate
 CronMethodDoesNotExists=La classe %s non contiene alcune metodo %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronJobDefDesc=I profili cron sono definiti nel file di descrizione del modulo. Quando il modulo viene attivao, vengono caricati e resi disponivbili permettendoti di amministrare i processi dal menu strumenti amministrazione %s.
+CronJobProfiles=Lista dei profili cron predefiniti
 # Menu
 EnabledAndDisabled=Attivato e disattivato
 # Page list
-CronLastOutput=Latest run output
+CronLastOutput=Output dell'ultimo avvio
 CronLastResult=Latest result code
 CronCommand=Comando
 CronList=Processi pianificati
-CronDelete=Cancella i job programmati
-CronConfirmDelete=Vuoi davvero eliminare questi job schedulati?
-CronExecute=Esegui i job schedulati
-CronConfirmExecute=Vuoi davvero eseguire i job schedulati ora?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
-CronTask=Azione
+CronDelete=Cancella i processi pianificati
+CronConfirmDelete=Vuoi davvero eliminare questi processi pianificati?
+CronExecute=Esegui i processi pianificati
+CronConfirmExecute=Vuoi davvero eseguire ora i processi pianificati?
+CronInfo=Il modulo di programmazione permette di pianificare l'esecuzione automatica dei processi. Essi possono anche essere lanciati manualmente.
+CronTask=Processo
 CronNone=Nessuno
 CronDtStart=Non prima
 CronDtEnd=Non dopo
@@ -39,44 +39,45 @@ CronFrequency=Frequenza
 CronClass=Classe
 CronMethod=Metodo
 CronModule=Modulo
-CronNoJobs=Nessun job registrato
+CronNoJobs=Nessun processo registrato
 CronPriority=Priorità
 CronLabel=Titolo
 CronNbRun=Num. lancio
-CronMaxRun=Massimo numero di esecuzioni
+CronMaxRun=Max number launch
 CronEach=Ogni
-JobFinished=Azione eseguita e completata
+JobFinished=Processo eseguito e completato
 #Page card
-CronAdd= Aggiungi job
-CronEvery=Esegui ogni lavoro
+CronAdd= Aggiungi processo
+CronEvery=Esegui ogni processo
 CronObject=Istanza/Oggetto da creare
 CronArgs=Parametri
 CronSaveSucess=Salvataggio corretto
 CronNote=Commento
 CronFieldMandatory=Il campo %s è obbligatorio
 CronErrEndDateStartDt=La data di fine non può essere precedente a quella di inizio
-StatusAtInstall=Status at module installation
+StatusAtInstall=Stato all'installazione del modulo
 CronStatusActiveBtn=Abilita
 CronStatusInactiveBtn=Disattiva
-CronTaskInactive=Questa azione è disabilitata
+CronTaskInactive=Questo processo è disabilitato
 CronId=Id
-CronClassFile=Filename with class
+CronClassFile=Nome file con classe
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
 CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
 CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
 CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
 CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Il comando da eseguire sul sistema
-CronCreateJob=Crea nuovo job programmato
+CronCreateJob=Crea nuovo processo programmato
 CronFrom=Da
 # Info
 # Common
-CronType=Tipo di lavoro
-CronType_method=Call method of a PHP Class
+CronType=Tipo di processo
+CronType_method=Metodo di chiamata di una classe PHP
 CronType_command=Comando da shell
-CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s
+CronCannotLoadClass=Non posso caricare la classe %s (per usare la classe %s)
+CronCannotLoadObject=Il file di classe %s è stato caricato, ma all'interno l'oggetto %s non è presente
 UseMenuModuleToolsToAddCronJobs=Vai nel menu "Home - Strumenti di amministrazione - Processi pianificati" per visualizzare e modificare i processi pianificati.
-JobDisabled=Lavoro disabilitato
+JobDisabled=Processo disabilitato
 MakeLocalDatabaseDumpShort=Backup del database locale
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attenzione, per motivi di performance, qualunque sia la data della prossima esecuzione dei processi attivi, i tuoi processi possono essere ritardati di un massimo di %s ore prima di essere eseguiti
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 598246e4249..dfe6d01a637 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -36,15 +36,15 @@ ErrorBadSupplierCodeSyntax=Sintassi del codice fornitore errata
 ErrorSupplierCodeRequired=Il codice fornitore è obbligatorio
 ErrorSupplierCodeAlreadyUsed=Codice fornitore già utilizzato
 ErrorBadParameters=Parametri errati
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadValueForParameter=Valore '%s' non corretto per il parametro '%s'
 ErrorBadImageFormat=Tipo file immagine non supportato (la tua installazione di PHP non supporta le funzioni per convertire le immagini di questo formato)
 ErrorBadDateFormat=Il valore '%s' ha un formato della data sbagliato
 ErrorWrongDate=La data non è corretta!
 ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s
 ErrorFoundBadEmailInFile=Sintassi email errata nelle righe %s del file (ad esempio alla riga %s con email = %s)
-ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
+ErrorUserCannotBeDelete=L'utenza non può essere eliminata. Potrebbe essere collegata a qualche oggetto Dolibarr.
 ErrorFieldsRequired=Mancano alcuni campi obbligatori.
-ErrorSubjectIsRequired=The email topic is required
+ErrorSubjectIsRequired=Il titolo della email è obbligatorio
 ErrorFailedToCreateDir=Impossibile creare la directory. Verifica che l'utente del server Web abbia i permessi per scrivere nella directory Dolibarr. Se il parametro <b>safe_mode</b> è abilitato in PHP, verifica che i file php di Dolibarr appartengano all'utente o al gruppo del server web (per esempio www-data).
 ErrorNoMailDefinedForThisUser=Nessun indirizzo memorizzato per questo utente
 ErrorFeatureNeedJavascript=Questa funzione necessita di javascript per essere attivata. Modificare questa impostazione nel menu Impostazioni - layout di visualizzazione.
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=La configurazione per l'uso di LDAP è incompleta
 ErrorLDAPMakeManualTest=È stato generato un file Ldif nella directory %s. Prova a caricarlo dalla riga di comando per avere maggiori informazioni sugli errori.
 ErrorCantSaveADoneUserWithZeroPercentage=Impossibile salvare un'azione con "stato non iniziato" se il campo "da fare" non è vuoto.
 ErrorRefAlreadyExists=Il riferimento utilizzato esiste già.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Impossibile eliminare il dato. E' già in uso o incluso in altro oggetto.
@@ -104,7 +104,7 @@ ErrorForbidden2=L'autorizzazione all'accesso per questi dati può essere imposta
 ErrorForbidden3=Sembra che Dolibarr non venga utilizzato tramite una sessione autenticata. Dai un'occhiata alla documentazione di installazione Dolibarr per sapere come gestire le autenticazioni (htaccess, mod_auth o altri...).
 ErrorNoImagickReadimage=La funzione Imagick_readimage non è stata trovato nel PHP. L'anteprima non è disponibile. Gli amministratori possono disattivare questa scheda dal menu <b>Impostazioni - Schermo</b>
 ErrorRecordAlreadyExists=Il record esiste già
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Etichetta già esistente
 ErrorCantReadFile=Impossibile leggere il file <b>%s</b>
 ErrorCantReadDir=Impossibile leggere nella directory <b>%s</b>
 ErrorBadLoginPassword=Errore: Username o password non corretti
@@ -119,7 +119,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=La quantità di ciascuna riga della fat
 ErrorWebServerUserHasNotPermission=L'account utente <b>%s</b> utilizzato per eseguire il server web non ha i permessi necessari
 ErrorNoActivatedBarcode=Nessun tipo di codice a barre attivato
 ErrUnzipFails=Estrazione dell'archivio %s con ZipArchive fallita
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrNoZipEngine=La funzione di compressione zip/unzip per il file %s non è disponibile in questa installazione di PHP
 ErrorFileMustBeADolibarrPackage=Il file %s deve essere un archivio zip Dolibarr
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL non risulta installato, ma è necessario per comunicare con Paypal
@@ -127,9 +127,9 @@ ErrorFailedToAddToMailmanList=Impossibile aggiungere il dato %s alla Mailman lis
 ErrorFailedToRemoveToMailmanList=Impossibile rimuovere il dato %s alla Mailman lista %s o SPIP base
 ErrorNewValueCantMatchOldValue=Il nuovo valore non può essere uguale al precedente
 ErrorFailedToValidatePasswordReset=Cambio password fallito. Forse è già stato richiesto (questo link può essere usato una volta sola). Se no, prova a rifare la procedura dall'inizio.
-ErrorToConnectToMysqlCheckInstance=Connessione al database fallita. Controlla che il server Mysql sia in attività (nella maggior parte dei casi puoi avviarlo digitando 'sudo /etc/init.d/mysql start' in un terminale).
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Impossibile aggiungere il contatto
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=La data non può essere successiva ad oggi
 ErrorPaymentModeDefinedToWithoutSetup=Un metodo di pagamento è stato impostato come %s ma il setup del modulo Fattura non è stato completato per definire le impostazioni da mostrare per questo metodo di pagamento.
 ErrorPHPNeedModule=Errore, il tuo PHP deve avere il modulo <b>%s</b> installato per usare questa funzionalità.
 ErrorOpenIDSetupNotComplete=Hai impostato il config file di Dolibarr per permettere l'autenticazione tramite OpenID, ma l'URL del service di OpenID non è definita nella costante %s
@@ -155,28 +155,28 @@ ErrorPriceExpression19=Espressione non trovata
 ErrorPriceExpression20=Espressione vuota
 ErrorPriceExpression21=Risultato vuoto '%s'
 ErrorPriceExpression22=Risultato negativo '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpression23=Variabile '%s' sconosciuta o non impostata in %s
+ErrorPriceExpression24=La variabile '%s' esiste, ma non è valorizzata
 ErrorPriceExpressionInternal=Errore interno '%s'
 ErrorPriceExpressionUnknown=Errore sconosciuto '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=I magazzini di origine e di destinazione devono essere diversi
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' 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'
+ErrorGlobalVariableUpdater0=Richiesta HTTP fallita con errore '%s'
+ErrorGlobalVariableUpdater1=Formato JSON '%s' non valido
 ErrorGlobalVariableUpdater2=Parametro mancante: '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater3=I dati richiesti non sono stati trovati
 ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
+ErrorGlobalVariableUpdater5=Nessuna variabile globale selezionata
 ErrorFieldMustBeANumeric=Il campo <b>%s</b> deve essere un valore numerico
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorMandatoryParametersNotProvided=Parametri obbligatori non definiti
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorSavingChanges=Si è verificato un errore nel salvataggio delle modifiche
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
+ErrorFileMustHaveFormat=Il file deve essere nel formato %s
 ErrorSupplierCountryIsNotDefined=Nazione fornitore non definita. Correggere per proseguire.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
@@ -184,7 +184,7 @@ ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
+ErrorModuleNotFound=Impossibile trovare il file del modulo
 ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
 ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
 ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
@@ -195,9 +195,9 @@ ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
 ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorNoWarehouseDefined=Errore: non è stato definito un magazzino.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorTooManyErrorsProcessStopped=Troppi errori. Il processo è stato bloccato.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
 ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
 ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -226,6 +227,7 @@ WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funzione disabilitata qua
 WarningPaymentDateLowerThanInvoiceDate=La scadenza del pagamento (%s) risulta antecedente alla data di fatturazione (%s) per la fattura %s
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningYourLoginWasModifiedPleaseLogin=La tua login è stata modificata. Per ragioni di sicurezza dove accedere con la nuova login prima di eseguire una nuova azione.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/it_IT/loan.lang b/htdocs/langs/it_IT/loan.lang
index 9114e0cd352..c9cf861780b 100644
--- a/htdocs/langs/it_IT/loan.lang
+++ b/htdocs/langs/it_IT/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configurazione del modulo prestiti
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 74cbad72385..b9e104fa715 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -39,7 +39,7 @@ MailSuccessfulySent=Email (da %s a %s) consegnate con successo
 MailingSuccessfullyValidated=EMailing validata con successo
 MailUnsubcribe=Cancella sottoscrizione
 MailingStatusNotContact=Non contattare più
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Lettura e disiscrizione
 ErrorMailRecipientIsEmpty=L'indirizzo del destinatario è vuoto
 WarningNoEMailsAdded=Non sono state aggiunte email da inviare.
 ConfirmValidMailing=Intendi veramente validare questo invio?
@@ -67,7 +67,7 @@ MailingStatusRead=Da leggere
 YourMailUnsubcribeOK=La mail <b>%s</b> è stata cancellata correttamente dalla lista di invio
 ActivateCheckReadKey=Chiave usata per crittare la URL usata nelle funzionalità "Conferma di lettura" e "Cancella sottoscrizione"
 EMailSentToNRecipients=Email inviata a %s destinatari
-EMailSentForNElements=EMail sent for %s elements.
+EMailSentForNElements=Email inviata per %s elementi.
 XTargetsAdded=<b>%s</b> destinatari aggiunti alla lista di invio
 OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=The recipients of the %s record selected (if their email is known).
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Num. selezionati
 NbIgnored=Num. ignorati
 NbSent=Num. inviati
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -86,7 +87,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Soggetti terzi (per categoria)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 
 # Libelle des modules de liste de destinataires mailing
@@ -94,7 +95,7 @@ LineInFile=Riga %s nel file
 RecipientSelectionModules=Modulo di selezione destinatari
 MailSelectedRecipients=Destinatari selezionati
 MailingArea=Sezione Invii di massa
-LastMailings=Latest %s emailings
+LastMailings=Ultimi %s invii email
 TargetsStatistics=Statische obiettivi
 NbOfCompaniesContacts=Numero contatti di società
 MailNoChangePossible=I destinatari convalidati non possono essere modificati
@@ -115,9 +116,9 @@ DeliveryReceipt=Ricevuta di consegna.
 YouCanUseCommaSeparatorForSeveralRecipients=Utilizzare il separatore <b>virgola</b>(,) per specificare più destinatari.
 TagCheckMail=Traccia apertura mail
 TagUnsubscribe=Link di cancellazione alla mailing list
-TagSignature=Signature of sending user
+TagSignature=Firma del mittente
 EMailRecipient=Mail destinatario
-TagMailtoEmail=Recipient EMail (including html "mailto:" link)
+TagMailtoEmail=Email destinatario (incluso il link html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Nessuna email inviata. Mittente o destinatario errati. Verifica il profilo utente.
 # Module Notifications
 Notifications=Notifiche
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Numero di indirizzi di posta elettronica di contatti mirati
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Destinatari (selezione avanzata)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Valore minimo
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 0dba7a1c947..58bd2420084 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -25,7 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H.%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connessione al database
 NoTemplateDefined=Nessun tema disponibile per questo tipo di email
-AvailableVariables=Available substitution variables
+AvailableVariables=Variabili di sostituzione disponibili
 NoTranslation=Nessuna traduzione
 Translation=Traduzione
 NoRecordFound=Nessun risultato trovato
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametro %s non definito
 ErrorUnknown=Errore sconosciuto
 ErrorSQL=Errore di SQL
 ErrorLogoFileNotFound=Impossibile trovare il file <b>%s</b> per il logo
-ErrorGoToGlobalSetup=Vai su impostazioni "Azienda/Organizzazione" per sistemare
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Vai alle impostazioni del modulo per risolvere il problema
 ErrorFailedToSendMail=Impossibile inviare l'email (mittente=%s, destinatario=%s)
 ErrorFileNotUploaded=Upload fallito. Controllare che la dimensione del file non superi il numero massimo consentito, che lo spazio libero su disco sia sufficiente e che non esista già un file con lo stesso nome nella directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquot
 ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: '%s'.
 ErrorFailedToSaveFile=Errore, file non salvato.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Massimo numero di record per pagina
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Non sei autorizzato.
 SetDate=Imposta data
 SelectDate=Seleziona una data
 SeeAlso=Vedi anche %s
 SeeHere=Vedi qui
+ClickHere=Clicca qui
+Here=Here
 Apply=Applica
 BackgroundColorByDefault=Colore di sfondo predefinito
 FileRenamed=Il file è stato rinominato con successo
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Seleziona
 Choose=Scegli
 Resize=Ridimensiona
+ResizeOrCrop=Resize or Crop
 Recenter=Ricentra
 Author=Autore
 User=Utente
@@ -325,8 +328,10 @@ Default=Predefinito
 DefaultValue=Valore predefinito
 DefaultValues=Valori predefiniti
 Price=Prezzo
+PriceCurrency=Price (currency)
 UnitPrice=Prezzo unitario
 UnitPriceHT=Prezzo unitario (netto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Prezzo unitario (lordo)
 PriceU=P.U.
 PriceUHT=P.U.(netto)
@@ -334,15 +339,16 @@ PriceUHTCurrency=P.U. (valuta)
 PriceUTTC=P.U.(lordo)
 Amount=Importo
 AmountInvoice=Importo della fattura
+AmountInvoiced=Amount invoiced
 AmountPayment=Importo del pagamento
 AmountHTShort=Importo (netto)
 AmountTTCShort=Importo (IVA inc.)
 AmountHT=Importo (al netto delle imposte)
 AmountTTC=Importo (IVA inclusa)
 AmountVAT=Importo IVA
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAlreadyPaid=Già pagato, valuta originaria
+MulticurrencyRemainderToPay=Rimanente da pagare, valuta originaria
+MulticurrencyPaymentAmount=Importo del pagamento, valuta originaria
 MulticurrencyAmountHT=Importo (al netto delle imposte), valuta originaria
 MulticurrencyAmountTTC=Importo (imposte incluse), valuta originaria
 MulticurrencyAmountVAT=Importo delle tasse, valuta originaria
@@ -353,6 +359,7 @@ AmountLT2ES=Importo IRPF (Spagna)
 AmountTotal=Importo totale
 AmountAverage=Importo medio
 PriceQtyMinHT=Prezzo quantità min. tasse escluse
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentuale
 Total=Totale
 SubTotal=Totale parziale
@@ -374,7 +381,7 @@ TotalLT1IN=Totale CGST
 TotalLT2IN=Totale SGST
 HT=Al netto delle imposte
 TTC=IVA inclusa
-INCVATONLY=Inc. VAT
+INCVATONLY=IVA inclusa
 INCT=Inc. tutte le tasse
 VAT=IVA
 VATIN=IGST
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Aliquota IVA
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Valore base tassa
 Average=Media
 Sum=Somma
@@ -419,7 +428,8 @@ ActionRunningShort=Avviato
 ActionDoneShort=Fatto
 ActionUncomplete=Incompleto
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Società/Fondazione
+CompanyFoundation=Azienda/Organizzazione
+Accountant=Accountant
 ContactsForCompany=Contatti per il soggetto terzo
 ContactsAddressesForCompany=Contatti/indirizzi per questo soggetto terzo
 AddressesForCompany=Indirizzi per questo soggetto terzo
@@ -427,6 +437,9 @@ ActionsOnCompany=Azioni sul soggetto terzo
 ActionsOnMember=Azioni su questo membro
 ActionsOnProduct=Events about this product
 NActionsLate=%s azioni in ritardo
+ToDo=Da fare
+Completed=Completed
+Running=Avviato
 RequestAlreadyDone=Richiesta già registrata
 Filter=Filtro
 FilterOnInto=Criteri di ricerca '<strong>%s</strong>' nei campi %s
@@ -439,7 +452,7 @@ Duration=Durata
 TotalDuration=Durata totale
 Summary=Riepilogo
 DolibarrStateBoard=Statistiche Database
-DolibarrWorkBoard=Open items dashboard
+DolibarrWorkBoard=Dashboard degli elementi aperti
 NoOpenedElementToProcess=No opened element to process
 Available=Disponibile
 NotYetAvailable=Non ancora disponibile
@@ -475,7 +488,7 @@ Discount=Sconto
 Unknown=Sconosciuto
 General=Generale
 Size=Dimensione
-OriginalSize=Original size
+OriginalSize=Dimensioni originali
 Received=Ricevuto
 Paid=Pagato
 Topic=Oggetto
@@ -499,7 +512,7 @@ DeletePicture=Foto cancellata
 ConfirmDeletePicture=Confermi l'eliminazione della foto?
 Login=Login
 LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginOrEmail=Login o Email
 CurrentLogin=Accesso attuale
 EnterLoginDetail=Inserisci le credenziali di accesso
 January=Gennaio
@@ -653,7 +666,7 @@ SessionName=Nome sessione
 Method=Metodo
 Receive=Ricevi
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
+ExpectedValue=Valore atteso
 CurrentValue=Valore attuale
 PartialWoman=Parziale
 TotalWoman=Totale
@@ -678,7 +691,7 @@ CurrentTheme=Tema attuale
 CurrentMenuManager=Gestore dei menu attuale
 Browser=Browser
 Layout=Layout
-Screen=Screen
+Screen=Schermata
 DisabledModules=Moduli disabilitati
 For=Per
 ForCustomer=Per i clienti
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Attenzione, si è in modalità manutenzione. Solo
 CoreErrorTitle=Errore di sistema
 CoreErrorMessage=Si è verificato un errore. Controllare i log o contattare l'amministratore di sistema.
 CreditCard=Carta di credito
+ValidatePayment=Convalidare questo pagamento?
+CreditOrDebitCard=Carta di credito o debito 
 FieldsWithAreMandatory=I campi con <b>%s</b> sono obbligatori
 FieldsWithIsForPublic=I campi con <b>%s</b> vengono mostrati nell'elenco pubblico dei membri. Per evitarlo, deseleziona la casella <b>pubblica.</b>
 AccordingToGeoIPDatabase=(Secondo la conversione GeoIP)
@@ -767,16 +782,16 @@ from=da
 toward=verso
 Access=Accesso
 SelectAction=Seleziona azione
-SelectTargetUser=Select target user/employee
+SelectTargetUser=Seleziona utente/dipendente
 HelpCopyToClipboard=Usa Ctrl+C per copiare negli appunti
 SaveUploadedFileWithMask=Salva il file sul server con il nome "<strong>%s</strong>" (oppure "%s")
 OriginFileName=Nome originale del file
 SetDemandReason=Imposta sorgente
 SetBankAccount=Definisci un numero di Conto Corrente Bancario
-AccountCurrency=Account currency
+AccountCurrency=Valuta del conto
 ViewPrivateNote=Vedi note
 XMoreLines=%s linea(e) nascoste
-ShowMoreLines=Show more/less lines
+ShowMoreLines=Mostra più/meno righe
 PublicUrl=URL pubblico
 AddBox=Aggiungi box
 SelectElementAndClick=Seleziona un elemento e clicca %s
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Oggetti correlati
 ClassifyBilled=Classificare  fatturata
+ClassifyUnbilled=Classify unbilled
 Progress=Avanzamento
-ClickHere=Clicca qui
 FrontOffice=Front office
 BackOffice=Backoffice
 View=Vista
@@ -821,19 +836,19 @@ ExportOptions=Opzioni di esportazione
 Miscellaneous=Varie
 Calendar=Calendario
 GroupBy=Raggruppa per...
-ViewFlatList=View flat list
+ViewFlatList=Vedi lista semplice
 RemoveString=Rimuovi la stringa '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Link diretto per il download (pubblico/esterno)
+DirectDownloadInternalLink=Link per il download diretto (richiede accesso e permessi validi)
 Download=Download
-DownloadDocument=Download document
+DownloadDocument=Scarica documento
 ActualizeCurrency=Aggiorna tasso di cambio
 Fiscalyear=Anno fiscale
 ModuleBuilder=Mudulo programmatore
-SetMultiCurrencyCode=Set currency
+SetMultiCurrencyCode=Imposta valuta
 BulkActions=Bulk actions
-ClickToShowHelp=Click to show tooltip help
+ClickToShowHelp=Clicca per mostrare l'aiuto contestuale
 WebSite=Sito web
 WebSites=Siti web
 WebSiteAccounts=Web site accounts
@@ -844,13 +859,15 @@ HRAndBank=HR e Banca
 AutomaticallyCalculated=Calcolato automaticamente
 TitleSetToDraft=Torna a Bozza
 ConfirmSetToDraft=Sei sicuro che vuoi tornare allo stato di Bozza?
-ImportId=Import id
+ImportId=ID di importazione
 Events=Eventi
 EMailTemplates=Modelli email
-FileNotShared=File not shared to exernal public
+FileNotShared=File non condiviso pubblicamente
 Project=Progetto
 Projects=Progetti
 Rights=Autorizzazioni
+LineNb=Line no.
+IncotermLabel=Import-Export
 # Week day
 Monday=Lunedì
 Tuesday=Martedì
@@ -881,16 +898,16 @@ ShortFriday=Ven
 ShortSaturday=Sab
 ShortSunday=Dom
 SelectMailModel=Seleziona un tema email
-SetRef=Set ref
+SetRef=Imposta rif.
 Select2ResultFoundUseArrows=Alcuni risultati trovati. Usa le frecce per selezionare.
 Select2NotFound=Nessun risultato trovato
 Select2Enter=Immetti
-Select2MoreCharacter=or more character
+Select2MoreCharacter=o più caratteri
 Select2MoreCharacters=o più caratteri
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Caricamento di altri risultati ...
 Select2SearchInProgress=Ricerca in corso ...
-SearchIntoThirdparties=Terze parti
+SearchIntoThirdparties=Soggetti terzi
 SearchIntoContacts=Contatti
 SearchIntoMembers=Membri
 SearchIntoUsers=Utenti
@@ -914,5 +931,13 @@ CommentPage=Comments space
 CommentAdded=Commento aggiunto
 CommentDeleted=Commento cancellato
 Everybody=Progetto condiviso
-PayedBy=Payed by
-PayedTo=Payed to
+PayedBy=Pagato da
+PayedTo=Pagato a
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Azione assegnata a
diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang
index 5ffcbae69c5..b35ffad87f7 100644
--- a/htdocs/langs/it_IT/margins.lang
+++ b/htdocs/langs/it_IT/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Il rapporto deve essere un numero
 markRateShouldBeLesserThan100=Il rapporto deve essere inferiore a 100
 ShowMarginInfos=Mostra informazioni sui margini
 CheckMargins=Dettagli dei margini
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index a6592070d28..1f269b0f7f7 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Elenco membri pubblici convalidati
 ErrorThisMemberIsNotPublic=Questo membro non è pubblico
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altro membro (nome: <b>%s</b>, login: <b>%s</b>) è già collegato al soggettoterzo <b>%s</b>. Rimuovi il collegamento esistente. Un soggetto terzo può essere collegato ad un solo membro (e viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per motivi di sicurezza, è necessario possedere permessi di modifica di tutti gli utenti per poter modificare un membro diverso da sé stessi.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Contenuto della scheda membro
 SetLinkToUser=Link a un utente Dolibarr
 SetLinkToThirdParty=Link ad un soggetto terzo
 MembersCards=Schede membri
@@ -108,17 +106,33 @@ PublicMemberCard=Scheda membro pubblico
 SubscriptionNotRecorded=Adesione non registrata
 AddSubscription=Crea sottoscrizione
 ShowSubscription=Visualizza adesione
-SendAnEMailToMember=Invia email ai membri
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Contenuto della scheda membro
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Oggetto della email che riceve un ospite quando si auto-iscrive
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email che riceve un ospite quando si auto-iscrive
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Oggetto email inviata per adesione automatica
-DescADHERENT_AUTOREGISTER_MAIL=Testo email inviata per adesione automatica
-DescADHERENT_MAIL_VALID_SUBJECT=Titolo email di convalida membro
-DescADHERENT_MAIL_VALID=Testo email di convalida membro
-DescADHERENT_MAIL_COTIS_SUBJECT=Titolo email per conferma adesione
-DescADHERENT_MAIL_COTIS=Testo email per conferma adesione
-DescADHERENT_MAIL_RESIL_SUBJECT=Titolo email rescissione adesione
-DescADHERENT_MAIL_RESIL=Testo email rescissione adesione
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Mittente email
 DescADHERENT_ETIQUETTE_TYPE=Formato etichette
 DescADHERENT_ETIQUETTE_TEXT=Testo da stampare nel campo indirizzo di un membro
@@ -177,3 +191,8 @@ NoVatOnSubscription=Nessuna IVA per gli abbonamenti
 MEMBER_PAYONLINE_SENDEMAIL=Indirizzo email cui inviare gli avvisi di conferma ricezione del pagamento per adesione (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prodotto utilizzato per la riga dell'abbonamento in fattura: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index b8177dbf8b3..ec5732e579c 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 47ffd21c2f5..3110780c26c 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -16,12 +16,14 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+ZipFileGeneratedInto=Archivio zip generato in <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Messaggio sulla pagina di pagamento convalidato
 MessageKO=Messaggio sulla pagina di pagamento annullato
+ContentOfDirectoryIsNotEmpty=La directory non è vuota.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Oggetto collegato
 NbOfActiveNotifications=Numero di notifiche (num. di email da ricevere)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -170,9 +172,9 @@ ProfIdShortDesc=<b>Prof ID %s</b> è un dato dipendente dal paese terzo.<br/> Ad
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
 StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of customer orders
-NumberOfCustomerInvoices=Number of customer invoices
+NumberOfProposals=Numero di preventivi
+NumberOfCustomerOrders=Numero di ordini cliente
+NumberOfCustomerInvoices=Numero di ordini fornitore
 NumberOfSupplierProposals=Number of supplier proposals
 NumberOfSupplierOrders=Number of supplier orders
 NumberOfSupplierInvoices=Number of supplier invoices
@@ -214,6 +216,7 @@ StartUpload=Carica
 CancelUpload=Annulla caricamento
 FileIsTooBig=File troppo grande
 PleaseBePatient=Attendere, prego...
+NewPassword=Nuova password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Una richiesta di cambio della tua password è stata ricevuta
 NewKeyIs=Queste sono le tue nuove credenziali di accesso
@@ -239,7 +242,8 @@ ExportableDatas=Dati Esportabili
 NoExportableData=Nessun dato esportabile (nessun modulo con dati esportabili attivo o autorizzazioni mancanti)
 ##### External sites #####
 WebsiteSetup=Impostazioni modulo Website
-WEBSITE_PAGEURL=URL of page
+WEBSITE_PAGEURL=Indirizzo URL della pagina
 WEBSITE_TITLE=Titolo
 WEBSITE_DESCRIPTION=Descrizione
-WEBSITE_KEYWORDS=Keywords
+WEBSITE_KEYWORDS=Parole chiave
+LinesToImport=Lines to import
diff --git a/htdocs/langs/it_IT/paypal.lang b/htdocs/langs/it_IT/paypal.lang
index 207f1b5f227..7e4fe338329 100644
--- a/htdocs/langs/it_IT/paypal.lang
+++ b/htdocs/langs/it_IT/paypal.lang
@@ -7,14 +7,14 @@ PAYPAL_API_SANDBOX=Modalità di test/sandbox
 PAYPAL_API_USER=Nome utente API
 PAYPAL_API_PASSWORD=Password API
 PAYPAL_API_SIGNATURE=Firma API
-PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_SSLVERSION=Versione SSL Curl
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offerta di pagamento completo (Carta di credito + Paypal) o solo Paypal
 PaypalModeIntegral=Completo
 PaypalModeOnlyPaypal=Solo PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=L'id di transazione è: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Aggiungere l'URL di pagamento Paypal quando si invia un documento per posta
-PredefinedMailContentLink=Per completare il pagamento PayPal, puoi cliccare sul link qui sotto.\n\n%s
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=Nuovo pagamento online ricevuto
 NewOnlinePaymentFailed=Nuovo tentativo di pagamento online fallito
@@ -30,3 +30,6 @@ ErrorCode=Codice errore
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Sistema di pagamento online
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 40da50bf79f..ff1d763c317 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Prodotto o servizio
 ProductsAndServices=Prodotti e Servizi
 ProductsOrServices=Prodotti o servizi
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Prodotto solo per la vendita
 ProductsOnPurchaseOnly=Prodotto solo per l'acquisto
 ProductsNotOnSell=Prodotto non in vendita e non acquistabili
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Vuoi davvero cancellare questa linea di prodotti?
 ProductSpecial=Prodotto speciale
 QtyMin=Quantità minima
 PriceQtyMin=Prezzo per questa quantità minima (senza sconti)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Aliquota IVA (per questo prodotto)
 DiscountQtyMin=Sconto automatico per la quantità
 NoPriceDefinedForThisSupplier=Nessun prezzo/quantità definito per questo fornitore/prodotto
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index d6e322880fa..b43c5c69313 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -16,7 +16,7 @@ TasksOnProjectsPublicDesc=Questa vista presenta tutte le attività nei progetti
 ProjectsPublicTaskDesc=Questa prospettiva presenta tutti i progetti e le attività a cui è permesso accedere.
 ProjectsDesc=Questa visualizzazione mostra tutti i progetti (hai i privilegi per vedere tutto).
 TasksOnProjectsDesc=Questa visualizzazione mostra tutti i compiti di ogni progetto (hai i privilegi per vedere tutto).
-MyTasksDesc=La vista è limitata ai progetti o attività di cui tu sei un contatto.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Sono visibili solamente i progetti aperti (i progetti con stato di bozza o chiusi non sono visibili).
 ClosedProjectsAreHidden=I progetti chiusi non sono visibili.
 TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che hai il permesso di vedere.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Compiti relativi a progetti aperti
 WorkloadNotDefined=Carico di lavoro non definito
 NewTimeSpent=Tempo lavorato
 MyTimeSpent=Il mio tempo lavorato
+BillTime=Bill the time spent
 Tasks=Compiti
 Task=Compito
 TaskDateStart=Data inizio attività
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Elenco delle donazioni associate al progetto
 ListVariousPaymentsAssociatedProject=Pagamenti vari associati al progetto
 ListActionsAssociatedProject=Elenco delle azioni associate al progetto
 ListTaskTimeUserProject=Tempo impiegato in compiti del progetto
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Operatività sul progetto oggi
 ActivityOnProjectYesterday=Attività sul progetto ieri
 ActivityOnProjectThisWeek=Operatività sul progetto questa settimana
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Operatività sul progetto questo mese
 ActivityOnProjectThisYear=Operatività sul progetto nell'anno in corso
 ChildOfProjectTask=Figlio del progetto/compito
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Non sei proprietario di questo progetto privato
 AffectedTo=Assegnato a
 CantRemoveProject=Questo progetto non può essere rimosso: altri oggetti (fatture, ordini, ecc...) vi fanno riferimento. Guarda la scheda riferimenti.
@@ -137,6 +140,7 @@ ProjectReportDate=Cambia la data del compito a seconda della data di inizio prog
 ErrorShiftTaskDate=Impossibile cambiare la data del compito a seconda della data di inizio del progetto
 ProjectsAndTasksLines=Progetti e compiti
 ProjectCreatedInDolibarr=Progetto %s creato
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Progetto %s modificato
 TaskCreatedInDolibarr=Attività %s creata
 TaskModifiedInDolibarr=Attività %s modificata
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Ultimi %s progetti
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Permetti agli utenti di commentare queste attività
 AllowCommentOnProject=Permetti agli utenti di commentare questi progetti
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index ea4314267b4..9798c886935 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -1,65 +1,66 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Preventivi/Proposte commerciali
-Proposal=Preventivo/Proposta commerciale
-ProposalShort=Proposta
-ProposalsDraft=Bozza di proposte commerciali
-ProposalsOpened=Proposte commerciali aperte
-CommercialProposal=Preventivo/Proposta commerciale
-PdfCommercialProposalTitle=Preventivo/Proposta commerciale
-ProposalCard=Proposta di carta
-NewProp=Nuova proposta commerciale
-NewPropal=Nuova proposta
+Proposals=Preventivi
+Proposal=Preventivo
+ProposalShort=Preventivo
+ProposalsDraft=Bozza di preventivo
+ProposalsOpened=Preventivi aperti
+CommercialProposal=Preventivo
+PdfCommercialProposalTitle=Preventivo
+ProposalCard=Scheda preventivo
+NewProp=Nuovo preventivo
+NewPropal=Nuovo preventivo
 Prospect=Potenziale cliente
-DeleteProp=Elimina proposta commerciale
-ValidateProp=Convalida proposta commerciale
-AddProp=Crea proposta
-ConfirmDeleteProp=Vuoi davvero eliminare questa proposta commerciale?
-ConfirmValidateProp=Vuoi davvero convalidare questa proposta commerciale con il riferimento <b>%s</b>?
+DeleteProp=Elimina preventivo
+ValidateProp=Convalida preventivo
+AddProp=Crea preventivo
+ConfirmDeleteProp=Vuoi davvero eliminare questo preventivo?
+ConfirmValidateProp=Vuoi davvero convalidare questa preventivo con riferimento <b>%s</b>?
 LastPropals=Ultime %s proposte
 LastModifiedProposals=Ultime %s proposte modificate
-AllPropals=Tutte le proposte
-SearchAProposal=Cerca una proposta
-NoProposal=Nessuna proposta
-ProposalsStatistics=Statistiche Proposte commerciali
+AllPropals=Tutti i preventivi
+SearchAProposal=Cerca un preventivo
+NoProposal=Nessun preventivo
+ProposalsStatistics=Statistiche Preventivi
 NumberOfProposalsByMonth=Numero per mese
 AmountOfProposalsByMonthHT=Importo per mese (al netto delle imposte)
-NbOfProposals=Numero di proposte commerciali
-ShowPropal=Visualizza proposta
+NbOfProposals=Numero di preventivi
+ShowPropal=Visualizza preventivo
 PropalsDraft=Bozze
 PropalsOpened=Aperto
 PropalStatusDraft=Bozza (deve essere convalidata)
-PropalStatusValidated=Convalidata (proposta aperta)
-PropalStatusSigned=Firmata (da fatturare)
-PropalStatusNotSigned=Non firmata (chiuso)
-PropalStatusBilled=Fatturata
+PropalStatusValidated=Convalidato (preventivo aperto)
+PropalStatusSigned=Firmato (da fatturare)
+PropalStatusNotSigned=Non firmato (chiuso)
+PropalStatusBilled=Fatturato
 PropalStatusDraftShort=Bozza
-PropalStatusClosedShort=Chiusa
-PropalStatusSignedShort=Firmata
-PropalStatusNotSignedShort=Non firmata
-PropalStatusBilledShort=Fatturata
-PropalsToClose=Proposte commerciali da chiudere
-PropalsToBill=Proposte commerciali firmate da fatturare
-ListOfProposals=Elenco delle proposte commerciali
-ActionsOnPropal=Azioni su proposta
-RefProposal=Rif. Proposta commerciale
-SendPropalByMail=Invia proposta commerciale via e-mail
-DatePropal=Data della proposta
+PropalStatusValidatedShort=Convalidato
+PropalStatusClosedShort=Chiuso
+PropalStatusSignedShort=Firmato
+PropalStatusNotSignedShort=Non firmato
+PropalStatusBilledShort=Fatturato
+PropalsToClose=Preventivi da chiudere
+PropalsToBill=Preventivi firmati da fatturare
+ListOfProposals=Elenco dei preventivi
+ActionsOnPropal=Azioni sul preventivo
+RefProposal=Rif. Preventivo
+SendPropalByMail=Invia preventivo via e-mail
+DatePropal=Data del preventivo
 DateEndPropal=Data di fine validità
 ValidityDuration=Durata validità
 CloseAs=Imposta lo stato a
-SetAcceptedRefused=Imposta accettata/rifiutata
-ErrorPropalNotFound=Proposta %s non trovata
-AddToDraftProposals=Aggiungi una bozza di proposta
-NoDraftProposals=Nessuna bozza di proposta
-CopyPropalFrom=Crea proposta commerciale da copia esistente
-CreateEmptyPropal=Crea proposta commerciale vuota o dalla lista dei prodotti / servizi
-DefaultProposalDurationValidity=Durata di validità predefinita per proposta commerciale (in giorni)
+SetAcceptedRefused=Imposta accettato/rifiutato
+ErrorPropalNotFound=Preventivo %s non trovato
+AddToDraftProposals=Aggiungi una bozza di preventivo
+NoDraftProposals=Nessuna bozza di preventivo
+CopyPropalFrom=Crea preventivo da uno esistente
+CreateEmptyPropal=Crea preventivo vuoto o dalla lista dei prodotti / servizi
+DefaultProposalDurationValidity=Durata di validità predefinita per i preventivi (in giorni)
 UseCustomerContactAsPropalRecipientIfExist=Utilizzare l'indirizzo del contatto cliente se definito al posto dell'indirizzo del destinatario
-ClonePropal=Clona proposta commerciale
-ConfirmClonePropal=Vuoi davvero clonare la proposta commerciale <b>%s</b>?
-ConfirmReOpenProp=Vuoi davvero riaprire la proposta commerciale <b>%s</b>?
-ProposalsAndProposalsLines=Proposta commerciale e le linee
-ProposalLine=Linea della proposta
+ClonePropal=Clona preventivo
+ConfirmClonePropal=Vuoi davvero clonare il preventivo<b>%s</b>?
+ConfirmReOpenProp=Vuoi davvero riaprire il preventivo <b>%s</b>?
+ProposalsAndProposalsLines=Preventivo e righe
+ProposalLine=Riga di preventivo
 AvailabilityPeriod=Tempi di consegna
 SetAvailability=Imposta i tempi di consegna
 AfterOrder=dopo ordine
@@ -71,13 +72,13 @@ AvailabilityTypeAV_2W=2 settimane
 AvailabilityTypeAV_3W=3 settimane
 AvailabilityTypeAV_1M=1 mese
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Responsabile proposta vendita
-TypeContact_propal_external_BILLING=Contatto proposta fatturazione
-TypeContact_propal_external_CUSTOMER=Contatto proposta clienti
+TypeContact_propal_internal_SALESREPFOLL=Responsabile del preventivo
+TypeContact_propal_external_BILLING=Contatto per la fatturazione
+TypeContact_propal_external_CUSTOMER=Responsabile per il cliente
 # Document models
-DocModelAzurDescription=Modello di proposta completa (logo...)
+DocModelAzurDescription=Modello di preventivo completo (logo...)
 DefaultModelPropalCreate=Creazione del modello predefinito
-DefaultModelPropalToBill=Template predefinito quando si chiude una proposta commerciale (*preventivo) (che deve essere fatturata)
-DefaultModelPropalClosed=Template predefinito quando si chiude una proposta commerciale (*preventivo) (che non deve essere fatturata)
-ProposalCustomerSignature=Scritta di accettazione, timbro, data e firma
-ProposalsStatisticsSuppliers=Statistiche proposte Fornitore
+DefaultModelPropalToBill=Modello predefinito quando si chiude un preventivo (da fatturare)
+DefaultModelPropalClosed=Modello predefinito quando si chiude un preventivo (da non fatturare)
+ProposalCustomerSignature=Accettazione scritta, timbro, data e firma
+ProposalsStatisticsSuppliers=Statistiche preventivi fornitori
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index 5c316303c8b..482d9161666 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Questo valore viene usato per calcolare il costo delle ore spese
 TJMDescription=Attualmente il valore è solo un dato informativo e non viene usato per alcun calcolo automatico
 LastSalaries=Ultimo %s pagamento dello stipendio
 AllSalaries=Tutti i pagamenti degli stipendi
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index f22798c7508..4952a4d6e05 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modifica magazzino
 MenuNewWarehouse=Nuovo Magazzino
 WarehouseSource=Magazzino di origine
 WarehouseSourceNotDefined=Non è stato definito alcun magazzino.
+AddWarehouse=Create warehouse
 AddOne=Aggiungi uno
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Magazzino di destinazione
 ValidateSending=Convalida spedizione
 CancelSending=Annulla spedizione
@@ -22,6 +24,7 @@ Movements=Movimenti
 ErrorWarehouseRefRequired=Riferimento magazzino mancante
 ListOfWarehouses=Elenco magazzini
 ListOfStockMovements=Elenco movimenti delle scorte
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=Elenco dei movimenti delle scorte associati al progetto
diff --git a/htdocs/langs/it_IT/stripe.lang b/htdocs/langs/it_IT/stripe.lang
index 037772fdc72..40ec0115666 100644
--- a/htdocs/langs/it_IT/stripe.lang
+++ b/htdocs/langs/it_IT/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang
index 83531b275e5..7296000719a 100644
--- a/htdocs/langs/it_IT/trips.lang
+++ b/htdocs/langs/it_IT/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Mostra note spese
 NewTrip=Nuova nota spese
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Azienda/organizzazione visitata
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Tariffa kilometrica o importo
 DeleteTrip=Elimina nota spese
 ConfirmDeleteTrip=Vuoi davvero eliminare questa nota spese?
@@ -21,17 +21,17 @@ ListToApprove=In attesa di approvazione
 ExpensesArea=Area note spese
 ClassifyRefunded=Classifica come "Rimborsata"
 ExpenseReportWaitingForApproval=È stata inserita una nuova nota spese da approvare
-ExpenseReportWaitingForApprovalMessage=È stata inserita una nuova nota spese da approvare.\n- Utente: %s\n- Periodo: %s\nClicca qui per approvarla: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=Una nota spese è stata sottomessa per la pre-approvazione
-ExpenseReportWaitingForReApprovalMessage=Una nota spese è stata sottomessa ed è in attesa di pre-approvazione.\nIl %s, ti sei rifiutato di approvare la nota spese per queste ragioni: %s.\nUna nuova versione è stata proposta ed è in attesa di approvazione.\n- Utente: %s\n- Periodo: %s\nClicca qui per validare: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=Una nota spese è stata approvata
-ExpenseReportApprovedMessage=Questa nota spese %s è stata approvata.\n- Utente: %s\n- Approvata da: %s\nClicca qui per mostrare la nota spese: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=Una nota spese è stata rifiutata
-ExpenseReportRefusedMessage=Questa nota spese %s è stata rifiutata.\n- Utente: %s\n- Rifiutata da: %s\n- Motivo del rifiuto: %s\nClicca qui per mostrare la nota spese: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=Una nota spese è stata cancellata
-ExpenseReportCanceledMessage=Questa nota spese %s è stata cancellata.\n- Utente: %s\n- Cancellata da: %s\n- Motivo della cancellazione: %s\nClicca qui per mostrare la nota spese: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=Una nota spese è stata pagata
-ExpenseReportPaidMessage=Questa nota spese %s è stata pagata.\n- Utente: %s\n- Pagata da: %s\nClicca qui per mostrare la nota spese: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=ID nota spese
 AnyOtherInThisListCanValidate=Persona da informare per la convalida
 TripSociete=Informazioni azienda
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Hai già inviata una nota spese per il periodo selezionato
 AucuneLigne=Non ci sono ancora note spese
 
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index df90d43b368..38bd77c3c73 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -6,7 +6,7 @@ Permission=Autorizzazione
 Permissions=Autorizzazioni
 EditPassword=Modifica la password
 SendNewPassword=Invia nuova password
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Invia link per reimpostare la password
 ReinitPassword=Genera nuova password
 PasswordChangedTo=Password cambiata a: %s
 SubjectNewPassword=La tua nuova password per %s
@@ -44,9 +44,9 @@ NewGroup=Nuovo gruppo
 CreateGroup=Crea gruppo
 RemoveFromGroup=Rimuovi dal gruppo
 PasswordChangedAndSentTo=Password cambiata ed inviata a <b>%s</b>
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=Richiesta di modifica della password per <b>%s</b>
 PasswordChangeRequestSent=Richiesta di cambio password per <b>%s</b> da inviare a <b>%s</b>.
-ConfirmPasswordReset=Confirm password reset
+ConfirmPasswordReset=Conferma la reimpostazione della password
 MenuUsersAndGroups=Utenti e gruppi
 LastGroupsCreated=Ultimi %s gruppi creati
 LastUsersCreated=Ultimi %s utenti creati
@@ -69,8 +69,8 @@ InternalUser=Utente interno
 ExportDataset_user_1=Utenti e proprietà di Dolibarr
 DomainUser=Utente di dominio %s
 Reactivate=Riattiva
-CreateInternalUserDesc=Questo modulo ti permette di creare un utente interno alla tua azienda/fondazione. Per creare un utente esterno (clienti, fornitori, .. ) utilizza il bottone 'Crea utente' nella scheda soggetti terzi.
-InternalExternalDesc=Un utente <b>interno</b> è un utente che fa parte della vostra Azienda/Fondazione.<br>Un utente <b>esterno</b> è un cliente, un fornitore o altro.<br><br>In entrambi i casi, le autorizzazioni definiscono i diritti all'interno di Dolibarr. Ad un utente esterno si può assegnare un gestore dei menu diverso (vedi Home - Impostazioni - Visualizzazione).
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Autorizzazioni ereditate dall'appartenenza al gruppo.
 Inherited=Ereditato
 UserWillBeInternalUser=L'utente sarà un utente interno (in quanto non collegato a un soggetto terzo)
@@ -93,6 +93,7 @@ NameToCreate=Nome del soggetto terzo da creare
 YourRole=Il tuo ruolo
 YourQuotaOfUsersIsReached=Hai raggiunto la tua quota di utenti attivi!
 NbOfUsers=Numero di utenti
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Solo un superadmin può declassare un superadmin
 HierarchicalResponsible=Supervisore
 HierarchicView=Vista gerarchica
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index ec27d7e209f..e9dbb51b770 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -4,12 +4,14 @@ WebsiteSetupDesc=Crea qui tante voci quante il numero di siti ti servono. Vai po
 DeleteWebsite=Cancella sito web
 ConfirmDeleteWebsite=Sei sicuro di vole cancellare questo sito web? Anche tutte le pagine e contenuti saranno cancellati.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Titolo/alias della pagina
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=Indirizzo URL del file CSS esterno
 WEBSITE_CSS_INLINE=contenuto file CSS (comune a tutte le pagine)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_ROBOT=File Robot (robots.txt)
 WEBSITE_HTACCESS=Web site .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
@@ -19,7 +21,7 @@ EditCss=Edita Header Style/CSS o HTML
 EditMenu=Modifica menu
 EditMedias=Edit medias
 EditPageMeta=Modifica metadati
-AddWebsite=Add website
+AddWebsite=Aggiungi sito web
 Webpage=Web page/container
 AddPage=Aggiungi pagina/contenitore
 HomePage=Home Page
@@ -34,17 +36,21 @@ ViewPageInNewTab=Visualizza pagina in una nuova scheda
 SetAsHomePage=Imposta come homepage
 RealURL=Indirizzo URL vero
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Da leggere
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Sito web aggiunto
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -54,9 +60,9 @@ CreateByFetchingExternalPage=Create page/container by fetching page from externa
 OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
-IDOfPage=Id of page
-Banner=Bandeau
-BlogPost=Blog post
+IDOfPage=ID della pagina
+Banner=Banner
+BlogPost=Articoli sul blog
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
 AddWebsiteAccount=Create web site account
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index fe8125f0f57..03ef473a663 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Domiciliazione bancaria
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Domiciliazione bancaria
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Da processare
 WithdrawalsReceipts=Ordini di addebito diretto
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Codice bancario di soggetti terzi
-NoInvoiceCouldBeWithdrawed=Non ci sono fatture riscuotibili con domiciliazione. Verificare che sulle fatture sia riportato il corretto codice IBAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classifica come accreditata
 ClassCreditedConfirm=Vuoi davvero classificare questa ricevuta di domiciliazione come accreditata sul vostro conto bancario?
 TransData=Data di trasmissione
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,17 +87,21 @@ SepaMandateShort=SEPA Mandate
 PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
 SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
 CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor’s Name
+CreditorName=Nome del creditore
 SEPAFillForm=(B) Please complete all the fields marked *
 SEPAFormYourName=Il tuo nome
 SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
+SEPAFrstOrRecur=Tipo di pagamento
+ModeRECUR=Pagamento ricorrente
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 8e095548da9..7e8b490983a 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=自然
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=販売
 AccountingJournalType3=購入
 AccountingJournalType4=バンク
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 0236dcfcba5..0323daf2866 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=エラー、シーケンス場合は、@オプションを使用することはできません{YY} {ミリメートル}または{探す} {mmは}マスクではありません。
 UMask=のUnix / Linux / BSDのファイルシステム上に新しいファイルのumaskパラメータ。
 UMaskExplanation=このパラメータは、（たとえば、アップロード中に）、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができます。 <br>それは、8進値（例えば、0666の手段みんなのための読み取りおよび書き込み）である必要があります。 <br>このパラメータは、Windowsサーバー上では役に立ちません。
-SeeWikiForAllTeam=すべての俳優とその組織の完全なリストについては、wikiページを見てみましょう
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= 秒単位で輸出応答をキャッシュするための遅延（0またはキャッシュなしの空の）
 DisableLinkToHelpCenter=ログインページのリンク&quot; <b>ヘルプやサポートが必要</b> &quot; <b>を</b>隠す
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=文字列
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=ユーザーとグループ
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=インコターム
+Module62000Desc=インコタームを管理する機能を追加
 Module63000Name=資源
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=顧客の請求書をお読みください
@@ -833,11 +838,11 @@ Permission1251=データベース（データロード）に外部データの
 Permission1321=顧客の請求書、属性、および支払いをエクスポートする
 Permission1322=Reopen a paid bill
 Permission1421=顧客の注文と属性をエクスポートします。
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=支払条件
 DictionaryPaymentModes=支払いモード
 DictionaryTypeContact=種類をお問い合わせ
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax（WEEE）
 DictionaryPaperFormat=紙の形式
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=付加価値税管理
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=デフォルトでは、提案されたVATが0団体のような場合に使用することができますされ、個人が小さな会社をOU。
-VATIsUsedExampleFR=フランスでは、実際の財政制度（REALまたは通常の本当の簡略化）を有する企業または組織を意味します。 VATのシステムが宣言されています。
-VATIsNotUsedExampleFR=フランスでは、それ以外の付加価値を宣言したりしている会社、組織またはマイクロ企業の財政制度（フランチャイズでVAT）を選択し、任意の付加価値税申告せずにフランチャイズ税を支払っているリベラルな職業されている団体を意味します。請求書に -  &quot;CGIの芸術-293B非適用されるVAT&quot;この選択は、参照が表示されます。
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=率
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=サーバ
 DriverType=ドライバの種類
 SummarySystem=システム情報の概要
 SummaryConst=すべてのDolibarrセットアップパラメータのリスト
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= 標準メニューマネージャ
 DefaultMenuSmartphoneManager=スマートフォンメニューマネージャ
 Skin=皮膚のテーマ
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
 DefaultLanguage=使用する既定の言語（言語コード）
 EnableMultilangInterface=多言語のインターフェイスをイネーブルにします。
 EnableShowLogo=左メニューのロゴを表示する
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=名
 CompanyAddress=アドレス
 CompanyZip=ZIP
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報です。
 SystemAreaForAdminOnly=この領域は、管理者ユーザーのために利用可能です。 Dolibarr権限のいずれも、この制限を減らすことはできません。
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=あなたがDolibarrの外観に関連する各パラメータを選択し、ここで感じることができる
 AvailableModules=Available app/modules
 ToActivateModule=モジュールを有効にするには、設定エリア（ホーム - &gt;セットアップ - &gt;モジュール）に行く。
@@ -1441,6 +1448,9 @@ SyslogFilename=ファイル名とパス
 YouCanUseDOL_DATA_ROOT=あなたがDolibarr &quot;ドキュメント&quot;ディレクトリ内のログ·ファイルのDOL_DATA_ROOT / dolibarr.logを使用することができます。このファイルを格納する別のパスを設定することができます。
 ErrorUnknownSyslogConstant=定数%sは知られているSyslogの定数ではありません。
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=寄付モジュールのセットアップ
 DonationsReceiptModel=寄付金の領収書のテンプレート
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=により、付加価値税
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=付加価値税（VAT）が原因です。 <br> - 貨物の配達に（我々は請求書の日付を使用します） <br> - サービスの支払いに
 OptionVatDebitOptionDesc=付加価値税（VAT）が原因です。 <br> - 貨物の配達に（我々は請求書の日付を使用します） <br> - サービスの請求書（デビット）の
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=着払い
 OnPayment=支払いに
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=使用される請求書の日付
 Buy=購入する
 Sell=販売
 InvoiceDateUsed=使用される請求書の日付
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 21f9cb541e7..e54b4382dfd 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=また、出力をフィルタリングするには、次の
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=輸出カレンダー
 ExtSites=外部カレンダーをインポートする
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=カレンダーの数
-AgendaExtNb=カレンダーNB %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=。iCalファイルにアクセスするためのURL
 ExtSiteNoLabel=全く説明がありません
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 96acba5c364..8abdb414ba7 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=支払いを削除します。
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=仕入先の支払
 ReceivedPayments=受け取った支払い
 ReceivedCustomersPayments=顧客から受け取った支払
@@ -91,7 +92,7 @@ PaymentAmount=支払金額
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=支払うために思い出させるよりも高い支払い
 HelpPaymentHigherThanReminderToPay=注目は、1つまたは複数の請求書の支払額を支払うための残りの部分よりも高くなっています。 <br>あなたのエントリを編集し、それ以外の場合は確認して、それぞれの過払い請求のために受け取った過剰のクレジットメモを作成する方法について考える。
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=分類 '有料'
 ClassifyPaidPartially='は部分的に有料 &quot;に分類
 ClassifyCanceled=&quot;放棄&quot;を分類する
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=将来の割引に変換
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力します。
 EnterPaymentDueToCustomer=顧客のために支払いをする
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ドラフト（検証する必要があります）
 BillStatusPaid=有料
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=（最終的な請求書の準備ができて）支払わ
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=放棄された
 BillStatusValidated=（お支払いする必要があります）を検証
 BillStatusStarted=開始
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=量が主張
 ExcessReceived=過剰は、受信した
+ExcessPaid=Excess paid
 EscompteOffered=提供される割引（用語の前にお支払い）
 EscompteOfferedShort=割引
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=クレジットノート%sから割引
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=クレジットこの種のは、その検証の前に請求書に使用することができます
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=新しい絶対割引
 NewRelativeDiscount=新しい相対的な割引
+DiscountType=Discount type
 NoteReason=（注）/理由
 ReasonDiscount=理由
 DiscountOfferedBy=によって付与された
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=ビル·アドレス
 HelpEscompte=この割引は、その支払いが長期前に行われたため、顧客に付与された割引です。
 HelpAbandonBadCustomer=この金額は、放棄されている（顧客が悪い顧客であると）と卓越した緩いとみなされます。
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 9754b2d7938..257e55b2302 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -43,7 +43,8 @@ Individual=私人
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=親会社
 Subsidiaries=子会社
-ReportByCustomers=お客様によるレポート
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=率による報告
 CivilityCode=礼儀正しさコード
 RegisteredOffice=登録事務所
@@ -75,10 +76,12 @@ Town=シティ
 Web=ウェブ
 Poste= 位置
 DefaultLang=デフォルトでは、言語
-VATIsUsed=付加価値税（VAT）は使用されている
-VATIsNotUsed=付加価値税（VAT）は使用されていません
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=提案
 OverAllOrders=受注
@@ -239,7 +242,7 @@ ProfId3TN=教授はID 3（Douaneコード）
 ProfId4TN=教授はID 4（BAN）
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT番号
-VATIntraShort=VAT番号
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=構文は有効です。
+VATReturn=VAT return
 ProspectCustomer=プロスペクト/顧客
 Prospect=見通し
 CustomerCard=顧客カード
 Customer=顧客
 CustomerRelativeDiscount=相対的な顧客割引
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=相対的な割引
 CustomerAbsoluteDiscountShort=絶対的な割引
 CompanyHasRelativeDiscount=この顧客は<b>%sの%%</b>デフォルトの割引を持っている
 CompanyHasNoRelativeDiscount=この顧客は、デフォルトではなく相対的な割引がありません
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=この顧客はまだ<b>%s %s</b>のためにクレジットノートを持っている
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=この顧客は、使用可能な割引クレジットを持っていません
-CustomerAbsoluteDiscountAllUsers=絶対的な割引（すべてのユーザーによって付与された）
-CustomerAbsoluteDiscountMy=絶対的な割引（自分で付与される）
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=なし
 Supplier=サプライヤー
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=いいえDolibarrアクセス​​できない
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 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_3=銀行の詳細
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=価格水準
 DeliveryAddress=配信アドレス
 AddAddress=アドレスを追加します。
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=yyは年である顧客コードと仕入先コードの%syymm-nnnnの形式%syymm-NNNNとニュメロを返し、mmは月とnnnnはありません休憩0〜ノーリターンでシーケンスです。
 LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。このコードは、いつでも変更することができます。
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index e824f33424a..5fa9461dc31 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -31,7 +31,7 @@ Credit=クレジット
 Piece=Accounting Doc.
 AmountHTVATRealReceived=ネットが収集した
 AmountHTVATRealPaid=ネットが支払われ
-VATToPay=付加価値販売
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF支払い
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=付加価値税の支払いを表示する
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- それは、クライアントから受け取った請求書のすべての効果的な支払いが含まれています。 <br> - これは、これらの請求書の支払日に基づいている<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=第三者IRPFによる報告
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=第三者IRPFによる報告
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=標準的な計算のためのレポート<b>%sVATのencasement%sを</b>参照<b>して</b>ください。
 SeeVATReportInDueDebtMode=フローのオプションを使用して計算に<b>flow%sの</b>レポート<b>%sVATを</b>参照<b>して</b>ください。
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- 材料の資産については、請求書の日付に基づいて付加価値税の請求書が含まれています。
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- サービスについては、報告書は、請求書の日付に基づいているため、有料かどうか付加価値税の請求書が含まれています。
-RulesVATDueProducts=- 材料の資産については、請求書の日付に基づいて、付加価値税の請求書が含まれています。
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=注：材料の資産については、それがより公正に配信した日付を使用する必要があります。
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=％％/請求書
 NotUsedForGoods=財では使用しません
 ProposalStats=提案に関する統計
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 1063e63c3f5..86ba20bd260 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=優先順位
 CronLabel=ラベル
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=から
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 15767e246e2..984ad21cc64 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAPのマッチングは完全ではあり
 ErrorLDAPMakeManualTest=。ldifファイルは、ディレクトリ%sで生成されました。エラーの詳細情報を持つようにコマンドラインから手動でそれをロードしようとする。
 ErrorCantSaveADoneUserWithZeroPercentage=&quot;で行われた&quot;フィールドも満たされている場合は、 &quot;statutが起動していない&quot;とアクションを保存することはできません。
 ErrorRefAlreadyExists=作成に使用refは、すでに存在しています。
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
index 7db594c715e..a62e22dca79 100644
--- a/htdocs/langs/ja_JP/loan.lang
+++ b/htdocs/langs/ja_JP/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 2f0a4d0d115..a582d7c800a 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index b80b3b2bb45..5101965d6c2 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=パラメータが定義されていない%s
 ErrorUnknown=Unknown error
 ErrorSQL=SQLエラー
 ErrorLogoFileNotFound=ロゴファイル '%s'が見つかりませんでした
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=これを修正するモジュールのセットアップに行く
 ErrorFailedToSendMail=（送信者= %s、受信機= %s）メールの送信に失敗しました
 ErrorFileNotUploaded=ファイルがアップロードされていませんでした。最大許容超えないようにサイズを確認し、その空き領域がディスク上で使用可能であり、すでにこのディレクトリ内の同じ名前のファイルが存在しないことに注意してください。
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義さ
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=エラーは、ファイルを保存に失敗しました。
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=日付を設定する
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=ここをクリック
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=デフォルトの背景色
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=リンク
 Select=選択する
 Choose=選択する
 Resize=サイズを変更する
+ResizeOrCrop=Resize or Crop
 Recenter=recenterは
 Author=作成者
 User=ユーザー
@@ -325,8 +328,10 @@ Default=デフォルト
 DefaultValue=デフォルト値
 DefaultValues=Default values
 Price=価格
+PriceCurrency=Price (currency)
 UnitPrice=単価
 UnitPriceHT=単価（純額）
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=単価
 PriceU=UP
 PriceUHT=UP（純額）
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=量
 AmountInvoice=請求額
+AmountInvoiced=Amount invoiced
 AmountPayment=支払金額
 AmountHTShort=額（純額）
 AmountTTCShort=金額（税込）
@@ -353,6 +359,7 @@ AmountLT2ES=量IRPF
 AmountTotal=合計金額
 AmountAverage=平均額
 PriceQtyMinHT=価格数量分。 （税引後）
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=割合
 Total=合計
 SubTotal=小計
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=税率
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=平均
 Sum=合計
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=完成した
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=このサードパーティの連絡先/ adresses
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=このサードパーティに関するイベント
 ActionsOnMember=このメンバーに関するイベント
 ActionsOnProduct=Events about this product
 NActionsLate=%s後半
+ToDo=実行する
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=フィルタ
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=警告は、あなたがメンテナンスモー
 CoreErrorTitle=システムエラー
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=クレジットカード
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=<b>%s</b>のフィールドは必須です
 FieldsWithIsForPublic=<b>%s</b>のフィールドは、メンバーの公開リストに表示されます。あなたがこれをしたくない場合は、 &quot;public&quot;チェックボックスをオフを確認してください。
 AccordingToGeoIPDatabase=（のGeoIP変換器のに従って）
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=請求分類
+ClassifyUnbilled=Classify unbilled
 Progress=進捗
-ClickHere=ここをクリック
 FrontOffice=Front office
 BackOffice=バックオフィス
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=プロジェクト
 Projects=プロジェクト
 Rights=パーミッション
+LineNb=Line no.
+IncotermLabel=インコタームズ
 # Week day
 Monday=月曜日
 Tuesday=火曜日
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=サードパーティ
 SearchIntoContacts=コンタクト
 SearchIntoMembers=メンバー
 SearchIntoUsers=ユーザー
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=皆
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=影響を受ける
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index cc544fcccad..a112a5f5374 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 7f331fd6671..298f13a46e9 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=検証済みのパブリックメンバのリスト
 ErrorThisMemberIsNotPublic=このメンバは、パブリックではありません
 ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバー（名前<b>：%s、</b>ログイン<b>：%s）</b>は既にサードパーティ製の<b>%s</b>にリンクされています。第三者が唯一のメンバー（およびその逆）にリンクすることはできませんので、最初にこのリンクを削除します。
 ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたはすべてのユーザーが自分のものでないユーザーにメンバをリンクすることができるように編集する権限を付与する必要があります。
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=あなたの会員カードの内容
 SetLinkToUser=Dolibarrユーザーへのリンク
 SetLinkToThirdParty=Dolibarr第三者へのリンク
 MembersCards=メンバーの名刺
@@ -108,17 +106,33 @@ PublicMemberCard=メンバーパブリックカード
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=サブスクリプションを表示する
-SendAnEMailToMember=メンバーへの情報メールを送る
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=あなたの会員カードの内容
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=メンバーautosubscriptionための電子メールの件名
-DescADHERENT_AUTOREGISTER_MAIL=メンバーautosubscriptionの電子メール
-DescADHERENT_MAIL_VALID_SUBJECT=メンバーの検証のための電子メールの件名
-DescADHERENT_MAIL_VALID=メンバーの検証の電子メール
-DescADHERENT_MAIL_COTIS_SUBJECT=サブスクリプションの電子メールの件名
-DescADHERENT_MAIL_COTIS=サブスクリプションの電子メール
-DescADHERENT_MAIL_RESIL_SUBJECT=メンバーresiliationための電子メールの件名
-DescADHERENT_MAIL_RESIL=メンバーresiliationの電子メール
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=自動電子メールの送信者の電子メール
 DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 84e790f8fe5..4924ebdc3dd 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=検証済みペイメントの戻りページでメッセージ
 MessageKO=キャンセル支払い戻りページでメッセージ
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=リンクされたオブジェクト
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=アップロード開始
 CancelUpload=アップロードをキャンセル
 FileIsTooBig=ファイルが大きすぎる
 PleaseBePatient=しばらくお待ちください...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=タイトル
 WEBSITE_DESCRIPTION=説明
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/ja_JP/paypal.lang b/htdocs/langs/ja_JP/paypal.lang
index 3f6764475a8..fcb1a8ad2c6 100644
--- a/htdocs/langs/ja_JP/paypal.lang
+++ b/htdocs/langs/ja_JP/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=<b>%s：</b>これは、トランザクションのIDです。
 PAYPAL_ADD_PAYMENT_URL=郵送で文書を送信するときにPayPalの支払いのURLを追加します。
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 5db06a75529..b63602f59e1 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=製品やサービス
 ProductsAndServices=製品とサービス
 ProductsOrServices=製品またはサービス
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=この製品ラインを削除してもよろしいで
 ProductSpecial=特別な
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=価格/数量このサプライヤー/製品用に定義されません
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 679a002ea8b..ef46e4c54d9 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=プロジェクトの連絡先
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=すべてのプロジェクト
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介します。
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
 ProjectsDesc=このビューはすべてのプロジェクトを（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=に費や​​された時間は
 MyTimeSpent=私の時間を費やし
+BillTime=Bill the time spent
 Tasks=タスク
 Task=タスク
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=プロジェクトに関連付けられているイベントのリスト
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=プロジェクト今週のアクティビティ
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=プロジェクトの活動今月
 ActivityOnProjectThisYear=プロジェクトの活動は今年
 ChildOfProjectTask=プロジェクト/タスクの子
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=この民間プロジェクトの所有者でない
 AffectedTo=に割り当てられた
 CantRemoveProject=それはいくつかの他のオブジェクト（請求書、注文またはその他）によって参照されているこのプロジェクトは削除できません。リファラ]タブを参照してください。
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
index 0900893fa5e..6c2234dd5d9 100644
--- a/htdocs/langs/ja_JP/propal.lang
+++ b/htdocs/langs/ja_JP/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=（要請求）署名
 PropalStatusNotSigned=（クローズ）署名されていません
 PropalStatusBilled=請求
 PropalStatusDraftShort=ドラフト
+PropalStatusValidatedShort=検証
 PropalStatusClosedShort=閉じた
 PropalStatusSignedShort=署名された
 PropalStatusNotSignedShort=署名されていない
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index eb8e7e07156..d29518a63d3 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=倉庫を変更する
 MenuNewWarehouse=新倉庫
 WarehouseSource=ソースの倉庫
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=ターゲット·ウェアハウス
 ValidateSending=送信削除
 CancelSending=送信キャンセル
@@ -22,6 +24,7 @@ Movements=動作
 ErrorWarehouseRefRequired=ウェアハウスの参照名を指定する必要があります
 ListOfWarehouses=倉庫のリスト
 ListOfStockMovements=在庫変動のリスト
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 470fdc80df9..1bd51430d31 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index 27eeaf77c7f..b1d4b2baf5f 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=量またはキロ
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index 3aef0bd6e02..fd64ab272cd 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -69,8 +69,8 @@ InternalUser=内部ユーザ
 ExportDataset_user_1=Dolibarrのユーザーとプロパティ
 DomainUser=ドメインユーザー%s
 Reactivate=再アクティブ化
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=ユーザーのグループのいずれかから継承されたので、許可が付与されます。
 Inherited=継承された
 UserWillBeInternalUser=（特定の第三者にリンクされていないため）作成したユーザーは、内部ユーザーになります
@@ -93,6 +93,7 @@ NameToCreate=作成するには、サードパーティの名前
 YourRole=あなたの役割
 YourQuotaOfUsersIsReached=アクティブなユーザーのあなたのクォータに達している！
 NbOfUsers=ユーザーのNb
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=唯一superadminはダウングレードは、superAdminできます
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index a14de40a518..2579fee26d5 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=ウェブサイトを削除
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=ホームページに設定する
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=読む
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index a26163562ae..e6a0521345e 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=処理するには
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=サードパーティの銀行コード
-NoInvoiceCouldBeWithdrawed=ない請求書には成功してwithdrawedはありません。有効なBANしている企業であること請求書を確認してください。
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=入金分類
 ClassCreditedConfirm=あなたの銀行口座に入金、この撤退の領収書を分類してもよろしいですか？
 TransData=日付伝送
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 78d5b8e3f16..fed6af9a6fa 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
index 34ed1126045..9267e55860a 100644
--- a/htdocs/langs/ka_GE/agenda.lang
+++ b/htdocs/langs/ka_GE/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index d3bb1909afa..5898daa72b0 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index c5bc84acaf8..3473667fe55 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 9bf75178bea..cda96a546b8 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index 884e077b96e..d2da7ded67e 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/ka_GE/loan.lang b/htdocs/langs/ka_GE/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/ka_GE/loan.lang
+++ b/htdocs/langs/ka_GE/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 1ba8ff6dc6d..cedcd01066b 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 552154036d3..35d3774700f 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/ka_GE/margins.lang b/htdocs/langs/ka_GE/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/ka_GE/margins.lang
+++ b/htdocs/langs/ka_GE/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index fd0adc4c264..7326f3b9950 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 1585504479e..2afabe43b06 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/ka_GE/paypal.lang b/htdocs/langs/ka_GE/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/ka_GE/paypal.lang
+++ b/htdocs/langs/ka_GE/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 53835bd7f06..b9ebefc91c9 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index c69302deecb..319a6e7e0e2 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/ka_GE/propal.lang b/htdocs/langs/ka_GE/propal.lang
index 5f3c441bb0d..04941e4c650 100644
--- a/htdocs/langs/ka_GE/propal.lang
+++ b/htdocs/langs/ka_GE/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/ka_GE/salaries.lang
+++ b/htdocs/langs/ka_GE/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 4cdc262b847..7fbe2f6b82a 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/ka_GE/stripe.lang b/htdocs/langs/ka_GE/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/ka_GE/stripe.lang
+++ b/htdocs/langs/ka_GE/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ka_GE/trips.lang b/htdocs/langs/ka_GE/trips.lang
index a741a9f6e5f..2ede3bc474e 100644
--- a/htdocs/langs/ka_GE/trips.lang
+++ b/htdocs/langs/ka_GE/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index c87ce3a9b02..8aa5d3749fc 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 0574ba1a4b7..720da4a320f 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 25bd5cd2ede..ca7248f27b0 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=ಹೆಸರು
 CompanyAddress=ವಿಳಾಸ
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
index 34ed1126045..9267e55860a 100644
--- a/htdocs/langs/kn_IN/agenda.lang
+++ b/htdocs/langs/kn_IN/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index bc7de8e2007..9460c7ea43c 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 589faa3e238..8e27a3bad29 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -43,7 +43,8 @@ Individual=ಖಾಸಗಿ ವ್ಯಕ್ತಿ
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=ಪೋಷಕ ಸಂಸ್ಥೆ
 Subsidiaries=ಅಂಗಸಂಸ್ಥೆಗಳು
-ReportByCustomers=ಗ್ರಾಹಕರ ವರದಿ
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=ದರದ ವರದಿ
 CivilityCode=ಸೌಜನ್ಯದ ಕೋಡ್
 RegisteredOffice=ನೋಂದಾಯಿತ ಕಚೇರಿ
@@ -75,10 +76,12 @@ Town=ನಗರ
 Web=ವೆಬ್
 Poste= ಸ್ಥಾನ
 DefaultLang=ಪೂರ್ವನಿಯೋಜಿತವಾದ ಭಾಷೆ
-VATIsUsed=ವ್ಯಾಟ್ ಬಳಸಲಾಗುತ್ತದೆ
-VATIsNotUsed=ವ್ಯಾಟ್ ಬಳಸಲಾಗುವುದಿಲ್ಲ
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ (VAT) ಸಂಖ್ಯೆ
-VATIntraShort=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ (VAT) ಸಂಖ್ಯೆ
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=ಸಿಂಟ್ಯಾಕ್ಸ್ ಸರಿಯಿದ್ದಂತಿದೆ
+VATReturn=VAT return
 ProspectCustomer=ನಿರೀಕ್ಷಿತ / ಗ್ರಾಹಕ
 Prospect=ನಿರೀಕ್ಷಿತ
 CustomerCard=ಗ್ರಾಹಕ ಕಾರ್ಡ್
 Customer=ಗ್ರಾಹಕ
 CustomerRelativeDiscount=ಸಾಪೇಕ್ಷ ಗ್ರಾಹಕ ರಿಯಾಯಿತಿ
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=ಸಾಪೇಕ್ಷ ರಿಯಾಯಿತಿ
 CustomerAbsoluteDiscountShort=ಪರಮ ರಿಯಾಯಿತಿ
 CompanyHasRelativeDiscount=ಈ ಗ್ರಾಹಕರಿಗೆ <b>%s%%</b> ರಿಯಾಯಿತಿ ಪೂರ್ವನಿಗದಿಯಾಗಿದೆ.
 CompanyHasNoRelativeDiscount=ಈ ಗ್ರಾಹಕರಿಗೆ ಯಾವುದೇ ಸಾಪೇಕ್ಷ ರಿಯಾಯಿತಿ ಪೂರ್ವನಿಯೋಜಿತವಾಗಿಲ್ಲ
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=ಈ ಗ್ರಾಹಕ ಇನ್ನೂ <b>%s</b>%sರಷ್ಟಕ್ಕೆ ಸಾಲದ ಟಿಪ್ಪಣಿಯನ್ನು ಹೊಂದಿದ್ದಾರೆ.
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=ಈ ಗ್ರಾಹಕ ಯಾವುದೇ ರಿಯಾಯಿತಿ ಕ್ರೆಡಿಟ್ ಹೊಂದಿಲ್ಲ
-CustomerAbsoluteDiscountAllUsers=ಪರಮ ರಿಯಾಯಿತಿಗಳು (ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಂದ ಮಂಜೂರಾದ)
-CustomerAbsoluteDiscountMy=ಪರಮ ರಿಯಾಯಿತಿಗಳು (ನಿಮ್ಮಿಂದ ಮಂಜೂರಾದ)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=ಯಾವುದೂ ಇಲ್ಲ
 Supplier=ಪೂರೈಕೆದಾರ
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=ಪ್ರವೇಶವಿಲ್ಲ
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=ಸಂಪರ್ಕಗಳು ಮತ್ತು ವಿವರಗಳು
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=ಸಂಪರ್ಕಗಳು / ವಿಳಾಸಗಳು (ಮೂರನೇ ಪಾರ್ಟಿಗಳದ್ದಾಗಿರಬಹುದು, ಆಗಿಲ್ಲದಿರಬಹುದು) ಮತ್ತು ಲಕ್ಷಣಗಳು
-ImportDataset_company_3=ಬ್ಯಾಂಕ್ ವಿವರಗಳು
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=ಬೆಲೆ ಮಟ್ಟ
 DeliveryAddress=ತಲುಪಿಸುವ ವಿಳಾಸ
 AddAddress=ವಿಳಾಸ ಸೇರಿಸಿ
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=ಪ್ರಸ್ತುತ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್
 OutstandingBill=ಗರಿಷ್ಟ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್ ಮೊತ್ತ
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=ಫಾರ್ಮ್ಯಾಟ್% syymm-NNNN ಗ್ರಾಹಕ ಕೋಡ್ ಮತ್ತು% syymm-NNNN ವವ ವರ್ಷ ಅಲ್ಲಿ ಪೂರೈಕೆದಾರ ಕೋಡ್ ಫಾರ್ ಜೊತೆ ನ್ಯೂಮರೋ ಹಿಂತಿರುಗಿ, ಮಿಮೀ ತಿಂಗಳು ಮತ್ತು NNNN ಯಾವುದೇ ಬ್ರೇಕ್ ಮತ್ತು 0 ಯಾವುದೇ ಲಾಭ ಒಂದು ಅನುಕ್ರಮದ.
 LeopardNumRefModelDesc=ಕೋಡ್ ಉಚಿತ. ಈ ಕೋಡ್ ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಮಾರ್ಪಡಿಸಬಹುದಾಗಿದೆ.
 ManagingDirectors=ಮ್ಯಾನೇಜರ್ (ಗಳು) ಹೆಸರು (ಸಿಇಒ, ನಿರ್ದೇಶಕ, ಅಧ್ಯಕ್ಷ ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 9bf75178bea..cda96a546b8 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index 50d4dacc169..b05c7782037 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/kn_IN/loan.lang b/htdocs/langs/kn_IN/loan.lang
index 690837df72a..d79f8bc5a34 100644
--- a/htdocs/langs/kn_IN/loan.lang
+++ b/htdocs/langs/kn_IN/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 1ba8ff6dc6d..cedcd01066b 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 6f108ef954e..574c4b066b5 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=ಮೂರನೇ ಪಕ್ಷಗಳು
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/kn_IN/margins.lang b/htdocs/langs/kn_IN/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/kn_IN/margins.lang
+++ b/htdocs/langs/kn_IN/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index fd0adc4c264..7326f3b9950 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index c112cc82634..01538780d0b 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=ಶೀರ್ಷಿಕೆ
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/kn_IN/paypal.lang b/htdocs/langs/kn_IN/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/kn_IN/paypal.lang
+++ b/htdocs/langs/kn_IN/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 3721d35f084..1aeabb326e1 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index c69302deecb..319a6e7e0e2 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/kn_IN/propal.lang b/htdocs/langs/kn_IN/propal.lang
index 3a22b451d68..1e1ac57e82a 100644
--- a/htdocs/langs/kn_IN/propal.lang
+++ b/htdocs/langs/kn_IN/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=ಮುಚ್ಚಲಾಗಿದೆ
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/kn_IN/salaries.lang b/htdocs/langs/kn_IN/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/kn_IN/salaries.lang
+++ b/htdocs/langs/kn_IN/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 4cdc262b847..7fbe2f6b82a 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/kn_IN/stripe.lang b/htdocs/langs/kn_IN/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/kn_IN/stripe.lang
+++ b/htdocs/langs/kn_IN/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/kn_IN/trips.lang b/htdocs/langs/kn_IN/trips.lang
index 5c205a7d8fd..183ea35190f 100644
--- a/htdocs/langs/kn_IN/trips.lang
+++ b/htdocs/langs/kn_IN/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index 36c61b94abc..0a0cba72538 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 5de5e061b97..c79f17992f1 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=날짜
 Docref=Reference
-Code_tiers=거래처
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 1a40d18b2a2..c47c10c1202 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=날짜 및 시간
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=자원
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=율
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=회사 / 조직
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=이름
 CompanyAddress=주소
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index f487bd90457..871fa18923d 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index bcf0c02829b..e8c7ab8e7d3 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=결제 금액
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=유료
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=할인
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=이유
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index ef57ef576b9..03e3890624a 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -43,7 +43,8 @@ Individual=개인
 ToCreateContactWithSameName=협력업체와 동일한 정보로 연락처 / 주소를 자동으로 생성합니다. 대부분의 경우, 협력업체가 물리적인 사람 일지라도 협력업체를 독립적으로 생성 가능합니다.
 ParentCompany=모회사
 Subsidiaries=자회사
-ReportByCustomers=고객별 보고서
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=비율별 보고서
 CivilityCode=성격 코드
 RegisteredOffice=등록 된 사무실
@@ -75,10 +76,12 @@ Town=시
 Web=웹
 Poste= 직위
 DefaultLang=기본 언어
-VATIsUsed=부가가치세 적용 함.
-VATIsNotUsed=부가가치세 적용 안함.
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=주소를 협력업체 주소로 입력하십시오.
 ThirdpartyNotCustomerNotSupplierSoNoRef=고객이나 공급 업체가 아닌 협력업체, 이용 가능한 참조 객체가 없음
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=지불 은행 계좌
 OverAllProposals=제안
 OverAllOrders=주문
@@ -239,7 +242,7 @@ ProfId3TN=프로필 Id 3 (Douane code)
 ProfId4TN=프로필 Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=프로필 Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT 번호
-VATIntraShort=VAT 번호
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=유효한 구문입니다.
+VATReturn=VAT return
 ProspectCustomer=잠재고객 / 고객
 Prospect=잠재업체
 CustomerCard=고객 카드
 Customer=고객
 CustomerRelativeDiscount=상대 고객 할인
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=상대적 할인
 CustomerAbsoluteDiscountShort=절대 할인
 CompanyHasRelativeDiscount=이 고객은 기본 할인인이 <b>%s%%</b> 입니다.
 CompanyHasNoRelativeDiscount=이 고객은 기본적으로 상대적 할인이 없습니다.
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=이 고객은 <b>%s</b> %s 의 할인 가능한(크레딧 노트 또는 계약금)이 있습니다.
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=이 고객은  <b>%s</b> %s 의 상대적 할인이 있습니다.
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=이 고객에게는 할인 크레딧이 없습니다.
-CustomerAbsoluteDiscountAllUsers=절대 할인 (모든 사용자가 부여)
-CustomerAbsoluteDiscountMy=절대 할인 (자기 부담)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=없음
 Supplier=공급자
 AddContact=연락처 생성
@@ -377,9 +390,9 @@ NoDolibarrAccess=Dolibarr 접속 불가
 ExportDataset_company_1=협력업체 (회사 / 재단 / 물리적 사람) 및 부동산
 ExportDataset_company_2=연락처 및 속성
 ImportDataset_company_1=협력업체 (회사 / 재단 / 물리적 사람) 및 부동산
-ImportDataset_company_2=연락처 / 주소 (협력업체 또는 협력업체 외) 및 속성
-ImportDataset_company_3=은행 계좌 정보
-ImportDataset_company_4=협력업체 / 영업 담당자 (판매 담당자를 통해 회사에 영향을 미침)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=가격 수준
 DeliveryAddress=배달 주소
 AddAddress=주소 추가
@@ -406,15 +419,16 @@ ProductsIntoElements=제품 / 서비스 목록 %s
 CurrentOutstandingBill=현재 미결제 금액
 OutstandingBill=미결 한도
 OutstandingBillReached=미결 한도 금액 도달
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=고객 코드는 %syymm-nnnn 형식이고 공급 업체 코드는 %syymm-nnnn 형식으로 번호를 반환합니다. 여기서 yy는 연도, mm은 월, nnnn은 0 아닌 순환 일련번호 입니다.
 LeopardNumRefModelDesc=코드는 무료입니다. 이 코드는 언제든지 수정할 수 있습니다.
 ManagingDirectors=관리자 이름 (CEO, 이사, 사장 ...)
 MergeOriginThirdparty=중복 된 협력업체 (삭제하려는 협력업체)
 MergeThirdparties=협력업체 병합
 ConfirmMergeThirdparties=이 협력업체를 현재의 협력업체의 하나로 병합 하시겠습니까? 모든 링크 된 오브젝트 (송장, 주문 ...)는 현재 협력업체로 이동 한 후 협력업체가 삭제됩니다.
-ThirdpartiesMergeSuccess=협력업체가 병합되었습니다.
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=영업 담당자 로그인
 SaleRepresentativeFirstname=영업 담당자의 이름
 SaleRepresentativeLastname=영업 대표자 성
-ErrorThirdpartiesMerge=협력업체를 삭제할 때 오류가 발생했습니다. 로그를 확인하십시오. 변경 사항이 취소되었습니다.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=신규 고객 또는 공급자 코드가 중복됩니다.
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 93a69cc1de9..561d43a751d 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index fe48ce6da65..8180e289d27 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=우선 순위
 CronLabel=라벨
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=부터
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/ko_KR/loan.lang b/htdocs/langs/ko_KR/loan.lang
index 8519f2243b9..2b455fe8ac9 100644
--- a/htdocs/langs/ko_KR/loan.lang
+++ b/htdocs/langs/ko_KR/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 9166844eea6..8f84edcaa0b 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 614016f744f..1c52ebceb02 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=%s 매개변수를 지정할 수 없습니다
 ErrorUnknown=알수없는 오류
 ErrorSQL=SQL 오류
 ErrorLogoFileNotFound='%s' 로고 파일이 없습니다
-ErrorGoToGlobalSetup=이 문제를 해결하려면 '회사 / 조직'설정으로 이동하십시오.
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=모듈 설정에서 수정하세요
 ErrorFailedToSendMail=메일을 보내는 데 실패했습니다 (전송인=%s, 수취인=%s)
 ErrorFileNotUploaded=파일을 업로드할 수 없습니다. 파일 크기가 최대 허용량을 초과하지 않고, 디스크 내 충분한 저장 공간이 남아 있으며 또한 디렉토리에 같은 이름의 파일이 없는지를 확인하세요.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=오류, '%s' 국가의 부가세율이 정
 ErrorNoSocialContributionForSellerCountry=오류, 국가 '%s'에 대해 정의 된 사회 / 재정 세금 유형이 없습니다.
 ErrorFailedToSaveFile=오류, 파일을 저장할 수 없습니다.
 ErrorCannotAddThisParentWarehouse=이미 현재 사용중인 상위 창고를 추가하려고합니다.
-MaxNbOfRecordPerPage=페이지 당 최대 레코드 수
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=귀하는 할 수있는 권한이 없습니다.
 SetDate=날짜 설정
 SelectDate=날짜 선택
 SeeAlso=또한 %s
 SeeHere=여기를 보시오
+ClickHere=여기를 클릭하십시오.
+Here=Here
 Apply=적용
 BackgroundColorByDefault=기본 배경 색상
 FileRenamed=파일 이름이 재명명 되었습니다.
@@ -185,6 +187,7 @@ ToLink=링크
 Select=선택
 Choose=선택
 Resize=크기 조정
+ResizeOrCrop=Resize or Crop
 Recenter=다시 자막
 Author=저자
 User=사용자
@@ -325,8 +328,10 @@ Default=생략시
 DefaultValue=생략값
 DefaultValues=기본값
 Price=가격
+PriceCurrency=Price (currency)
 UnitPrice=단가
 UnitPriceHT=단가 (정액)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=단가
 PriceU=U.P.
 PriceUHT=U.P. (정액)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (통화)
 PriceUTTC=U.P. (세금 포함)
 Amount=금액
 AmountInvoice=송장 금액
+AmountInvoiced=Amount invoiced
 AmountPayment=결제 금액
 AmountHTShort=금액 (정액)
 AmountTTCShort=금액 (세금 포함)
@@ -353,6 +359,7 @@ AmountLT2ES=IRPF 금액
 AmountTotal=합계금액
 AmountAverage=평균금액
 PriceQtyMinHT=최소수량 가격 (세금 별도)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=백분율
 Total=합계
 SubTotal=소계
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=세율
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=평균
 Sum=누계
@@ -419,7 +428,8 @@ ActionRunningShort=진행 중
 ActionDoneShort=끝 마침
 ActionUncomplete=완료되지 않음
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=회사 / 조직
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=이 협력업체의 연락처
 ContactsAddressesForCompany=이 협력업체의 연락처 / 주소
 AddressesForCompany=이 협력업체의 주소
@@ -427,6 +437,9 @@ ActionsOnCompany=이 협력업체에 대한 이벤트
 ActionsOnMember=이 멤버에 대한 이벤트
 ActionsOnProduct=Events about this product
 NActionsLate=%s 늦게
+ToDo=할 일
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=이미 기록 된 요청
 Filter=필터
 FilterOnInto= 필드 %s 에 검색기준 '<strong>%s</strong>'
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=경고, 지금 유지 보수 모드이므로 로
 CoreErrorTitle=시스템 오류
 CoreErrorMessage=죄송합니다. 오류가 발생했습니다. 자세한 정보를 얻으려면 시스템 관리자에게 로그를 확인하거나 $ dolibarr_main_prod = 1을 비활성화하십시오.
 CreditCard=신용 카드
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=<b>%s</b> 이 있는 필드는 반드시 입력해야 합니다.
 FieldsWithIsForPublic=<b>%s</b> 이 (가) 있는 입력란은 공개 회원 목록에 표시됩니다. 이 기능을 사용하지 않으려면 "공용"상자를 선택하십시오.
 AccordingToGeoIPDatabase=(GeoIP 변환에 따름)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=관련 개체
 ClassifyBilled=청구서 분류
+ClassifyUnbilled=Classify unbilled
 Progress=진행
-ClickHere=여기를 클릭하십시오.
 FrontOffice=프론트 오피스
 BackOffice=백 오피스
 View=보기
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=프로젝트
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=월요일
 Tuesday=화요일
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/ko_KR/margins.lang b/htdocs/langs/ko_KR/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/ko_KR/margins.lang
+++ b/htdocs/langs/ko_KR/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 1647ac79994..cf2b473dd87 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index b3dd83c961b..f9a12ff79d8 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=표제
 WEBSITE_DESCRIPTION=기술
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/ko_KR/paypal.lang b/htdocs/langs/ko_KR/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/ko_KR/paypal.lang
+++ b/htdocs/langs/ko_KR/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 57822b629d9..5477e64890f 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 59d80da95b3..5f58710c1f6 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=할 일 목록
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/ko_KR/propal.lang b/htdocs/langs/ko_KR/propal.lang
index 05547a89772..dd4551476f1 100644
--- a/htdocs/langs/ko_KR/propal.lang
+++ b/htdocs/langs/ko_KR/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=초안
+PropalStatusValidatedShort=확인 함
 PropalStatusClosedShort=닫은
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/ko_KR/salaries.lang
+++ b/htdocs/langs/ko_KR/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 5e1800e27f2..fc743718f44 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/ko_KR/stripe.lang b/htdocs/langs/ko_KR/stripe.lang
index 6d3c7e820b1..3795bcfcbd4 100644
--- a/htdocs/langs/ko_KR/stripe.lang
+++ b/htdocs/langs/ko_KR/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang
index bcd3b56f62c..7dc61c4a64e 100644
--- a/htdocs/langs/ko_KR/trips.lang
+++ b/htdocs/langs/ko_KR/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index b81fd1aa35b..8c9cf74becb 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index 5a41ee81dab..6b8408ea759 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index 72b9a0d29a0..2929c8f5a83 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 8faa373a9e0..2fa98edce1d 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=ປະເພດເອກະສານ
 Docdate=ວັນທີ
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=ທະນາຄານ
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index b4e74973a0c..f7a384d9fa3 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=ຊື່
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
index 34ed1126045..9267e55860a 100644
--- a/htdocs/langs/lo_LA/agenda.lang
+++ b/htdocs/langs/lo_LA/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index d3bb1909afa..5898daa72b0 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index baaaa7e17f6..c1f6b2fd912 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 038bd1f239d..15fd9683a62 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index 0ae79be1220..c4d35d1595a 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/lo_LA/loan.lang b/htdocs/langs/lo_LA/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/lo_LA/loan.lang
+++ b/htdocs/langs/lo_LA/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 1ba8ff6dc6d..cedcd01066b 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index a8fb0418971..dd580ff3688 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=ການອະນຸຍາດ
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/lo_LA/margins.lang b/htdocs/langs/lo_LA/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/lo_LA/margins.lang
+++ b/htdocs/langs/lo_LA/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 46ecfd9f153..e48b158aea9 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 0a1b1408057..7b1788dd310 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/lo_LA/paypal.lang b/htdocs/langs/lo_LA/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/lo_LA/paypal.lang
+++ b/htdocs/langs/lo_LA/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index dfc4ce7630a..6a686114e45 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 196e421ffae..80d580263a3 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/lo_LA/propal.lang b/htdocs/langs/lo_LA/propal.lang
index 5f3c441bb0d..04941e4c650 100644
--- a/htdocs/langs/lo_LA/propal.lang
+++ b/htdocs/langs/lo_LA/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/lo_LA/salaries.lang
+++ b/htdocs/langs/lo_LA/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 3f3bebb05c0..e6f0325bae1 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/lo_LA/stripe.lang b/htdocs/langs/lo_LA/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/lo_LA/stripe.lang
+++ b/htdocs/langs/lo_LA/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/lo_LA/trips.lang b/htdocs/langs/lo_LA/trips.lang
index a741a9f6e5f..2ede3bc474e 100644
--- a/htdocs/langs/lo_LA/trips.lang
+++ b/htdocs/langs/lo_LA/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index 870de7adec5..dc9bce6bac9 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 9dc64cbc79d..7c2f3efd81f 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Sąskaitų planas
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Dokumento tipas
 Docdate=Data
 Docref=Nuoroda
-Code_tiers=Trečioji Šalis
 LabelAccount=Sąskaitos etiketė
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Kliento sąskaitos-faktūros apmokėjimas
-ThirdPartyAccount=Trečios šalies sąskaita
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Naujas sandoris
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Prigimtis
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Pardavimai
 AccountingJournalType3=Pirkimai
 AccountingJournalType4=Bankas
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index a948cf080d3..8c0dd7ed004 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Klaida, negalima naudoti opcijos @ vėl nustatyti
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Klaida, negalima naudoti opcijos @ jei sekos {yy}{mm} arba {yyyy}{mm} nėra uždangoje (mask).
 UMask=UMask parametras naujiems failams Unix/Linux/BSD/Mac tipo sistemoms.
 UMaskExplanation=Šis parametras leidžia nustatyti leidimų rinkinį pagal nutylėjimą failams Dolibarr sukurtiems serveryje (pvz.: atliekant duomenų rinkinio siuntimą (upload)).<br> Jis turi būti aštuntainis (pvz., 0666 reiškia skaityti ir įrašyti visiems).<br> Šis parametras yra nenaudojamas Windows serveryje.
-SeeWikiForAllTeam=Žiūrėti į Wiki tinklapį. Ieškoti pilno visų veikėjų/agentų ir jų organizacijų sąrašo
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Tarpinės atminties (cache) eksporto reakcijos vėlinimas sekundėmis (0 arba tuščia, kai nėra tarpinės atminties)
 DisableLinkToHelpCenter=Paslėpti nuorodą "<b>"Reikia pagalbos ar techninio palaikymo</b>" prisijungimo prie Dolibarr puslapyje
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modifikuoti kainas su apibrėžta bazinės vertės nuoroda
 MassConvert=Pradėti masinį konvertavimą
 String=Serija
 TextLong=Ilgas tekstas
+HtmlText=Html text
 Int=Sveikasis skaičius
 Float=Slankus
 DateAndTime=Data ir valanda
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Nuoroda į objektą,
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Įspėjimas: Jūsų <b>conf.php</b> yra ribojanti direktyva <b>dolibarr_pdf_force_fpdf=1</b>. Tai reiškia, kad jūs naudojate FPDF biblioteką PDF failų generavimui. Ši biblioteka yra sena ir nepalaiko daug funkcijų (Unicode, vaizdo skaidrumo, kirilicos, arabų ir Azijos kalbų, ...), todėl galite patirti klaidų generuojant PDF.<br>Norėdami išspręsti šią problemą ir turėti visapusišką palaikymą generuojant PDF, atsisiųskite <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a> , tada pažymėkite (comment) arba pašalinkite eilutę <b>$dolibarr_pdf_force_fpdf=1</b> ir įdėkite vietoje jos <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Įveskite telefono numerį, kuriuo skambinsite norėdami parodyti vartotojui nuorodą ClickToDial URL testavimui <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Vartotojai ir grupės
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Paraštės
 Module59000Desc=Paraščių valdymo modulis
 Module60000Name=Komisiniai
 Module60000Desc=Komisinių valdymo modulis
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Ištekliai
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Skaityti klientų sąskaitas
@@ -833,11 +838,11 @@ Permission1251=Pradėti masinį išorinių duomenų importą į duomenų bazę (
 Permission1321=Eksportuoti klientų sąskaitas-faktūras, atributus ir mokėjimus
 Permission1322=Reopen a paid bill
 Permission1421=Eksportuoti klientų užsakymus ir atributus
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Skaityti planinį darbą
 Permission23002=sukurti / atnaujinti planinį darbą
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Pajamų rūšių kiekis
 DictionaryPaymentConditions=Apmokėjimo terminai
 DictionaryPaymentModes=Apmokėjimo būdai
 DictionaryTypeContact=Adresatų/Adresų tipai
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Eco-Tax (WEEE)
 DictionaryPaperFormat=Popieriaus formatai
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=PVM valdymas
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Pagal nutylėjimą siūloma PVM yra 0, kuris gali būti naudojamas kai kuriais atvejais, pvz.: asociacijoms, fiziniams asmenims ar mažoms įmonėms.
-VATIsUsedExampleFR=Prancūzijoje, įmonėms ar organizacijoms, turinčioms realią fiskalinę sistemą (normalią arba supaprastintą), kurioje PVM yra deklaruojamas.
-VATIsNotUsedExampleFR=Prancūzijoje, asociacijos, kurios nedeklaruoja PVM, ar įmonės, organizacijos ar laisvųjų profesijų atstovai, kurie pasirinko mikro įmonės fiskalinę sistemą (frančizės PVM) ir mokamas franšizės PVM be PVM deklaravimo. Šis pasirinkimas bus rodomas sąskaitose-faktūrose: "Netaikoma PVM - CGI art-293B".
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Norma
 LocalTax1IsNotUsed=Nenaudokite antro mokesčio
@@ -977,7 +983,7 @@ Host=Serveris
 DriverType=Tvarkyklės (driver) tipas
 SummarySystem=Sistemos informacijos santrauka
 SummaryConst=Visų Dolibarr nuostatų parametrų sąrašas
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standartinio meniu valdytojas
 DefaultMenuSmartphoneManager=Smartphone meniu valdytojas
 Skin=Grafinio vaizdo (skin) tema
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Nuolatinė paieškos forma kairiajame meniu
 DefaultLanguage=Naudojama kalba pagal nutylėjimą (kalbos kodas)
 EnableMultilangInterface=Įjungti daugiakalbę sąsają
 EnableShowLogo=Rodyti logotipą kairiajame meniu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Pavadinimas/Vardas
 CompanyAddress=Adresas
 CompanyZip=Pašto kodas
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemos informacija yra įvairi techninė informacija, kurią gausite tik skaitymo režimu, ir bus matoma tik sistemos administratoriams.
 SystemAreaForAdminOnly=Ši sritis yra skirta tik administratoriams. Nė vienas iš Dolibarr leidimų negali sumažinti šio apribojimo.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Čia galite rinktis ir keisti kiekvieną parametrą, susijusį su Dolibarr grafiniu vaizdu.
 AvailableModules=Available app/modules
 ToActivateModule=Norint įjungti modulius, reikia eiti į Nuostatų meniu (Pagrindinis-> Nuostatos-> Moduliai).
@@ -1441,6 +1448,9 @@ SyslogFilename=Failo pavadinimas ir kelias
 YouCanUseDOL_DATA_ROOT=Galite naudoti DOL_DATA_ROOT/dolibarr.log prisijungimo failui Dolibarr "dokuments" kataloge. Galite nustatyti kitokį kelią šio failo saugojimui.
 ErrorUnknownSyslogConstant=Konstanta %s yra nežinoma Syslog konstanta
 OnlyWindowsLOG_USER=Windows palaiko tik LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Aukų modulio nuostatos
 DonationsReceiptModel=Aukų įplaukų šablonas
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Mokėtinas PVM
-OptionVATDefault=Grynųjų pinigų principas
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Kaupimo principas
 OptionVatDefaultDesc=PVM atsiranda:<br>- prekėms - nuo pristatymo (mes naudojame sąskaitos-faktūros datą) <br>- paslaugoms - nuo apmokėjimo
 OptionVatDebitOptionDesc=PVM atsiranda: <br> - prekėms - nuo pristatymo (mes naudojame sąskaito-faktūros datą) <br> - paslaugoms - nuo sąskaitos-fakrtūros datos
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Laikas PVM išieškojimui pagal nutylėjimą pagal pasirinktą variantą:
 OnDelivery=Pristatymo metu
 OnPayment=Apmokėjimo metu
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Naudojama sąskaitos-faktūros data
 Buy=Pirkti
 Sell=Parduoti
 InvoiceDateUsed=Naudojama sąskaitos-faktūros data
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Pardavimo sąskaita. Kodas
 AccountancyCodeBuy=Pirkimo sąskaita. Kodas
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index 1a31c714020..b9efc0bf691 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Siunta %s patvirtinta
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Taip pat galite pridėti šiuos parametrus išvesties filtravi
 AgendaUrlOptions3=<b>logina=%s</b> uždrausti vartotojo veiksmų išvestis <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>projektas=PROJECT_ID</b> uždrausti veiksmų asocijuotų su projektu <b>PROJECT_ID</b> išvestis.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Užimtas
@@ -109,7 +112,7 @@ ExportCal=Eksportuoti kalendorių
 ExtSites=Importuoti išorinį kalendorių
 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
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL prieiga prie .ical failo
 ExtSiteNoLabel=Aprašymo nėra
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 479d5372d70..8ff3b0bef08 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Sumokėta atgal (grąžinta)
 DeletePayment=Ištrinti mokėjimą
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Tiekėjų mokėjimai
 ReceivedPayments=Gauti mokėjimai
 ReceivedCustomersPayments=Iš klientų gauti mokėjimai
@@ -91,7 +92,7 @@ PaymentAmount=Mokėjimo suma
 ValidatePayment=Mokėjimą pripažinti galiojančiu
 PaymentHigherThanReminderToPay=Mokėjimas svarbesnis už priminimą sumokėti
 HelpPaymentHigherThanReminderToPay=Dėmesio, vienos ar kelių sąskaitų mokėjimo suma yra didesnė nei reikalingas sumokėti likutis.<br> Redaguokite įvedimą, arba patvirtinkite ir galvokite apie kreditinės sąskaitos kūrimą gautam perviršiui nuo kiekvienos permokėtos sąskaitos.
-HelpPaymentHigherThanReminderToPaySupplier=Dėmesio, vienos ar kelių sąskaitų mokėjimo suma yra didesnė nei mokėjimo likutis. <br> Redaguoti įrašą, arba kitu atveju patvirtinti.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Priskirti 'Apmokėtos'
 ClassifyPaidPartially=Priskirti 'Dalinai apmokėtos'
 ClassifyCanceled=Priskirti 'Neįvykusios'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Konvertuoti į ateities nuolaidą
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Įveskite gautą iš kliento mokėjimą
 EnterPaymentDueToCustomer=Atlikti mokėjimą klientui
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Projektas (turi būti pripažintas galiojančiu)
 BillStatusPaid=Apmokėtas
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Apmokėtas (paruoštas galutinei sąskaitai-faktūrai)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Neįvykęs
 BillStatusValidated=Pripažintas galiojančiu (turi būti apmokėtas)
 BillStatusStarted=Pradėtas
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Laukiantis
 AmountExpected=Reikalaujama suma
 ExcessReceived=Gautas perviršis
+ExcessPaid=Excess paid
 EscompteOffered=Siūloma nuolaida (mokėjimas prieš terminą)
 EscompteOfferedShort=Nuolaida
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Nuolaida kreditinei sąskaitai %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ši kredito rūšis gali būti naudojama sąskaitai-faktūrai prieš ją pripažįstant galiojančia
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nauja absoliutinė nuolaida
 NewRelativeDiscount=Naujas susijusi nuolaida
+DiscountType=Discount type
 NoteReason=Pastaba / Priežastis
 ReasonDiscount=Priežastis
 DiscountOfferedBy=Suteiktos
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Sąskaitos adresas
 HelpEscompte=Ši nuolaida yra nuolaida suteikiama klientui, nes jo mokėjimas buvo atliktas prieš terminą.
 HelpAbandonBadCustomer=Šios sumos buvo atsisakyta (blogas klientas) ir ji yra laikoma išimtiniu nuostoliu.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 02b4d003d99..dddf0eb74a2 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -43,7 +43,8 @@ Individual=Privatus asmuo
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Motininė įmonė
 Subsidiaries=Dukterinės įmonės
-ReportByCustomers=Ataskaita pagal klientus
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Ataskaita pagal tarifą
 CivilityCode=Mandagumo kodeksas
 RegisteredOffice=Buveinės registracijos adresas
@@ -75,10 +76,12 @@ Town=Miestas
 Web=WEB
 Poste= Pozicija
 DefaultLang=Kalba pagal nutylėjimą
-VATIsUsed=PVM yra naudojamas
-VATIsNotUsed=PVM nenaudojamas
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Pasiūlymai
 OverAllOrders=Užsakymai
@@ -239,7 +242,7 @@ ProfId3TN=Prof ID 3 (Douane code)
 ProfId4TN=Prof ID 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=PVM kodas
-VATIntraShort=PVM kodas
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Sintaksė galioja
+VATReturn=VAT return
 ProspectCustomer=Planas/Klientas
 Prospect=Planas
 CustomerCard=Kliento kortelė
 Customer=Klientas
 CustomerRelativeDiscount=Santykinė kliento nuolaida
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Santykinė nuolaida
 CustomerAbsoluteDiscountShort=Absoliuti nuolaida
 CompanyHasRelativeDiscount=Šis klientas turi nuolaidą pagal nutylėjimą <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Šis klientas neturi santykinės nuolaidos pagal nutylėjimą
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Šis klientas dar turi kreditinių sąskaitų <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Šis klientas neturi nuolaidų kreditų
-CustomerAbsoluteDiscountAllUsers=Absoliutinės nuolaidos (skiriama visiems vartotojams)
-CustomerAbsoluteDiscountMy=Absoliutinės nuolaidos (skiriama Jūsų)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Nė vienas
 Supplier=Tiekėjas
 AddContact=Sukurti kontaktą
@@ -377,9 +390,9 @@ NoDolibarrAccess=Nėra Dolibarr prieigos
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontaktai ir rekvizitai
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontaktai/Adresai (trečiosios šalies arba ne) ir atributai
-ImportDataset_company_3=Banko duomenys
-ImportDataset_company_4=Trečios šalys/Pardavimų atstovai (Liečia pardavimų atstovų naudotojus kompanijoms)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Kainos lygis
 DeliveryAddress=Pristatymo adresas
 AddAddress=Pridėti adresą
@@ -406,15 +419,16 @@ ProductsIntoElements=Produktų/paslaugų sąrašas %s
 CurrentOutstandingBill=Dabartinė neapmokėta sąskaita-faktūra
 OutstandingBill=Neapmokėtų sąskaitų-faktūrų maksimumas
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Gražinimo numeris formatu %syymm-nnnn kliento kodui ir %syymm-nnnn tiekėjo kodui, kur yy yra metai, mm yra mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0.
 LeopardNumRefModelDesc=Kodas yra nemokamas. Šis kodas gali būti modifikuotas bet kada.
 ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...)
 MergeOriginThirdparty=Dubliuoti trečiąją šalį (trečiąją šalį, kurią norite ištrinti)
 MergeThirdparties=Sujungti trečiąsias šalis
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Trečiosios šalys buvo sujungtos
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=Ištrinanat trečiąją šalį įvyko klaida. Prašome patikrinti žurnalą. Pakeitimai buvo panaikinti.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 7ecee3fb85f..70f309b727f 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -3,8 +3,8 @@ MenuFinancial=Billing | Payment
 TaxModuleSetupToModifyRules=Eiti į <a href="%s"> Mokesčių modulio nustatymus</a>pakeisti skaičiavimo taisykles
 TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
 OptionMode=Apskaitos opcija
-OptionModeTrue=Pajamų-Sąnaudų opcija
-OptionModeVirtual=Pretenzijų-Skolų opcija
+OptionModeTrue=Pajamų-sąnaudų opcija
+OptionModeVirtual=Pretenzijų-skolų opcija
 OptionModeTrueDesc=Šiame kontekste apyvarta skaičiuojama nuo mokėjimų (mokėjimų datos). Skaitmenų galiojimas užtikrinamas tik tada, jei buhalterija yra kruopščiai tikrinama per įvedimą/išvedimą sąskaitose per sąskaitas-faktūras.
 OptionModeVirtualDesc=Atsižvelgiant į tai, apyvarta skaičiuojama nuo sąskaitų-faktūrų (pagal patvirtinimo datą). Kai šios sąskaitos-faktūros yra apmokėtinos, nesvarbu ar jos buvo apmokėtos ar ne, jos įtraukiamos į apyvartos apimtį.
 FeatureIsSupportedInInOutModeOnly=Funkcija prieinama CREDITS-DEBTS apskaitos režime (žr. Apskaitos modulio konfigūracija)
@@ -21,7 +21,7 @@ MenuReportInOut=Pajamų/išlaidų
 ReportInOut=Balance of income and expenses
 ReportTurnover=Apyvarta
 PaymentsNotLinkedToInvoice=Mokėjimai nėra susiję su jokia sąskaita-faktūra, todėl nėra susiję su jokia trečiąja šalimi
-PaymentsNotLinkedToUser=Mokėjimai nėra susieti su jokiu Vartotoju
+PaymentsNotLinkedToUser=Mokėjimai nėra susieti su jokiu vartotoju
 Profit=Pelnas
 AccountingResult=Accounting result
 BalanceBefore=Balance (before)
@@ -31,7 +31,7 @@ Credit=Kreditas
 Piece=Apskaitos dok.
 AmountHTVATRealReceived=Grynasis sukauptas
 AmountHTVATRealPaid=Grynasis apmokėtas
-VATToPay=Pardavimų PVM
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF mokėjimai
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Rodyti PVM mokėjimą
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Tai apima visus faktinius sąskaitų-faktūrų apmokėjimus, gautus iš klientų. <br>- Tai grindžiama šių sąskaitų-faktūrų apmokėjimo datomis.<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Ataskaita pagal trečiosios šalies IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Ataskaita pagal trečiosios šalies IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Ataskaita pagal Kliento gautą ir sumokėtą PVM
-VATReportByCustomersInDueDebtMode=Ataskaita pagal Kliento gautą ir sumokėtą PVM
-VATReportByQuartersInInputOutputMode=Ataskaita pagal gauto ir sumokėto PVM tarifą
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Ataskaita pagal gauto ir sumokėto PVM tarifą
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Žiūrėti ataskaitoje <b>%sPVM dėžė%s</b> standartiniams skaičiavimams
 SeeVATReportInDueDebtMode=Žiūrėti ataskaitą <b>%sPVM srautuose%s</b> opcijos sraute skaičiavimams
 RulesVATInServices=- Paslaugoms, ataskaita apima faktiškai gautas ar išleistas PVM taisykles, remiantis mokėjimo data.
-RulesVATInProducts=- Materialioms vertybėms, tai apima PVM sąskaitas-faktūras, remiantis sąskaitos-faktūros išrašymo data.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Paslaugoms, ataskaita apima mokėtinas PVM sąskaitas-faktūras, apmokėtas ir neapmokėtas, remiantis sąskaitos-faktūros išrašymo data.
-RulesVATDueProducts=- Materialioms vertybėms, tai apima PVM sąskaitas-faktūras, pagrįstas sąskaitos-faktūros išrašymo data.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Pastaba: Dėl materialinių vertybių, teisingiau būtų naudoti pristatymo datą.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/Sąskaita-faktūra
 NotUsedForGoods=Nenaudojama prekėms
 ProposalStats=Pasiūlymų statistika
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas <b>Pinigų apskaita</b> būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama <b>Įsipareigojimų apskaita</b> režimas (žr. Apskaitos modulio nustatymus).
 CalculationMode=Skaičiavimo metodas
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 688b73a31c4..d7557437a6d 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Nėra registruotų darbų
 CronPriority=Prioritetas
 CronLabel=Etiketė
 CronNbRun=Pradėti skaičių
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Kiekvienas
 JobFinished=Darbas pradėtas ir baigtas
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Nuo
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Apvalkalo komanda
-CronCannotLoadClass=Nepavyko įkelti klasės %s arba objekto %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 475faf1eba3..20d697d4d8e 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP derinimas nėra pilnas
 ErrorLDAPMakeManualTest=.ldif failas buvo sukurtas aplanke: %s. Pabandykite įkelti jį rankiniu būdu per komandinę eilutę, kad gauti daugiau informacijos apie klaidas
 ErrorCantSaveADoneUserWithZeroPercentage=Negalima išsaugoti veiksmo su "Būklė nepradėta", jei laukelis "atliktas" taip pat užpildytas.
 ErrorRefAlreadyExists=Nuoroda, naudojama sukūrimui, jau egzistuoja.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Nepavyko ištrinti įrašo. Jis jau naudojamas arba įtrauktas į kitą objektą.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Nepavyko pridėti įrašo %s į Paštininko sąra
 ErrorFailedToRemoveToMailmanList=Nepavyko pašalinti įrašo %s iš Paštininko sąrašo %s arba SPIP bazės
 ErrorNewValueCantMatchOldValue=Nauja reikšmė negali būti lygi senai reikšmei
 ErrorFailedToValidatePasswordReset=Nepavyko inicijuoti slaptažodžio. Gali būti inicijavimas jau buvo padarytas (ši nuoroda gali būti naudojamas tik vieną kartą). Jei ne, pabandykite iš naujo paleisti inicijavimo procesą.
-ErrorToConnectToMysqlCheckInstance=Prisijungti prie duomenų bazės nepavyko. Patikrinkite, ar MySQL serveris veikia (dažniausiai, jį galite paleisti iš komandinės eilutės su 'sudo/etc/init.d/mysql start').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Nepavyko pridėti kontakto
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Mokėjimo būdo tipas buvo nustatytas %s, bet modulio Sąskaita faktūra nustatymas nebuvo pilnai baigtas mokėjimo būdo informacijos parodymui.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/lt_LT/loan.lang b/htdocs/langs/lt_LT/loan.lang
index 7b3cb047933..aef2d023357 100644
--- a/htdocs/langs/lt_LT/loan.lang
+++ b/htdocs/langs/lt_LT/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Paskolos modulio konfigūracija
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index cce4937fa97..17a0b1feaad 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 77e4d4de84e..ed03916ad6f 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -8,8 +8,8 @@ FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
+FormatDateShort=%Y-%m-%d
+FormatDateShortInput=%Y-%m-%d
 FormatDateShortJava=MM/dd/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametras %s neapibrėžtas
 ErrorUnknown=Nežinoma klaida
 ErrorSQL=SQL klaida
 ErrorLogoFileNotFound=Logotipo failas '%s' nerastas
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Eiti į Modulio nustatymus ir išspręsti šią problemą
 ErrorFailedToSendMail=Nepavyko išsiųsti laiško (siuntėjas=%s, gavėjas=%s)
 ErrorFileNotUploaded=Failas nebuvo įkeltas. Patikrinkite, ar jo dydis neviršija leistino, ar yra laisvos vietos diske ir ar jau nėra failo su tokiu pačiu pavadinimu šiame kataloge.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Klaida, nėra apibrėžtų PVM tarifų ša
 ErrorNoSocialContributionForSellerCountry=Klaida, socialiniai / fiskaliniai mokesčiai neapibrėžti šaliai '%s'.
 ErrorFailedToSaveFile=Klaida, nepavyko išsaugoti failo.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Nustatyti datą
 SelectDate=Pasirinkti datą
 SeeAlso=Taip pat žiūrėkite %s
 SeeHere=Žiūrėkite čia
+ClickHere=Spauskite čia
+Here=Here
 Apply=Taikyti
 BackgroundColorByDefault=Fono spalva pagal nutylėjimą
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Nuoroda
 Select=Pasirinkti
 Choose=Pasirinkti
 Resize=Pakeisti dydį
+ResizeOrCrop=Resize or Crop
 Recenter=Pakeisti centrą
 Author=Autorius
 User=Vartotojas
@@ -325,8 +328,10 @@ Default=Pagal nutylėjimą
 DefaultValue=Reikšmė pagal nutylėjimą
 DefaultValues=Default values
 Price=Kaina
+PriceCurrency=Price (currency)
 UnitPrice=Vieneto kaina
 UnitPriceHT=Vieneto kaina (grynoji)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Vieneto kaina
 PriceU=U.P.
 PriceUHT=U.P. (grynasis)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (įsk. mokesčius)
 Amount=Suma
 AmountInvoice=Sąskaitos-faktūros suma
+AmountInvoiced=Amount invoiced
 AmountPayment=Mokėjimo suma
 AmountHTShort=Suma (grynoji)
 AmountTTCShort=Suma (įskaitant mokesčius)
@@ -353,6 +359,7 @@ AmountLT2ES=IRPF suma
 AmountTotal=Bendra suma
 AmountAverage=Vidutinė suma
 PriceQtyMinHT=Min. kaina už kiekį (atskaičius mokesčius)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Procentai
 Total=Visas
 SubTotal=Tarpinė suma
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Mokesčio tarifas
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Vidutinis
 Sum=Suma
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Baigtas
 ActionUncomplete=Nepilnas
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Šios trečiosios šalies adresatas
 ContactsAddressesForCompany=Adresatai/adresai šiai trečiajai šaliai
 AddressesForCompany=Adresai šiai trečiajai šaliai
@@ -427,6 +437,9 @@ ActionsOnCompany=Įvykiai su šia trečiają šalimi
 ActionsOnMember=Įvykiai su šiuo nariu
 ActionsOnProduct=Events about this product
 NActionsLate=%s vėluoja
+ToDo=Atlikti
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Prašymas jau įregistruotas
 Filter=Filtras
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Perspėjimas. Jūs esate serviso režime, todėl
 CoreErrorTitle=Sistemos klaida
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kreditinė kortelė
+ValidatePayment=Mokėjimą pripažinti galiojančiu
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Laukai su <b>%s</b> yra privalomi
 FieldsWithIsForPublic=Laukai su <b>%s</b> yra rodomi viešame narių sąraše. Jei šito nenorite, išjunkite "public" langelį.
 AccordingToGeoIPDatabase=(Pagal GeoIP konversiją)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Klasifikuoti su pateiktomis sąskaitomis-faktūromis
+ClassifyUnbilled=Classify unbilled
 Progress=Pažanga
-ClickHere=Spauskite čia
 FrontOffice=Front office
 BackOffice=Galinis biuras (back office)
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projektas
 Projects=Projektai
 Rights=Leidimai
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Pirmadienis
 Tuesday=Antradienis
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Trečiosios šalys
 SearchIntoContacts=Adresatai
 SearchIntoMembers=Nariai
 SearchIntoUsers=Vartotojai
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Visi
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Priskirtas
diff --git a/htdocs/langs/lt_LT/margins.lang b/htdocs/langs/lt_LT/margins.lang
index bca85b94ec6..719b2b4d672 100644
--- a/htdocs/langs/lt_LT/margins.lang
+++ b/htdocs/langs/lt_LT/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 8540a9b23b9..69a10185d57 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Patvirtintų viešųjų narių sąrašas
 ErrorThisMemberIsNotPublic=Šis narys nėra viešas
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Kitas narys (pavadinimas/vardas: <b>%s</b>, prisijungimas: <b>%s</b>) jau yra susietas su trečiąja šalimi <b>%s</b>. Pirmiausia pašalinti šį saitą, nes trečioji šalis negali būti susieta tik su nariu (ir atvirkščiai).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Saugumo sumetimais, Jums turi būti suteikti leidimai redaguoti visus vartotojus, kad galėtumėte susieti narį su vartotoju, kuris yra ne Jūsų.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Jūsų nario kortelės turinys
 SetLinkToUser=Saitas su Dolibarr vartotoju
 SetLinkToThirdParty=Saitas su Dolibarr trečiąja šalimi
 MembersCards=Narių vizitinės kortelės
@@ -108,17 +106,33 @@ PublicMemberCard=Nario vieša kortelė
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Sukurti abonementą
 ShowSubscription=Rodyti pasirašymą
-SendAnEMailToMember=Nusiųsti informacinį e-laišką nariui
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Jūsų nario kortelės turinys
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Gauto e-laiško subjektas svečio auto įrašo atveju
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Gautas e-laiškas svečio auto įrašo atveju
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-laiško tema nario auto pasirašymui
-DescADHERENT_AUTOREGISTER_MAIL=E-laiškas nario auto pasirašymui
-DescADHERENT_MAIL_VALID_SUBJECT=E-laiško tema nario patvirtinimui
-DescADHERENT_MAIL_VALID=E-laiškas nario patvirtinimui
-DescADHERENT_MAIL_COTIS_SUBJECT=E-laiško tema pasirašymui
-DescADHERENT_MAIL_COTIS=E-laiškas pasirašymui
-DescADHERENT_MAIL_RESIL_SUBJECT=E-laiško tema nario atstatymui
-DescADHERENT_MAIL_RESIL=E-laiškas nario atstatymui
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Siuntėjo e-paštas automatiniams e-laiškams
 DescADHERENT_ETIQUETTE_TYPE=Etikečių puslapio formatas
 DescADHERENT_ETIQUETTE_TEXT=Spausdinamas tekstas ant nario adreso puslapių
@@ -177,3 +191,8 @@ NoVatOnSubscription=Pasirašymams nėra PVM
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prekė naudojama abonementinei eilutei sąskaitoje-faktūroje: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 2cf17659c6d..12022b3545a 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Pranešimas patvirtinto mokėjimo grąžinimo puslapyje
 MessageKO=Pranešimas atšaukto mokėjimo grąžinimo puslapyje
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Susietas objektas
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Pradėti įkėlimą
 CancelUpload=Atšaukti įkėlimą
 FileIsTooBig=Failai yra per dideli
 PleaseBePatient=Prašome būkite kantrūs ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Gautas prašymas pakeisti Jūsų Dolibarr slaptažodį
 NewKeyIs=Tai nauji Jūsų prisijungimo raktai
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Pavadinimas
 WEBSITE_DESCRIPTION=Aprašymas
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/lt_LT/paypal.lang b/htdocs/langs/lt_LT/paypal.lang
index f90f18320f4..3d0e9ad0e9c 100644
--- a/htdocs/langs/lt_LT/paypal.lang
+++ b/htdocs/langs/lt_LT/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Tik PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Tai operacijos ID: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Pridėti PayPal mokėjimo URL, kai siunčiate dokumentą paštu
-PredefinedMailContentLink=Jūs galite spustelėti ant saugios nuorodos žemiau, kad atlikti mokėjimą (PayPal), jei tai dar nėra padaryta.\n\n%s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 22670ec6e2f..481d43eb676 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Produktas ar Paslauga
 ProductsAndServices=Produktai ir Paslaugos
 ProductsOrServices=Produktai ar Paslaugos
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Ar tikrai norite ištrinti šią produkto eilutę ?
 ProductSpecial=Specialus
 QtyMin=Minimalus kiekis
 PriceQtyMin=Kaina už šį minimalų kiekį (w/o nuolaida)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=PVM tarifas (šiam tiekėjui/produktui)
 DiscountQtyMin=Įprasta nuolaida už kiekį pagal nutylėjimą
 NoPriceDefinedForThisSupplier=Šiam tiekėjui/produktui nėra nustatytos kainos/kiekio
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index bb050f158e2..4f356e380ad 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Projekto kontaktai
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Visi projektai
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Šis vaizdas rodo visus projektus, kuriuos yra Jums leidžiama skaityti.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Čia rodomi visi projektai ir užduotys, kuriuos Jums leidžiama skaityti.
 ProjectsDesc=Šis vaizdas rodo visus projektus (Jūsų vartotojo teisės leidžia matyti viską).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Matomi tik atidaryti projektai (projektai juodraščiai ar uždaryti projektai nematomi).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Šis vaizdas rodo visus projektus ir užduotis, kuriuos Jums leidžiama skaityti.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Užduotys atidarytuose projektuose
 WorkloadNotDefined=Darbo krūvis nėra apibrėžtas
 NewTimeSpent=Praleistas laikas
 MyTimeSpent=Mano praleistas laikas
+BillTime=Bill the time spent
 Tasks=Uždaviniai
 Task=Užduotis
 TaskDateStart=Užduoties pradžios data
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Paaukotų lėšų, susijusių su projektu, sąra
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Įvykių, susijusių su projektu, sąrašas
 ListTaskTimeUserProject=Projekto užduotims sunaudoto laiko sąrašas.
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Projekto aktyvumas šią savaitę
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Projekto aktyvumas šį mėnesį
 ActivityOnProjectThisYear=Projekto aktyvumas šiais metais
 ChildOfProjectTask=Projekto/užduoties dukterinis projektas (child)
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Nėra šio privataus projekto savininkas
 AffectedTo=Paskirta
 CantRemoveProject=Šis projektas negali būti pašalintas, nes yra susijęs su kai kuriais kitais objektais (sąskaitos-faktūros, užsakymai ar kiti). Žiūrėti nukreipimų lentelę.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Neįmanoma perkelti užduoties datą į naujo projekto pradžios datą
 ProjectsAndTasksLines=Projektai ir užduotys
 ProjectCreatedInDolibarr=Projektas %s sukurtas
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Užduotis %s sukurta
 TaskModifiedInDolibarr=Užduotis %s modifikuota
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/lt_LT/propal.lang b/htdocs/langs/lt_LT/propal.lang
index 71b31d51b91..7ac4e2baffd 100644
--- a/htdocs/langs/lt_LT/propal.lang
+++ b/htdocs/langs/lt_LT/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Pasirašyta (reikia pateikti sąskaitą-faktūrą)
 PropalStatusNotSigned=Nepasirašyta (uždarytas)
 PropalStatusBilled=Sąskaita-faktūra pateikta
 PropalStatusDraftShort=Projektas
+PropalStatusValidatedShort=Galiojantis
 PropalStatusClosedShort=Uždarytas
 PropalStatusSignedShort=Pasirašyta
 PropalStatusNotSignedShort=Nepasirašyta
diff --git a/htdocs/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang
index a3ccc046595..957b1bcb0bf 100644
--- a/htdocs/langs/lt_LT/salaries.lang
+++ b/htdocs/langs/lt_LT/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 532df621191..a3b43cc9d1e 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Keisti sandėlį
 MenuNewWarehouse=Naujas sandėlys
 WarehouseSource=Pradinis sandėlis
 WarehouseSourceNotDefined=Nėra apibrėžto sandėlio
+AddWarehouse=Create warehouse
 AddOne=Pridėti vieną
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Numatytas sandėlis
 ValidateSending=Ištrinti siuntimą
 CancelSending=Atšaukti siuntimą
@@ -22,6 +24,7 @@ Movements=Judesiai
 ErrorWarehouseRefRequired=Sandėlio nuorodos pavadinimas yra būtinas
 ListOfWarehouses=Sandėlių sąrašas
 ListOfStockMovements=Atsargų judėjimų sąrašas
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/lt_LT/stripe.lang b/htdocs/langs/lt_LT/stripe.lang
index 4a3966faaa7..3b04daa584f 100644
--- a/htdocs/langs/lt_LT/stripe.lang
+++ b/htdocs/langs/lt_LT/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang
index 1490ee5f5e7..5e5bb25b046 100644
--- a/htdocs/langs/lt_LT/trips.lang
+++ b/htdocs/langs/lt_LT/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Rodyti išlaidų ataskaitą
 NewTrip=Nauja išlaidų ataskaita
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Suma arba Kilometrai
 DeleteTrip=Ištrinti išlaidų ataskaitą
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Laukiama patvirtinimo
 ExpensesArea=Išlaidų ataskaitų sritis
 ClassifyRefunded=Klasifikuoti "Grąžinta"
 ExpenseReportWaitingForApproval=Nauja išlaidų ataskaita buvo pateikta patvirtinimui
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Išlaidų ataskaitos ID
 AnyOtherInThisListCanValidate=Asmuo informuojamas patvirtinimui.
 TripSociete=Informacijos įmonė
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Jūs deklaravote kitą išlaidų ataskaitą panašiame laiko periode.
 AucuneLigne=Dar nėra deklaruotos išlaidų ataskaitos
 
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index a8b84515692..e433256514c 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -69,8 +69,8 @@ InternalUser=Vidinis vartotojas
 ExportDataset_user_1=Dolibarr vartotojai ir savybės
 DomainUser=Domeno Vartotojas %s
 Reactivate=Atgaivinti
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Leidimas suteiktas, nes paveldėtas iš vieno grupės vartotojų
 Inherited=Paveldėtas
 UserWillBeInternalUser=Sukurtas vartotojas bus vidinis vartotojas (nes nėra susietas su konkrečia trečiąja šalimi)
@@ -93,6 +93,7 @@ NameToCreate=Pavadinimas kuriamai trečiąjai šaliai
 YourRole=Jūsų vaidmenys
 YourQuotaOfUsersIsReached=Jūsų aktyvių vartotojų kvota išnaudota !
 NbOfUsers=Vartotojų skaičius
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Tik superadministratorius gali sumažinti kito superadministratoriaus teises
 HierarchicalResponsible=Prižiūrėtojas
 HierarchicView=Hierarchinis vaizdas
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index e2cd790717f..bfebf4b4b91 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Skaityti
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index daa0fece9d7..3f014f99858 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Apdoroti
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Trečiosios šalies banko kodas
-NoInvoiceCouldBeWithdrawed=Nėra sėkmingai išimtų sąskaitų-faktūrų. Patikrinkite, ar sąskaitos-faktūros įmonėms, turinčioms galiojantį BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Priskirti įskaitytas (credited)
 ClassCreditedConfirm=Ar tikrai norite priskirti šias išėmimo įplaukas kaip įskaitytas (credited) į Jūsų banko sąskaitą ?
 TransData=Perdavimo data
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Eilučių būklės statistika
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 1c58af4f7b7..d113a080a6b 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Rēķina nosaukums
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Cita informācija
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Dokumenta veids
 Docdate=Datums
 Docref=Atsauce
-Code_tiers=Trešās personas
 LabelAccount=Konta nosaukums
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Gads kurš jādzēš
 DelJournal=Žurnāls kurš jādzēš
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=PVN konts nav definēts
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Trešās personas konts
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Jauna transakcija
 NumMvts=Numero of transaction
 ListeMvts=Pārvietošanas saraksts
@@ -220,27 +218,31 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Pielietot masu sadaļas
 AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group
 CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Accounting journals
+AccountingJournals=Grāmatvedības žurnāli
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Daba
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Pārdošanas
 AccountingJournalType3=Purchases
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventārs
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=Nav definēts žurnāls
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index d32edee8c56..66b0adc1076 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -196,7 +196,7 @@ OnlyActiveElementsAreShown=Tikai elementus no <a href="%s">iespējotu moduļi</a
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
+ModulesMarketPlaces=Atrastt ārējo lietotni / moduļus
 ModulesDevelopYourModule=Develop your own app/modules
 ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Kļūda, nevar izmantot iespēju @, ja secība {gggg} {mm} vai {gads} {mm} nav maska.
 UMask=Umask parametri jauniem failiem Unix/Linux/BSD/Mac failu sistēma.
 UMaskExplanation=Šis parametrs ļauj noteikt atļaujas, kas pēc noklusējuma failus, ko rada Dolibarr uz servera (laikā augšupielādēt piemēram). <br> Tam jābūt astotnieku vērtība (piemēram, 0666 nozīmē lasīt un rakstīt visiem). <br> Šis parametrs ir bezjēdzīgi uz Windows servera.
-SeeWikiForAllTeam=Ieskatieties wiki lappusē Pilns visu dalībnieku un to organizāciju
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Kavēšanās caching eksporta atbildes sekundēs (0 vai tukšs bez cache)
 DisableLinkToHelpCenter=Paslēpt saites <b>"vajadzīga palīdzība vai atbalsts"</b> pieteikšanās lapā
 DisableLinkToHelp=Noslēpt saiti uz tiešsaistes palīdzību "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas de
 MassConvert=Uzsākt masveida konvertēšanu
 String=Rinda
 TextLong=Garš teksts
+HtmlText=Html text
 Int=Vesels skaitlis
 Float=Peldēt
 DateAndTime=Datums un laiks
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Aprēķinātais lauks
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Uzmanību: Jūsu <b>conf.php</b> satur direktīvu <b>dolibarr_pdf_force_fpdf = 1.</b> Tas nozīmē, ka jūs izmantojat FPDF bibliotēku, lai radītu PDF failus. Šī bibliotēka ir vecs un neatbalsta daudz funkcijām (Unicode, attēlu pārredzamība, kirilicas, arābu un Āzijas valodās, ...), tāpēc var rasties kļūdas laikā PDF paaudzes. <br> Lai atrisinātu šo problēmu, un ir pilnībā atbalsta PDF paaudzes, lūdzu, lejupielādējiet <a href="http://www.tcpdf.org/" target="_blank">TCPDF bibliotēka</a> , tad komentēt vai noņemt līnijas <b>$ dolibarr_pdf_force_fpdf = 1,</b> un pievienojiet vietā <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Ievadiet tālruņa numuru, uz kuru zvanīt, lai parādītu saiti, lai pārbaudītu Nospied lai zvanītu url lietotājam <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Noklikšķiniet, lai parādītu aprakstu
 DependsOn=Šim modulim nepieciešams modulis (-i)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Pievienot failu
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Lietotāji un grupas
 Module0Desc=Lietotāju / Darbinieku un Grupu vadība
@@ -619,6 +622,8 @@ Module59000Name=Malas
 Module59000Desc=Moduli, lai pārvaldītu peļņu
 Module60000Name=Komisijas
 Module60000Desc=Modulis lai pārvaldītu komisijas
+Module62000Name=Inkoterms
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resursi
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Lasīt klientu rēķinus
@@ -833,11 +838,11 @@ Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielā
 Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
 Permission1322=Reopen a paid bill
 Permission1421=Eksportēt klientu pasūtījumus un atribūtus
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Apskatīt ieplānoto darbu
 Permission23002=Izveidot/atjaunot ieplānoto uzdevumu
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Apmaksas noteikumi
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Kontaktu/Adrešu veidi
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Papīra formāts
 DictionaryFormatCards=Kartes formāti
@@ -895,7 +901,7 @@ DictionaryOrderMethods=Pasūtījumu veidi
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
+DictionaryAccountancyJournal=Grāmatvedības žurnāli
 DictionaryEMailTemplates=E-pastu paraugi
 DictionaryUnits=Vienības
 DictionaryProspectStatus=Prospection status
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=PVN Vadība
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijās, idnividuālie komersanti.
-VATIsUsedExampleFR=Francijā, tas nozīmē, uzņēmumiem vai organizācijām, kas reāli fiskālo sistēmu (Vienkāršota reālu vai normāla īsto). Sistēma, kurā PVN ir deklarēta.
-VATIsNotUsedExampleFR=Francijā, tas ir asociācijas, kas nav PVN deklarētas vai uzņēmumi, organizācijas vai brīvo profesiju, kas ir izvēlējušies mikrouzņēmumu nodokļu sistēmu (PVN ar franšīzes), un tā maksā franšīzes PVN bez PVN deklarācijas. Šī izvēle būs redzams atskaites "Nav piemērojams PVN - art-293B CGI" rēķinā.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Likme
 LocalTax1IsNotUsed=Nelietot otru nodokli
@@ -977,7 +983,7 @@ Host=Serveris
 DriverType=Draivera veids
 SummarySystem=Sistēmas informācijas kopsavilkums
 SummaryConst=Sarakstu ar visiem Dolibarr uzstādīšanas parametriem
-MenuCompanySetup=Uzņēmums/Organizācija
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standarta izvēlnes menedžeris
 DefaultMenuSmartphoneManager=Viedtālruņa izvēlnes vadība
 Skin=Izskats
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Pastāvīgā meklēšanas forma kreisajā izvēlnē
 DefaultLanguage=Noklusējuma izmantošanas valoda (valodas kods)
 EnableMultilangInterface=Iespējot daudzvalodu interfeisu
 EnableShowLogo=Rādīt logotipu kreisajā izvēlnē
-CompanyInfo=Uzņēmuma/organizācijas informācija
-CompanyIds=Uzņēmuma/organizācijas identitātes
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Nosaukums
 CompanyAddress=Adrese
 CompanyZip=Pasta indekss
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums tikai lasīšanas režīmā un redzama tikai administratoriem.
 SystemAreaForAdminOnly=Šī joma ir pieejama administratora lietotājiem. Neviens no Dolibarr atļauju var samazināt šo robežu.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Jūs varat izvēlēties katru parametru, kas saistīts ar Dolibarr izskatu un justies šeit
 AvailableModules=Pieejamās progrmma / moduļi
 ToActivateModule=Lai aktivizētu moduļus, dodieties uz iestatīšanas zonas (Home->Setup->Moduļi).
@@ -1441,6 +1448,9 @@ SyslogFilename=Faila nosaukums un ceļš
 YouCanUseDOL_DATA_ROOT=Jūs varat izmantot DOL_DATA_ROOT / dolibarr.log uz log failu Dolibarr "dokumenti" direktorijā. Jūs varat iestatīt citu ceļu, lai saglabātu šo failu.
 ErrorUnknownSyslogConstant=Constant %s nav zināms Syslog konstante
 OnlyWindowsLOG_USER=Windows atbalsta tikai LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Ziedojumu moduļa uzstādīšana
 DonationsReceiptModel=Veidne ziedojuma saņemšanu
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=PVN jāmaksā
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=PVN ir jāmaksā: <br> - Piegādes laikā precēm (mēs izmantojam rēķina datumu) <br> - Par maksājumiem par pakalpojumiem
 OptionVatDebitOptionDesc=PVN ir jāmaksā: <br> - Piegādes laikā precēm (mēs izmantojam rēķina datumu) <br> - Par rēķinu (debets) attiecībā uz pakalpojumiem
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=Piegādes brīdī
 OnPayment=Par samaksu
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Rēķina izmantotais datums
 Buy=Pirkt
 Sell=Pārdot
 InvoiceDateUsed=Rēķina izmantotais datums
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Grāmatvedības kods
 AccountancyCodeSell=Tirdzniecība kontu. kods
 AccountancyCodeBuy=Iegādes konta. kods
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=Sūtīt e-pastu no trešās puses lapas
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Jūs izmantojat pēdējo stabilo versiju
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index b364c186059..89eb13dadca 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Dalībnieks %s apstiprināts
 MemberModifiedInDolibarr=Dalībnieks %s labots
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Dalībnieks %s dzēsts
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Sūtījums %s apstiprināts
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Jūs varat pievienot arī šādus parametrus, lai filtrētu pr
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Rādīt kontaktu dzimšanas dienas
 AgendaHideBirthdayEvents=Slēpt kontaktu dzimšanas dienas
 Busy=Aizņemts
@@ -109,7 +112,7 @@ ExportCal=Eksportēt kalendāru
 ExtSites=Importēt ārējos kalendārus
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Kalendāru skaits
-AgendaExtNb=Kalendārs nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL, lai piekļūtu. ICal failam
 ExtSiteNoLabel=Nav Apraksta
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 681a785723d..b2c47a05c90 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Atmaksāts atpakaļ
 DeletePayment=Izdzēst maksājumu
 ConfirmDeletePayment=Vai tiešām vēlaties dzēst šo maksājumu?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Piegādātāju maksājumi
 ReceivedPayments=Saņemtie maksājumi
 ReceivedCustomersPayments=Maksājumi, kas saņemti no klientiem
@@ -91,7 +92,7 @@ PaymentAmount=Maksājuma summa
 ValidatePayment=Apstiprināt maksājumu
 PaymentHigherThanReminderToPay=Maksājumu augstāka nekā atgādinājums par samaksu
 HelpPaymentHigherThanReminderToPay=Uzmanība, maksājuma summu, no vienas vai vairākām rēķinus, ir lielāks nekā pārējās maksāt. <br> Labot savu ierakstu, citādi apstiprināt un domāt par izveidot kredīta piezīmi par pārsnieguma saņem par katru pārmaksāto rēķiniem.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Klasificēt "Apmaksāts"
 ClassifyPaidPartially=Klasificēt 'Apmaksāts daļēji'
 ClassifyCanceled=Klasificēt &quot;Abandoned&quot;
@@ -110,6 +111,7 @@ DoPayment=Ievadiet maksājumu
 DoPaymentBack=Ievadiet atmaksu
 ConvertToReduc=Pārvērst nākotnes atlaidē
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Ievadiet saņemto naudas summu no klienta
 EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Izveidoto rēķinu statuss
 BillStatusDraft=Melnraksts (jāapstiprina)
 BillStatusPaid=Apmaksāts
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Apmaksātais (gatavas pēdējo rēķinu)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Pamesti
 BillStatusValidated=Apstiprināts (jāapmaksā)
 BillStatusStarted=Sākts
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Līdz
 AmountExpected=Pieprasīto summu
 ExcessReceived=Excess saņemti
+ExcessPaid=Excess paid
 EscompteOffered=Piedāvāta atlaide (maksājums pirms termiņa)
 EscompteOfferedShort=Atlaide
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Atlaide no kredīta piezīmes %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Šis kredīta veids var izmantot rēķinā pirms tās apstiprināšanas
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Jauna absolūta atlaide
 NewRelativeDiscount=Jauna relatīva atlaide
+DiscountType=Discount type
 NoteReason=Piezīme / Iemesls
 ReasonDiscount=Iemesls
 DiscountOfferedBy=Piešķīris
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Rēķina adrese
 HelpEscompte=Šī atlaide ir piešķirta klientam, jo ​​tas maksājumu veica pirms termiņa.
 HelpAbandonBadCustomer=Šī summa ir pamests (klients teica, ka slikts klients), un tiek uzskatīts par ārkārtēju zaudēt.
@@ -341,10 +348,10 @@ NextDateToExecution=Nākamās rēķina izveidošanas datums
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Rēķinus automātiski apstiprināt
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -453,7 +460,7 @@ ShowUnpaidAll=Rādīt visus neapmaksātos rēķinus
 ShowUnpaidLateOnly=Rādīt vēlu neapmaksātiem rēķiniem tikai
 PaymentInvoiceRef=Maksājuma rēķins %s
 ValidateInvoice=Apstiprināt rēķinu
-ValidateInvoices=Validate invoices
+ValidateInvoices=Apstipriniet rēķinus
 Cash=Skaidra nauda
 Reported=Kavējas
 DisabledBecausePayments=Nav iespējams, kopš šeit ir daži no maksājumiem
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index f4ff6b93313..34d40bddf9a 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -43,7 +43,8 @@ Individual=Privātpersona
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Mātes uzņēmums
 Subsidiaries=Filiāles
-ReportByCustomers=Klientu ziņojums
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Kursa/ reitinga ziņojums
 CivilityCode=Pieklājība kods
 RegisteredOffice=Juridiskā adrese
@@ -75,10 +76,12 @@ Town=Pilsēta
 Web=Mājaslapa
 Poste= Pozīcija
 DefaultLang=Valoda pēc noklusējuma
-VATIsUsed=PVN tiek izmantots
-VATIsNotUsed=PVN netiek izmantots
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Priekšlikumi
 OverAllOrders=Pasūtījumi
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane kods)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=PVN numurs
-VATIntraShort=PVN numurs
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Sintakse ir pareiza
+VATReturn=VAT return
 ProspectCustomer=Prospect / Klients
 Prospect=Perspektīva
 CustomerCard=Klienta kartiņa
 Customer=Klients
 CustomerRelativeDiscount=Relatīvā klienta atlaide
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relatīvā atlaide
 CustomerAbsoluteDiscountShort=Absolūtā atlaide
 CompanyHasRelativeDiscount=Šim klientam ir pastāvīgā atlaide <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Šim klientam nav relatīvā atlaide pēc noklusējuma
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Šim klientam joprojām ir kredīta piezīmes <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Šim klientam nav  pieejams atlaižu kredīts
-CustomerAbsoluteDiscountAllUsers=Absolūtais atlaides (ko piešķir visiem lietotājiem)
-CustomerAbsoluteDiscountMy=Absolūtais atlaides (ko piešķir pats)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Nav
 Supplier=Piegādātājs
 AddContact=Izveidot kontaktu
@@ -377,9 +390,9 @@ NoDolibarrAccess=Nav Dolibarr piekļuve
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and proper
 ExportDataset_company_2=Kontakti un rekvizīti
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and proper
-ImportDataset_company_2=Kontakti/Adreses (trešo pušu vai arī nē)
-ImportDataset_company_3=Bankas rekvizīti
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Cenu līmenis
 DeliveryAddress=Piegādes adrese
 AddAddress=Pievienot adresi
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Maks. par izcilu rēķinu
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Atgriešanās Numero ar formātu %syymm-NNNN par klientu kodu un %syymm-NNNN forsupplier kodu, kur gg ir gads, MM ir mēnesis, un nnnn ir secība bez pārtraukuma un bez atgriezties 0.
 LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā.
 ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...) 
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Tirdzniecības pārstāvja vārds
 SaleRepresentativeLastname=Tirdzniecības pārstāvja uzvārds
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index eb20cdfc1e6..bc740f7bfe9 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -31,7 +31,7 @@ Credit=Kredīts
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Neto iekasēto
 AmountHTVATRealPaid=Neto samaksāts
-VATToPay=PVN pārdod
+VATToPay=Tax sales
 VATReceived=Saņemti nodokļi
 VATToCollect=Tax purchases
 VATSummary=Nodokļu bilance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Maksājumi
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=PVN atmaksa
+NewVATPayment=New sales tax payment
 Refund=Atmaksa
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Rādīt PVN maksājumu
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Tas ietver visas efektīvus maksājumus rēķiniem, kas saņemti no klientiem. <br> - Tā ir balstīta uz maksājuma datumu šiem rēķiniem <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Ziņojumā, ko trešās puses IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=PVN atskaite
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Ziņojumā, ko trešās puses IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Ziņojums klientu PVN iekasē un izmaksā
-VATReportByCustomersInDueDebtMode=Ziņojums klientu PVN iekasē un izmaksā
-VATReportByQuartersInInputOutputMode=Ziņojums, ko likmi iekasētā PVN un samaksāts
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Ziņojums, ko likmi iekasētā PVN un samaksāts
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Skatīt ziņot <b>%sVAT encasement%s</b> standarta aprēķināšanai
 SeeVATReportInDueDebtMode=Skatīt ziņojumu <b>%sVAT par flow%s</b> par aprēķinu ar opciju plūsmas
 RulesVATInServices=- Attiecībā uz pakalpojumiem, pārskatā ir iekļauti PVN noteikumi faktiski saņem vai izdota, pamatojoties uz maksājuma dienas.
-RulesVATInProducts=- Par materiālo vērtību, tas ietver PVN rēķinus, pamatojoties uz rēķina datuma.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Attiecībā uz pakalpojumiem, ziņojumā ir iekļauts PVN rēķinu dēļ, vai nav maksāts, pamatojoties uz rēķina datuma.
-RulesVATDueProducts=- Par materiālo vērtību, tas ietver PVN rēķinus, pamatojoties uz rēķina datuma.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Piezīme: materiālo aktīvu, tai vajadzētu izmantot dzemdību datumu ir vairāk godīgi.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/Rēķins
 NotUsedForGoods=Nav izmantots precēm
 ProposalStats=Priekšlikumu statistika
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot <b>skaidras naudas uzskaites</b> režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto <b>saderināšanās grāmatvedības</b> režīmu (skat. iestatīšanu grāmatvedības moduli).
 CalculationMode=Aprēķinu režīms
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Kļūda: Bankas konts nav atrasts
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index 631ad38cea7..c60117d8079 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Nav reģistrētu darbu
 CronPriority=Prioritāte
 CronLabel=Nosaukums
 CronNbRun=Nb. sākt
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Katru
 JobFinished=Darbs uzsākts un pabeigts
 #Page card
@@ -74,9 +74,10 @@ CronFrom=No
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell komandu
-CronCannotLoadClass=Nevar ielādēt klases %s vai objektu %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 6f378752f3b..42e99d71bc9 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP saskaņošana nav pilnīga.
 ErrorLDAPMakeManualTest=. LDIF fails ir radīts direktorija %s. Mēģināt ielādēt manuāli no komandrindas, lai būtu vairāk informācijas par kļūdām.
 ErrorCantSaveADoneUserWithZeroPercentage=Nevar saglabāt prasību ar &quot;statut nav uzsākta&quot;, ja lauks &quot;izdarīt&quot;, ir arī piepildīta.
 ErrorRefAlreadyExists=Ref izmantot izveidot jau pastāv.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Nevar izdzēst ierakstu. Tas ir pievienots citam objektam.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Neizdevās pievienot ierakstu %s, lai pastnieks sa
 ErrorFailedToRemoveToMailmanList=Neizdevās noņemt ierakstu %s, lai pastnieks saraksta %s vai SPIP bāze
 ErrorNewValueCantMatchOldValue=Jaunā vērtība nevar būt vienāds ar veco
 ErrorFailedToValidatePasswordReset=Neizdevās reinit paroli. Var būt reinit tika izdarīts (šī saite var izmantot tikai vienu reizi). Ja tā nav, mēģiniet restartēt reinit procesu.
-ErrorToConnectToMysqlCheckInstance=Savienojumu ar datu bāzi neizdodas. Pārbaudiet MySQL serveris darbojas (vairumā gadījumu, jūs varat sākt to no komandrindas ar &quot;sudo / etc / init.d / mysql start&quot;).
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Neizdevās pievienot kontaktu
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Maksājumu režīms tika noteikts rakstīt %s, bet uzstādīšana moduļa rēķins netika pabeigts, lai noteiktu informāciju, lai parādītu šo maksājumu režīmā.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/lv_LV/loan.lang b/htdocs/langs/lv_LV/loan.lang
index 652665b682d..44116e35787 100644
--- a/htdocs/langs/lv_LV/loan.lang
+++ b/htdocs/langs/lv_LV/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 1d27de8a07d..86760a9f8ba 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimālā vērtība
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 7f0efffc62c..881719def28 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametrs %s nav definēts
 ErrorUnknown=Nezināma kļūda
 ErrorSQL=SQL kļūda
 ErrorLogoFileNotFound=Logotipa fails '%s' nav atrasts
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Iet uz moduļa uzstādīšanu, lai atrisinātu šo
 ErrorFailedToSendMail=Neizdevās nosūtīt pastu (sūtītājs = %s, saņēmējs = %s)
 ErrorFileNotUploaded=Fails netika augšupielādēts. Pārbaudiet vai izmērs nepārsniedz maksimāli pieļaujamo un, ka brīvas vietas ir pieejama uz diska, un nav jau failu ar tādu pašu nosaukumu šajā direktorijā.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojoša
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Kļūda, neizdevās saglabāt failu.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Jums nav tiesību, lai veiktu šo darbību.
 SetDate=Iestatīt datumu
 SelectDate=Izvēlēties datumu
 SeeAlso=Skatīt arī %s
 SeeHere=See here
+ClickHere=Noklikšķiniet šeit
+Here=Here
 Apply=Pielietot
 BackgroundColorByDefault=Noklusējuma fona krāsu
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Saite
 Select=Atlasīt
 Choose=Izvēlēties
 Resize=Samazināt
+ResizeOrCrop=Resize or Crop
 Recenter=Centrēt
 Author=Autors
 User=Lietotājs
@@ -325,8 +328,10 @@ Default=Noklusējums
 DefaultValue=Noklusējuma vērtība
 DefaultValues=Noklusējuma vērtības
 Price=Cena
+PriceCurrency=Price (currency)
 UnitPrice=Vienības cena
 UnitPriceHT=Vienības cena (neto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Vienības cena
 PriceU=UP
 PriceUHT=UP (neto)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Rēķina summa
+AmountInvoiced=Amount invoiced
 AmountPayment=Maksājuma summa
 AmountHTShort=Summa (neto)
 AmountTTCShort=Summa (ar PVN)
@@ -353,6 +359,7 @@ AmountLT2ES=Summa IRPF
 AmountTotal=Kopējā summa
 AmountAverage=Vidējā summa
 PriceQtyMinHT=Cena daudzumu min. (bez nodokļiem)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Procentuālā attiecība
 Total=Kopsumma
 SubTotal=Starpsumma
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Nodokļa likme
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Vidējais
 Sum=Summa
@@ -419,7 +428,8 @@ ActionRunningShort=Procesā
 ActionDoneShort=Pabeigts
 ActionUncomplete=Nepabeigts
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Kompānija/Organizācija
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Šīs trešās personas kontakti
 ContactsAddressesForCompany=Kontakti / adreses par šīs trešās personas
 AddressesForCompany=Šīs trešās puses adreses
@@ -427,6 +437,9 @@ ActionsOnCompany=Pasākumi par šīs trešās personas
 ActionsOnMember=Pasākumi par šo locekli
 ActionsOnProduct=Events about this product
 NActionsLate=%s vēlu
+ToDo=Jāizdara
+Completed=Completed
+Running=Procesā
 RequestAlreadyDone=Request already recorded
 Filter=Filtrs
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Uzmanību, jūs esat uzturēšanas režīmā, t.i
 CoreErrorTitle=Sistēmas kļūda
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kredītkarte
+ValidatePayment=Apstiprināt maksājumu
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Lauki ar <b>%s</b> ir obligāti aizpildāmi
 FieldsWithIsForPublic=Lauki ar <b>%s</b> parāda sabiedrības locekļu sarakstu. Ja jūs nevēlaties to, tad izņemiet ķeksi pie &quot;sabiedrības&quot; lodziņa.
 AccordingToGeoIPDatabase=(Saskaņā ar GeoIP)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Vai tiešām vēlaties dzēst izvēlēto ierakstu %s?
 RelatedObjects=Saistītie objekti
 ClassifyBilled=Klasificēt apmaksāts
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Noklikšķiniet šeit
 FrontOffice=birojs
 BackOffice=Back office
 View=Izskats
@@ -837,7 +852,7 @@ ClickToShowHelp=Click to show tooltip help
 WebSite=Mājas lapa
 WebSites=Tīmekļa vietnes
 WebSiteAccounts=Vietnes konti
-ExpenseReport=Expense report
+ExpenseReport=Izdevumu pārskats
 ExpenseReports=Izdevumu atskaites
 HR=HR
 HRAndBank=HR and Bank
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekts
 Projects=Projekti
 Rights=Atļaujas
+LineNb=Line no.
+IncotermLabel=Inkoterms
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
@@ -890,7 +907,7 @@ Select2MoreCharacters=vai vairāk simbolus
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Ielādē vairāk rezultātus...
 Select2SearchInProgress=Meklēšana procesā...
-SearchIntoThirdparties=Trešās puses
+SearchIntoThirdparties=Trešās personas
 SearchIntoContacts=Kontakti
 SearchIntoMembers=Dalībnieki
 SearchIntoUsers=Lietotāji
@@ -916,3 +933,11 @@ CommentDeleted=Komentārs dzēsts
 Everybody=Visi
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Piešķirts
diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
index a9e91e5f4a1..1a5609fff7b 100644
--- a/htdocs/langs/lv_LV/margins.lang
+++ b/htdocs/langs/lv_LV/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 93c3b6b9979..61809e044f9 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Saraksts ar apstiprināto valsts locekļu
 ErrorThisMemberIsNotPublic=Šis dalībnieks nav publisks
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Vēl viens dalībnieks (nosaukums: <b>%s,</b> pieteikšanās: <b>%s)</b> jau ir saistīts ar trešo personu <b>%s.</b> Noņemt šo saiti vispirms tāpēc, ka trešā persona nevar saistīt tikai loceklim (un otrādi).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Drošības apsvērumu dēļ, jums ir jāpiešķir atļaujas, lai rediģētu visi lietotāji varētu saistīt locekli, lai lietotājam, kas nav jūsu.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Saturu jūsu dalības kartes
 SetLinkToUser=Saite uz Dolibarr lietotāju
 SetLinkToThirdParty=Saite uz Dolibarr trešajai personai
 MembersCards=Dalībnieku vizītkartes
@@ -108,17 +106,33 @@ PublicMemberCard=Dalībnieku publiskā kartiņa
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Rādīt abonementu
-SendAnEMailToMember=Sūtīt informāciju e-pastu loceklim
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Saturu jūsu dalības kartes
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Priekšmets e-pastu saņēma, ja auto-uzrakstu viesis
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-pasts saņemta gadījumā auto-uzrakstu viesis
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-Mail temats loceklis autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=E-pasts loceklis autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=E-Mail temats locekļa apstiprināšanu
-DescADHERENT_MAIL_VALID=E-pasts locekļa apstiprināšanu
-DescADHERENT_MAIL_COTIS_SUBJECT=E-pasta tēmu parakstīšanās
-DescADHERENT_MAIL_COTIS=E-Mail parakstīšanās
-DescADHERENT_MAIL_RESIL_SUBJECT=E-Mail temats loceklis resiliation
-DescADHERENT_MAIL_RESIL=E-pasts loceklis resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sūtītāja e-pasts automātisko e-pastiem
 DescADHERENT_ETIQUETTE_TYPE=Formāts etiķešu lapā
 DescADHERENT_ETIQUETTE_TEXT=Teksts drukāts uz dalībvalstu adrese lapām
@@ -177,3 +191,8 @@ NoVatOnSubscription=Nav TVA par abonēšanu
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 8fbcf227df7..1e1d3a916f8 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=Tabula %s nepastāv
 TableDropped=Tabula %s dzēsta
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 0556f4a62d2..726d1b6a1fa 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Ziņu kopā ar apstiprinātu maksājuma atgriešanās lapā
 MessageKO=Ziņa par atcelto maksājumu atgriešanās lapā
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Rēķina datums
 PreviousYearOfInvoice=Iepriekšējā rēķina datuma gads
@@ -78,8 +80,8 @@ LinkedObject=Saistītais objekts
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Sākt augšupielādi
 CancelUpload=Atcelt augšupielādi
 FileIsTooBig=Faili ir pārāk lieli
 PleaseBePatient=Lūdzu, esiet pacietīgi ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Pieprasījumu, lai mainītu savu Dolibarr paroli ir saņemta
 NewKeyIs=Tas ir jūsu jaunās atslēgas, lai pieteiktos
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Virsraksts
 WEBSITE_DESCRIPTION=Apraksts
 WEBSITE_KEYWORDS=Atslēgas vārdi
+LinesToImport=Lines to import
diff --git a/htdocs/langs/lv_LV/paypal.lang b/htdocs/langs/lv_LV/paypal.lang
index 753330ba626..48b57304243 100644
--- a/htdocs/langs/lv_LV/paypal.lang
+++ b/htdocs/langs/lv_LV/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal tikai
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Tas ir id darījuma: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Pievieno url Paypal maksājumu, kad jūs sūtīt dokumentu pa pastu
-PredefinedMailContentLink=Jūs varat noklikšķināt uz drošu saites zemāk, lai padarītu jūsu maksājumu (PayPal), ja tas jau nav izdarīts. \n\n %s \n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=Saņemts jauns tiešsaistes maksājums
 NewOnlinePaymentFailed=Jauns tiešsaistes maksājums tika izmēģināts, bet neizdevās
@@ -30,3 +30,6 @@ ErrorCode=Kļūdas kods
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Tiešsaistes maksājumu sistēma
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 7152dbd616f..5745a6e69c4 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Produkts vai pakalpojums
 ProductsAndServices=Produkti un pakalpojumi
 ProductsOrServices=Produkti vai pakalpojumi
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Produkti pārdošanai
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Vai tiešām vēlaties dzēst šo produktu līniju?
 ProductSpecial=Īpašs
 QtyMin=Minimālais Daudzums
 PriceQtyMin=Cena par šo min. daudzums (bez atlaides)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=PVN likme (šim piegādātājam / produktam)
 DiscountQtyMin=Noklusējuma apjoma atlaide
 NoPriceDefinedForThisSupplier=Nav cena /gab definēti šim piegādātājam/precei
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 8ca77ad154e..e4f9303f709 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Projekta kontakti
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Visi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Šo viedokli iepazīstina visus projektus jums ir atļauts lasīt.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Šo viedokli iepazīstina visus projektus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Šo viedokli iepazīstina visus projektus un uzdevumus, jums ir atļauts lasīt.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Laiks, kas patērēts
 MyTimeSpent=Mans pavadīts laiks
+BillTime=Bill the time spent
 Tasks=Uzdevumi
 Task=Uzdevums
 TaskDateStart=Uzdevuma sākuma datums
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Saraksts ar notikumiem, kas saistīti ar projektu
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Aktivitāte projektu šonedēļ
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktivitāte projektu šomēnes
 ActivityOnProjectThisYear=Aktivitāte projektā šogad
 ChildOfProjectTask=Bērna projekta / uzdevuma
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Ne īpašnieks šo privātam projektam
 AffectedTo=Piešķirtas
 CantRemoveProject=Šo projektu nevar noņemt, jo tam ir atsauce ar kādu citu objektu (rēķinu, rīkojumus vai cits). Skatīt atsauču sadaļa.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nav iespējams novirzīt uzdevumu datumu saskaņā ar jaunu projektu uzsākšanas datuma
 ProjectsAndTasksLines=Projekti un uzdevumi
 ProjectCreatedInDolibarr=Projekta %s izveidots
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Uzdevums %s izveidots
 TaskModifiedInDolibarr=Uzdevums %s labots
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
index 902f3a5336b..249045d744f 100644
--- a/htdocs/langs/lv_LV/propal.lang
+++ b/htdocs/langs/lv_LV/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Parakstīts (vajadzības rēķinu)
 PropalStatusNotSigned=Nav parakstīts (slēgta)
 PropalStatusBilled=Jāmaksā
 PropalStatusDraftShort=Melnraksts
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Slēgts
 PropalStatusSignedShort=Parakstīts
 PropalStatusNotSignedShort=Nav parakstīts
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 217fa91ea0d..6e3e9361975 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 724129c2406..cbe38e64f42 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modificēt noliktavas
 MenuNewWarehouse=Jauna noliktava
 WarehouseSource=Sākotnējā noliktava
 WarehouseSourceNotDefined=Nē noliktava noteikts,
+AddWarehouse=Create warehouse
 AddOne=Pievieno vienu
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Mērķa noliktava
 ValidateSending=Dzēst nosūtot
 CancelSending=Atcelt sūtīšanu
@@ -22,6 +24,7 @@ Movements=Kustības
 ErrorWarehouseRefRequired=Noliktava nosaukums ir obligāts
 ListOfWarehouses=Saraksts noliktavās
 ListOfStockMovements=Krājumu pārvietošanas saraksts
+ListOfInventories=List of inventories
 MovementId=Pārvietošanas ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/lv_LV/stripe.lang b/htdocs/langs/lv_LV/stripe.lang
index b3f7c37c82f..4b326fb4688 100644
--- a/htdocs/langs/lv_LV/stripe.lang
+++ b/htdocs/langs/lv_LV/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Slepena testa atslēga
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index 37b2bf29474..a7034d90d09 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Summa vai kilometri
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Vai tiešām vēlaties dzēst šo izdevumu atskaiti ?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 1694c7da46e..1c53cb15259 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -69,8 +69,8 @@ InternalUser=Iekšējais lietotājs
 ExportDataset_user_1=Dolibarr lietotājus un īpašības
 DomainUser=Domēna lietotājs %s
 Reactivate=Aktivizēt
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Atļauja piešķirta, jo mantojis no viena lietotāja grupai.
 Inherited=Iedzimta
 UserWillBeInternalUser=Izveidots lietotājs būs iekšējā lietotāja (jo nav saistīta ar konkrētu trešajai personai)
@@ -93,6 +93,7 @@ NameToCreate=Nosaukums trešās puses, lai radītu
 YourRole=Jūsu lomas
 YourQuotaOfUsersIsReached=Jūsu aktīvo lietotāju limits ir sasniegts!
 NbOfUsers=Lietotāju sk
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Tikai superadmins var pazemināt superadminu
 HierarchicalResponsible=Uzraugs
 HierarchicView=Hierarhiska view
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 9485987fc03..59ed70d7976 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Dzēst mājaslapu
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Lapas nosaukums / pseidonīms
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Skatīt lapu jaunā cilnē
 SetAsHomePage=Iestatīt kā mājas lapu
 RealURL=Reāls URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Lasīt
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=Vēl nav nevienas lapas
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Klonēt vietni
 SiteAdded=Pievienota vietne
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Lapas ID
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Vietnes konts
 WebsiteAccounts=Vietnes konti
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 45776cfb891..dc36ab52f46 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Jāapstrādā
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Trešās puses bankas kods
-NoInvoiceCouldBeWithdrawed=Nevienu rēķinu withdrawed ar panākumiem. Pārbaudiet, ka rēķins ir par uzņēmumiem, ar derīgu BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Klasificēt kreditē
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Darījuma datums
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=RUM
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Lūdzu izvēlaties tikai vienu
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Pieprasītais daudzums
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 0260a617c2e..9c7578180ab 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 34ed1126045..9267e55860a 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index d3bb1909afa..5898daa72b0 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index c5bc84acaf8..3473667fe55 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 9bf75178bea..cda96a546b8 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index 10011bc54a0..a4c2e9ca7de 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/mk_MK/loan.lang b/htdocs/langs/mk_MK/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/mk_MK/loan.lang
+++ b/htdocs/langs/mk_MK/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 1ba8ff6dc6d..cedcd01066b 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index dc60c9e13c9..d49dbe31da4 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/mk_MK/margins.lang b/htdocs/langs/mk_MK/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/mk_MK/margins.lang
+++ b/htdocs/langs/mk_MK/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index fd0adc4c264..7326f3b9950 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 1585504479e..2afabe43b06 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/mk_MK/paypal.lang b/htdocs/langs/mk_MK/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/mk_MK/paypal.lang
+++ b/htdocs/langs/mk_MK/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 53835bd7f06..b9ebefc91c9 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index c69302deecb..319a6e7e0e2 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/mk_MK/propal.lang b/htdocs/langs/mk_MK/propal.lang
index 5f3c441bb0d..04941e4c650 100644
--- a/htdocs/langs/mk_MK/propal.lang
+++ b/htdocs/langs/mk_MK/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/mk_MK/salaries.lang
+++ b/htdocs/langs/mk_MK/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 4cdc262b847..7fbe2f6b82a 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/mk_MK/stripe.lang b/htdocs/langs/mk_MK/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/mk_MK/stripe.lang
+++ b/htdocs/langs/mk_MK/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang
index a741a9f6e5f..2ede3bc474e 100644
--- a/htdocs/langs/mk_MK/trips.lang
+++ b/htdocs/langs/mk_MK/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index c87ce3a9b02..8aa5d3749fc 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 78d5b8e3f16..fed6af9a6fa 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/mn_MN/agenda.lang b/htdocs/langs/mn_MN/agenda.lang
index 34ed1126045..9267e55860a 100644
--- a/htdocs/langs/mn_MN/agenda.lang
+++ b/htdocs/langs/mn_MN/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index d3bb1909afa..5898daa72b0 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index c5bc84acaf8..3473667fe55 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 9bf75178bea..cda96a546b8 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/mn_MN/cron.lang b/htdocs/langs/mn_MN/cron.lang
index 884e077b96e..d2da7ded67e 100644
--- a/htdocs/langs/mn_MN/cron.lang
+++ b/htdocs/langs/mn_MN/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/mn_MN/loan.lang b/htdocs/langs/mn_MN/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/mn_MN/loan.lang
+++ b/htdocs/langs/mn_MN/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index 1ba8ff6dc6d..cedcd01066b 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index accab38ac47..dc1de2e4f7a 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/mn_MN/margins.lang b/htdocs/langs/mn_MN/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/mn_MN/margins.lang
+++ b/htdocs/langs/mn_MN/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index fd0adc4c264..7326f3b9950 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 1585504479e..2afabe43b06 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/mn_MN/paypal.lang b/htdocs/langs/mn_MN/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/mn_MN/paypal.lang
+++ b/htdocs/langs/mn_MN/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 53835bd7f06..b9ebefc91c9 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index c69302deecb..319a6e7e0e2 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/mn_MN/propal.lang b/htdocs/langs/mn_MN/propal.lang
index 5f3c441bb0d..04941e4c650 100644
--- a/htdocs/langs/mn_MN/propal.lang
+++ b/htdocs/langs/mn_MN/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/mn_MN/salaries.lang b/htdocs/langs/mn_MN/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/mn_MN/salaries.lang
+++ b/htdocs/langs/mn_MN/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 4cdc262b847..7fbe2f6b82a 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/mn_MN/stripe.lang b/htdocs/langs/mn_MN/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/mn_MN/stripe.lang
+++ b/htdocs/langs/mn_MN/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/mn_MN/trips.lang b/htdocs/langs/mn_MN/trips.lang
index a741a9f6e5f..2ede3bc474e 100644
--- a/htdocs/langs/mn_MN/trips.lang
+++ b/htdocs/langs/mn_MN/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
index c87ce3a9b02..8aa5d3749fc 100644
--- a/htdocs/langs/mn_MN/users.lang
+++ b/htdocs/langs/mn_MN/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index c182b0d84ef..f2bdc0ec065 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Diagram over kontoer
 CurrentDedicatedAccountingAccount=Nåværende dedikert konto
 AssignDedicatedAccountingAccount=Ny konto å tildele
 InvoiceLabel=Fakturaetikett
-OverviewOfAmountOfLinesNotBound=Oversikt over antall linjer som ikke er bundet til regnskapskonto
-OverviewOfAmountOfLinesBound=Oversikt over antall linjer som allerede er bundet til regnskapskonto
+OverviewOfAmountOfLinesNotBound=Oversikt over antall linjer som ikke er bundet til en regnskapskonto
+OverviewOfAmountOfLinesBound=Oversikt over antall linjer som allerede er bundet til en regnskapskonto
 OtherInfo=Annen informasjon
 DeleteCptCategory=Fjern regnskapskonto fra gruppe
 ConfirmDeleteCptCategory=Er du sikker på at du vil fjerne denne regnskapskontoen fra gruppen?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard regnskapskonto for solgte tjenester (br
 Doctype=Dokumenttype
 Docdate=Dato
 Docref=Referanse
-Code_tiers=Tredjepart
 LabelAccount=Kontoetikett
 LabelOperation=Etikettoperasjon
 Sens=som betyr
@@ -158,7 +157,7 @@ NumPiece=Del nummer
 TransactionNumShort=Transaksjonsnummer
 AccountingCategory=Personlige grupper
 GroupByAccountAccounting=Grupper etter regnskapskonto
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+AccountingAccountGroupsDesc=Her kan du definere noen grupper regnskapskonti. De vil bli brukt til personlige regnskapsrapporter.
 ByAccounts=Etter kontoer
 ByPredefinedAccountGroups=Etter forhåndsdefinerte grupper
 ByPersonalizedAccountGroups=Etter personlige grupper
@@ -169,18 +168,17 @@ DelYear=År som skal slettes
 DelJournal=Journal som skal slettes
 ConfirmDeleteMvt=Dette vil slette alle linjene i hovedboken for år og/eller fra en bestemt journal. Minst ett kriterium kreves.
 ConfirmDeleteMvtPartial=Dette vil slette transaksjonen fra hovedboken(alle linjer knyttet til samme transaksjon vil bli slettet)
-DelBookKeeping=Slett post fra hovedboken
 FinanceJournal=Finansjournal
 ExpenseReportsJournal=Journal for utgiftsrapporter
 DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
-DescJournalOnlyBindedVisible=Dette er en oversikt over poster som er bundet til regnskapskonto og kan registreres i hovedboken.
+DescJournalOnlyBindedVisible=Dette er en oversikt over poster som er bundet til en regnskapskonto og kan registreres i hovedboken.
 VATAccountNotDefined=MVA-konto er ikke definert
 ThirdpartyAccountNotDefined=Konto for tredjepart er ikke definert
 ProductAccountNotDefined=Konto for vare er ikke definert
 FeeAccountNotDefined=Konto for honorar ikke definert
 BankAccountNotDefined=Konto for bank er ikke definert
 CustomerInvoicePayment=Betaling av kundefaktura
-ThirdPartyAccount=Tredjepart-konto
+ThirdPartyAccount=Tredjepartskonto
 NewAccountingMvt=Ny transaksjon
 NumMvts=Transaksjonsnummer
 ListeMvts=Liste over bevegelser
@@ -191,7 +189,7 @@ DescThirdPartyReport=Liste over kunder og leverandører og deres regnskapskontoe
 ListAccounts=Liste over regnskapskontoer
 UnknownAccountForThirdparty=Ukjent tredjepartskonto. Vi vil bruke %s
 UnknownAccountForThirdpartyBlocking=Ukjent tredjepartskonto. Blokkeringsfeil
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ukjent tredjepartskonto og ventekonto ikke definert. Blokkeringsfeil
 
 Pcgtype=Kontogruppe
 Pcgsubtype=Konto-undergruppe
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke slette denne regnskapskontoen
 MvtNotCorrectlyBalanced=Bevegelsen er ikke riktig balansert. Kreditt = %s. Debet = %s
 FicheVentilation=Binding-kort
 GeneralLedgerIsWritten=Transaksjoner blir skrevet inn i hovedboken
-GeneralLedgerSomeRecordWasNotRecorded=Noen av transaksjonene kunne ikke sendes. Hvis det ikke er noen annen feilmelding, er dette trolig fordi de allerede var sendt.
+GeneralLedgerSomeRecordWasNotRecorded=Noen av transaksjonene kunne ikke journalføres. Hvis det ikke er noen annen feilmelding, er dette trolig fordi de allerede var journalført.
 NoNewRecordSaved=Ingen flere poster å journalisere
 ListOfProductsWithoutAccountingAccount=Liste over varer som ikke bundet til en regnskapskonto
 ChangeBinding=Endre bindingen
+Accounted=Regnskapsført i hovedbok
+NotYetAccounted=Ikke regnskapsført i hovedboken enda
 
 ## Admin
 ApplyMassCategories=Masseinnlegging av kategorier
@@ -234,13 +234,15 @@ AccountingJournal=Regnskapsjournal
 NewAccountingJournal=Ny regnskapsjourna
 ShowAccoutingJournal=Vis regnskapsjournal
 Nature=Natur
-AccountingJournalType1=Diverse operasjoner
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Salg
 AccountingJournalType3=Innkjøp
 AccountingJournalType4=Bank
 AccountingJournalType5=Utgiftsrapporter
+AccountingJournalType8=Varetelling
 AccountingJournalType9=Har nye
 ErrorAccountingJournalIsAlreadyUse=Denne journalen er allerede i bruk
+AccountingAccountForSalesTaxAreDefinedInto=Merk: Regnskapskonto for MVA er definert i menyen <b>%s</b> - <b>%s </b>
 
 ## Export
 ExportDraftJournal=Eksporter utkastjournal
@@ -282,6 +284,8 @@ Formula=Formel
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Noen obligatoriske trinn for oppsett ble ikke gjort, vennligst fullfør disse
 ErrorNoAccountingCategoryForThisCountry=Ingen regnskapskonto-gruppe tilgjengelig for land %s (Se Hjem - Oppsett - Ordbøker)
+ErrorInvoiceContainsLinesNotYetBounded=Du prøver å journalføre noen linjer i fakturaen <strong> %s </strong>, men noen andre linjer er ennå ikke bundet til en regnskapskonto. Journalføring av alle fakturalinjer for denne fakturaen blir avvist.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Noen linjer på fakturaen er ikke bundet til en regnskapskonto.
 ExportNotSupported=Eksportformatet som er satt  opp støttes ikke på denne siden
 BookeppingLineAlreayExists=Linjene eksisterer allerede i bokføringen
 NoJournalDefined=Ingen journal definert
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index af5812b05cd..1e345045a9e 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Feil! Kan ikke bruke opsjonen @ for å nullstille
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Feil: Kan ikke bruke valget @ hvis ikke sekvensen {åå}{mm} eller {åååå}{mm} er i malen.
 UMask=UMaskparameter for nye filer på Unix/Linux/BSD filsystemer.
 UMaskExplanation=Denne instillingen lar deg angi filtillatelser som settes på filer opprettet på Dolibarrseveren (for eksempel ved opplastning).<br>Dette må være en oktal verdi (for eksempel 0666 betyr lese og skrive for alle).<br>Denne innstillingen brukes ikke på Windowsbaserte servere.
-SeeWikiForAllTeam=Ta en titt på wiki siden for fullstendig liste over alle aktører og deres organisering
+SeeWikiForAllTeam=Ta en titt på wikisiden for en fullstendig liste over alle deltakere og deres organisasjon
 UseACacheDelay= Forsinkelse for cache eksport respons i sekunder (0 eller tom for ingen cache)
 DisableLinkToHelpCenter=Skjul linken <b>"Trenger du hjelp eller støtte"</b> på innloggingssiden
 DisableLinkToHelp=Skjul lenke til online hjelp "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Endre på prisene med base referanseverdi definert på
 MassConvert=Start massekonvertering
 String=Streng
 TextLong=Lang tekst
+HtmlText=HTML-tekst
 Int=Integer
 Float=Float
 DateAndTime=Dato og tid
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Avkrysningsbokser fra tabell
 ExtrafieldLink=Lenke til et objekt
 ComputedFormula=Beregnet felt
 ComputedFormulaDesc=Her kan du skrive inn en formel ved hjelp av andre objektegenskaper eller PHP-koding for å få en dynamisk beregningnet verdi. Du kan bruke PHP-kompatible formler, inkludert "?" operator og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $objekt </strong>. <br><br><Strong> ADVARSEL </strong>: Kanskje bare noen egenskaper på $objekt er tilgjengelig. Hvis du trenger egenskaper som ikke er lastet, kan du bare hente objektet i formelen din som i det andre eksempelet. <br> Ved å bruke et beregnet felt betyr det at du ikke selv kan angi noen verdi fra grensesnittet. Også, hvis det er en syntaksfeil, kan det hende formelen ikke returnerer noe. <br> <br> Eksempel på formel: <br> $objekt->id<10? round ($object->id / 2, 2) : ($object-> id + 2 *$user->id) * (int) substr($mysoc->zip, 1, 2) <br> <br> Eksempel på å ny innlasting av objekt <br> (($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch($obj-> id? $ obj-> id: ($obj-> rowid? $obj-> rowid: $object-> id))> 0))? $reloadedobj-> array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br> <br> Annet eksempel på formel for å tvinge lasting av objekt og dets overordnede objekt: <br> (($reloadedobj = Ny oppgave ($db)) && ($reloadedobj->fetch($objekt->id)> 0) && ($secondloadedobj = nytt prosjekt ($db)) && ($secondloadedobj->fetch($reloadedobj-> fk_project )> 0))? $secondloadedobj-> ref: 'Foreldreprosjekt ikke funnet'
+ExtrafieldParamHelpPassword=Hold dette feltet tomt betyr at verdien vil bli lagret uten kryptering (feltet må bare skjules med stjerne på skjermen). <br> Her angir du verdien 'auto' for å bruke standard krypteringsregel for å lagre passordet i databasen (da vil lest verdi kun være hash-innholdet og ingen måte å lese den opprinnelige verdien)
 ExtrafieldParamHelpselect=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1<br>2,verdi2<br>kode3,verdi3<br>...<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>1,verdi1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>: parent_key<br><br>For å få listen avhengig av en annen liste:<br>1,verdi1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
 ExtrafieldParamHelpradio=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell<br>Syntaks: t
 ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter <br> Eksempel: c_typent:libelle:id::filter<br><br> filter kan være en enkel test (f.eks. Aktiv=1 ) for å vise bare aktiv verdi<br>Du kan også bruke $ID$ i filter, som er gjeldende ID for nåværende objekt<br>For å utføre en SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere på ekstrafeltbruk bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i> |parent_column:filter<br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelplink=Parametere må være ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Eksempler: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
 LibraryToBuildPDF=Bibliotek brukt for PDF-generering
-WarningUsingFPDF=Advarsel! <b>conf.php</b> inneholder direktivet <b>dolibarr_pdf_force_fpdf=1</b>. Dette betyr at du bruker FPDF biblioteket for å generere PDF-filer. Dette biblioteket er gammelt og støtter ikke en rekke funksjoner (Unicode, bilde-transparens, kyrillisk, arabiske og asiatiske språk, ...), så du kan oppleve feil under PDF generering. <br> For å løse dette, og ha full støtte ved PDF generering, kan du laste ned <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, deretter kommentere eller fjerne linjen <b>$dolibarr_pdf_force_fpdf=1</b>, og i stedet legge inn <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=For noen land gjelder to eller tre skatter på hver fakturalinje. Dersom dette er tilfelle, velg type for andre og tredje skatt, samt sats. Mulig type: <br> 1: lokalavgift gjelder på varer og tjenester uten mva (lokal avgift er beregnet beløp uten mva) <br> 2: lokalavgift gjelder på varer og tjenester, inkludert merverdiavgift (lokalavgift beregnes på beløpet + hovedavgift) <br> 3: lokalavgift gjelder på varer uten mva (lokalavgift er beregnet beløp uten mva) <br> 4: lokalagift gjelder på varer inkludert mva (lokalavgift beregnes på beløpet + hovedavgift) <br> 5: lokal skatt gjelder tjenester uten mva (lokalavgift er beregnet beløp uten mva) <br> 6: lokalavgift gjelder på tjenester inkludert mva (lokalavgift beregnes på beløpet + mva)
 SMS=SMS
 LinkToTestClickToDial=Angi et telefonnummer å ringe for å vise en link for å teste ClickToDial url for <strong>bruker%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Returner en tom regnskapskode.
 ModuleCompanyCodeDigitaria=Regnskapskode avhenger av tredjepartskode. Koden består av tegnet "C" i den første stillingen etterfulgt av de første 5 tegnene til tredjepartskoden.
 Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett trinn/bruker for å opprette og ett trinn/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett trinn/ bruker vil være nok). Du kan bruke dette alternativet for å innføre et tredje trinn/bruker godkjenning, hvis beløpet er høyere enn en spesifisert verdi (så vil 3 trinn være nødvendig: 1=validering, 2=første godkjenning og 3=andre godkjenning dersom beløpet er høyt nok). <br> Sett denne tom en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en andre godkjenning (3 trinn).
 UseDoubleApproval=Bruk 3-trinns godkjennelse når beløpet (eks. MVA) er høyere enn...
-WarningPHPMail=ADVARSEL: Noen e-postleverandører (som Yahoo) tillater deg ikke å sende en e-post fra en annen server enn Yahoo-serveren hvis e-postadressen benyttes som avsender er din Yahoo e-post (som myemail@yahoo.com, myemail@yahoo.fr, ...). Ditt nåværende oppsett bruker serveren til programmet til å sende e-post, så noen mottakere (det ene er kompatible med den restriktive DMARC protokollen), vil be Yahoo om de kan ta imot e-post og Yahoo vil svare "nei" fordi serveren er ikke en server eid av Yahoo, så flere av dine sendte e-poster kan ikke aksepteres. <br> Hvis e-postleverandøren (som Yahoo) har denne begrensningen, må du endre e-post-oppsett for å velge den andre metoden "SMTP server" og skriv inn SMTP-server og legitimasjon som tilbys av e-postleverandøren (be e-postleverandøren om å få SMTP-legitimasjon for kontoen din).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=Hvis din e-post-SMTP-leverandør må begrense e-postklienten til noen IP-adresser (svært sjelden), er dette IP-adressen til ERP CRM-programmet: <strong> %s </strong>.
 ClickToShowDescription=Klikk for å vise beskrivelse
 DependsOn=Denne modulen trenger modulen(ene)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Vannmerke på utgiftsrapport-maler
 AttachMainDocByDefault=Sett dette til 1 hvis du vil legge ved hoveddokumentet til e-post som standard (hvis aktuelt)
 FilesAttachedToEmail=Legg ved fil
 SendEmailsReminders=Send agendapåminnelser via e-post
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Brukere & grupper
 Module0Desc=Håndtering av Brukere/Ansatte og Grupper
@@ -619,6 +622,8 @@ Module59000Name=Marginer
 Module59000Desc=Modul for å administrere marginer
 Module60000Name=Provisjoner
 Module60000Desc=Modul for å administrere provisjoner
+Module62000Name=Incoterm
+Module62000Desc=Legg til egenskaper for å administrere Incoterm
 Module63000Name=Ressurser
 Module63000Desc=Håndter ressurser (skrivere, biler, rom,..). Etterpå kan du legge dem til hendelser
 Permission11=Vis kundefakturaer
@@ -833,11 +838,11 @@ Permission1251=Kjør masseimport av eksterne data til database (datalast)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1322=Gjenåpne en betalt regning
 Permission1421=Eksport kundeordre og attributter
-Permission20001=Les ferieforespørsler (dine og underordnedes)
-Permission20002=Opprett/endre ferieforespørsler
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Slett ferieforespørsler
-Permission20004=Les alle ferieforspørsler (brukere, ikke undereordnede)
-Permission20005=Opprett/endre ferieforespørsler for alle
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Administrer ferieforespørsler (oppsett og oppdatering av balanse)
 Permission23001=Les planlagt oppgave
 Permission23002=Opprett/endre planlagt oppgave
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps - ikke i Norge
 DictionaryPaymentConditions=Betalingsbetingelser
 DictionaryPaymentModes=Betalingsmåter
 DictionaryTypeContact=Kontakt/adressetyper
+DictionaryTypeOfContainer=Type nettsider/containere
 DictionaryEcotaxe=Miljøgebyr (WEEE)
 DictionaryPaperFormat=Papirformater
 DictionaryFormatCards=Kortformater
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type inntektsstempel
 VATManagement=MVA-håndtering
 VATIsUsedDesc=Som standard når du oppretter muligheter, fakturaer, bestillinger osv, følger MVA-satsen aktivt standard regel:<br> Dersom selgeren ikke utsettes for MVA, settes MVA til 0. Slutt på regelen <br> Hvis (selgerland = kjøperland), settes merverdiavgift som standard lik MVA for produktet i selgerandet. Slutt på regelen. <br> Hvis både selger og kjøper er i EU og varene er transportprodukter (bil, båt, fly), er standard MVA 0 (MVA skal betales til tollen i sitt land og ikke til selger). Slutt på regelen. <br> Hvis både selgeren og kjøperen er i EU og kjøper er ikke et selskap, settes MVA til MVA på produktet som selges. Slutt på regelen. <br> Hvis både selgeren og kjøperen er i EU og kjøper er et selskap, settes MVA til 0 som standard. Slutt på regelen. <br> I alle andre tilfeller er standard MVA=0. Slutt på regelen.
 VATIsNotUsedDesc=Som standard er den foreslåtte MVA 0 som kan brukes for tilfeller som foreninger, enkeltpersoner og små selskaper.
-VATIsUsedExampleFR=I Frankrike, betyr det bedrifter eller organisasjoner som har en reell finanssystem (Forenklet ekte eller normal real). Et system der MVA er deklarert.
-VATIsNotUsedExampleFR=I Frankrike, betyr det foreninger som ikke MVA erklært eller selskaper, organisasjoner eller liberale yrker som har valgt micro enterprise fiskale systemet (MVA i franchise) og betalte en franchise MVA uten MVA erklæring. Dette valget vil vise referansen "Non gjeldende MVA - kunst-293B av CGI" på fakturaene.
+VATIsUsedExampleFR=I Frankrike betyr det at bedrifter eller organisasjoner har et reelt finanssystem (forenklet reell eller normal reell). Et system hvor mva er deklarert.
+VATIsNotUsedExampleFR=I Frankrike betyr det foreninger som ikke er mva-registrert, eller selskaper, organisasjoner eller liberale yrker som har valgt micro-entreprise skattesystemet (mva i franchise) og betalt en franchise-mva uten mva-angivelse. Dette valget vil vise referansen "Ikke aktuell for MVA - art-293B av CGI" på fakturaer.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Ikke bruk andre skatter
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er bare tilgjengelig for administratorer. Ingen av tillatelsene i Dolibarr kan senke denne grensen.
 CompanyFundationDesc=Her kan du legge inn informasjon om firmaet eller organisasjonen din (klikk på "Endre"- eller "Lagre"-knappen i bunnen av siden)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Her kan du velge innstillinger som styrer Dolibarrs utseende og virkemåte
 AvailableModules=Tilgjengelige apper/moduler
 ToActivateModule=Gå til innstillinger for å aktivere moduler.
@@ -1441,6 +1448,9 @@ SyslogFilename=Filnavn og bane
 YouCanUseDOL_DATA_ROOT=Du kan bruke DOL_DATA_ROOT / dolibarr.log som loggfil i Dolibarr "dokumenter"-mappen. Du kan angi en annen bane for å lagre denne filen.
 ErrorUnknownSyslogConstant=Konstant %s er ikke en kjent syslog-konstant
 OnlyWindowsLOG_USER=Windows støtter bare LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Oppsett av Donasjonsmodulen
 DonationsReceiptModel=Mal for donasjonskvittering
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Klarte ikke å initialisere menyen
 ##### Tax #####
 TaxSetup=Modul for skatter,avgifter og utbytte
 OptionVatMode=MVA skal beregnes
-OptionVATDefault=Kontant-base
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Periodisering
 OptionVatDefaultDesc=Mva skal beregnes:<br>- ved levering av varer<br>- ved levering av tjenester
 OptionVatDebitOptionDesc=MVA skal beregnes: :<br>- ved levering av varer<br>- ved fakturering av tjenester
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Tidspunkt for MVA-innbetaling som standard i henhold til valgt alternativ:
 OnDelivery=Ved levering
 OnPayment=Vedbetaling
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Fakturadatoen brukes
 Buy=Kjøp
 Sell=Selg
 InvoiceDateUsed=Fakturadatoen brukes
-YourCompanyDoesNotUseVAT=Ditt firma er definert for å ikke bruke MVA (Hjem - Oppsett - Firma / Organisasjon), så det er ingen MVA-alternativer å sette opp.
+YourCompanyDoesNotUseVAT=Ditt firma er definert til ikke å bruke MVA (Hjem - Oppsett - Firma/Organisasjon), så det er ingen MVA-alternativer å sette opp.
 AccountancyCode=Regnskapskode
 AccountancyCodeSell=Kontokode for salg
 AccountancyCodeBuy=Kontokode for innkjøp
@@ -1718,6 +1730,7 @@ MailToSendContract=For å sende en kontrakt
 MailToThirdparty=For å sende epost fra tredjepart-side
 MailToMember=For å sende e-post fra medlemsside
 MailToUser=For å sende e-post fra brukerside
+MailToProject= To send email from project page
 ByDefaultInList=Vis som standard for liste
 YouUseLastStableVersion=Du bruker siste stabile versjon
 TitleExampleForMajorRelease=Eksempel på melding du kan bruke for å annonsere større oppdateringer (du kan bruke denne på dine websider)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Venstremarg på PDF
 MAIN_PDF_MARGIN_RIGHT=Høyremarg på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarg på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
+EnterCalculationRuleIfPreviousFieldIsYes=Oppgi beregningsregel hvis tidligere felt ble satt til Ja (for eksempel 'CODEGRP1 + CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Oppsett av Ressursmodulen
 UseSearchToSelectResource=Bruk et søkeskjema for å velge en ressurs (i stedet for en nedtrekksliste).
-DisabledResourceLinkUser=Deaktivert ressurslink til bruker
-DisabledResourceLinkContact=Deaktivert ressurslink til kontakt
+DisabledResourceLinkUser=Deaktiver funksjonen for å koble en ressurs til brukere
+DisabledResourceLinkContact=Deaktiver funksjonen for å koble en ressurs til kontakter
 ConfirmUnactivation=Bekreft nullstilling av modul
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index c5773cb4a7c..d9e8f54827c 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Medlem %s validert
 MemberModifiedInDolibarr=Medlem %s endret
 MemberResiliatedInDolibarr=Medlem %s terminert
 MemberDeletedInDolibarr=Medlem %s slettet
-MemberSubscriptionAddedInDolibarr=Abonnement for medlem %s lagt til
+MemberSubscriptionAddedInDolibarr=Abonnement %s for medlem %s lagt til
+MemberSubscriptionModifiedInDolibarr=Abonnement %s for medlem %s endret
+MemberSubscriptionDeletedInDolibarr=Abonnement %s for medlem %s slettet
 ShipmentValidatedInDolibarr=Leveranse %s validert
 ShipmentClassifyClosedInDolibarr=Forsendelse %s klassifisert fakturert
 ShipmentUnClassifyCloseddInDolibarr=Forsendelse %s klassifisert gjenåpnet
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Du kan også bruke følgende parametere til å filtrere listen
 AgendaUrlOptions3=<b>logina=%s</b> for å begrense resultat til hendelser eiet av en bruker <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=%s</b> for å begrense utdata til handlinger som ikke eies av brukeren <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> for å begrense utdata til handlinger som er tildelt brukeren <b> %s </b>(eier og andre).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> for å begrense resultat til handlinger som er knyttet til prosjektet <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__ PROJECT_ID__</b> for å begrense resultat til handlinger knyttet til prosjektet <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b> notactiontype=systemauto </b> for å ekskludere automatisk hendelse.
 AgendaShowBirthdayEvents=Vis kontakters fødselsdager
 AgendaHideBirthdayEvents=Skjul kontakters fødselsdager
 Busy=Opptatt
@@ -109,7 +112,7 @@ ExportCal=Eksporter kalender
 ExtSites=Importer eksterne kalendere
 ExtSitesEnableThisTool=Vis eksterne kalendere (definert i global setup) i agenda. Påvirker ikke eksterne kalendere definert av brukere.
 ExtSitesNbOfAgenda=Antall kalendere
-AgendaExtNb=Kalender nummer %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL til. ical-fil
 ExtSiteNoLabel=Ingen beskrivelse
 VisibleTimeRange=Synlig tidsområde
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index c57518f8e1c..f61067500e8 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -7,6 +7,7 @@ BankName=Banknavn
 FinancialAccount=Konto
 BankAccount=Bankkonto
 BankAccounts=Bankkonti
+BankAccountsAndGateways=Bankkontoer | Gateways
 ShowAccount=Vis konto
 AccountRef=Kontonummer hovedbokskonto
 AccountLabel=Kontonavn hovedbokskonto
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index f95b96f522e..db3cddef6f5 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Tilbakebetalt
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
 ConfirmConvertToReduc=Ønsker du å konvertere denne %s til en absolutt rabatt? <br> Beløpet vil bli lagret og kan brukes som en rabatt på en nåværende eller fremtidig faktura for denne kunden.
+ConfirmConvertToReducSupplier=Ønsker du å konvertere dette %s til en absolutt rabatt? <br> Beløpet vil bli lagret blant alle rabatter og kan brukes som en rabatt for en nåværende eller fremtidig faktura for denne leverandøren.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Mottatte betalinger
 ReceivedCustomersPayments=Betalinger mottatt fra kunder
@@ -91,7 +92,7 @@ PaymentAmount=Beløp til betaling
 ValidatePayment=Godkjenn betaling
 PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp
 HelpPaymentHigherThanReminderToPay=NB! Innbetalingen av en eller flere fakturaer er høyere enn restbeløpet. <br> Endre oppføringen eller bekreft for å lage kreditnota av det overskytende for overbetalte fakturaer.
-HelpPaymentHigherThanReminderToPaySupplier=NB! Innbetalingsbeløpet fra en eller flere fakturaer er høyere enn restbeløpet. <br> Korriger innbetaling, eller aksepter den
+HelpPaymentHigherThanReminderToPaySupplier=Vær oppmerksom på at betalingsbeløpet på en eller flere regninger er høyere enn gjenstående å betale. <br> Rediger oppføringen din, ellers bekreft og opprett en kredittnota av overskuddet betalt for hver overbetalt faktura.
 ClassifyPaid=Merk 'Betalt'
 ClassifyPaidPartially=Merk 'Delbetalt'
 ClassifyCanceled=Merk 'Tapsført'
@@ -110,6 +111,7 @@ DoPayment=Legg inn betaling
 DoPaymentBack=Legg inn tilbakebetaling
 ConvertToReduc=Konverter til framtidig rabatt
 ConvertExcessReceivedToReduc=Konverterer for mye innbetalt til fremtidig rabatt
+ConvertExcessPaidToReduc=Konverter overbetaling til fremtidig rabatt
 EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde
 EnterPaymentDueToCustomer=Lag purring til kunde
 DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status for genererte fakturaer
 BillStatusDraft=Kladd (må valideres)
 BillStatusPaid=Betalt
 BillStatusPaidBackOrConverted=Kreditnota refusjon eller konvertert til rabatt
-BillStatusConverted=Betalt (klar for siste faktura)
+BillStatusConverted=Betalt (klar til forbruk i endelig faktura)
 BillStatusCanceled=Tapsført
 BillStatusValidated=Validert (må betales)
 BillStatusStarted=Startet
@@ -220,6 +222,7 @@ RemainderToPayBack=Restbeløp å refundere
 Rest=Venter
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
+ExcessPaid=For mye betalt
 EscompteOffered=Rabatt innrømmet (betalt før forfall)
 EscompteOfferedShort=Rabatt
 SendBillRef=Innsendelse av faktura %s
@@ -283,16 +286,20 @@ Deposit=Nedbetaling
 Deposits=Nedbetalinger
 DiscountFromCreditNote=Rabatt fra kreditnota %s
 DiscountFromDeposit=Nedbetalinger fra faktura %s
-DiscountFromExcessReceived=Overbetaling mottatt for faktura %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Denne typen kreditt kan brukes på faktura før den godkjennes
 CreditNoteDepositUse=Fakturaen m valideres for å kunne bruke denne typen kredit
 NewGlobalDiscount=Ny absolutt rabatt
 NewRelativeDiscount=Ny relativ rabatt
+DiscountType=Rabatttype
 NoteReason=Notat/Årsak
 ReasonDiscount=Årsak
 DiscountOfferedBy=Innrømmet av
 DiscountStillRemaining=Rabatter tilgjengelig
 DiscountAlreadyCounted=Rabatter allerede gitt
+CustomerDiscounts=Kunderabatter
+SupplierDiscounts=Leverandørrabatter
 BillAddress=Fakturaadresse
 HelpEscompte=Denne rabatten er gitt fordi kunden betalte før forfall.
 HelpAbandonBadCustomer=Dette beløpet er tapsført (dårlig kunde) og betraktes som tap.
@@ -341,10 +348,10 @@ NextDateToExecution=Dato for neste fakturagenerering
 NextDateToExecutionShort=Dato neste generering
 DateLastGeneration=Dato for siste generering
 DateLastGenerationShort=Dato siste generering
-MaxPeriodNumber=Maks ant for fakturagenerering
-NbOfGenerationDone=Ant. fakturaer som allerede er generert
-NbOfGenerationDoneShort=Antall genereringer utført
-MaxGenerationReached=Maksimum antall genereringer nådd
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Valider fakturaer automatisk
 GeneratedFromRecurringInvoice=Generert fra gjentagende-fakturamal %s
 DateIsNotEnough=Dato ikke nådd enda
@@ -521,3 +528,7 @@ BillCreated=%s faktura(er) opprettet
 StatusOfGeneratedDocuments=Status for dokumentgenerering
 DoNotGenerateDoc=Ikke generer dokumentfil
 AutogenerateDoc=Autogenerer dokumentfil
+AutoFillDateFrom=Angi startdato for tjenestelinje med faktura dato
+AutoFillDateFromShort=Angi startdato
+AutoFillDateTo=Angi sluttdato for tjenestelinje med neste faktura dato
+AutoFillDateToShort=Angi sluttdato
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index e95f36643a2..d37336a49fd 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -43,7 +43,8 @@ Individual=Privatperson
 ToCreateContactWithSameName=Vil opprette en kontakt/adresse med samme informasjon som tredjeparten, under tredjeparten, automatisk. I de fleste tilfeller, selv om tredjeparten er en privatperson, vil det være nok å opprette en tredjepart
 ParentCompany=Morselskap
 Subsidiaries=Datterselskaper
-ReportByCustomers=Rapporter pr kunde
+ReportByMonth=Report by month
+ReportByCustomers=Rapporter etter kunde
 ReportByQuarter=Rapporter pr sats
 CivilityCode=Civility code (ikke i Norge)
 RegisteredOffice=Registered office (ikke i Norge)
@@ -75,10 +76,12 @@ Town=Poststed
 Web=Web
 Poste= Posisjon
 DefaultLang=Standardspråk
-VATIsUsed=MVA skal beregnes
-VATIsNotUsed=MVA skal ikke beregnes
+VATIsUsed=Salgsavgift er brukt
+VATIsUsedWhenSelling=Dette definerer om denne tredjepart inkluderer en salgsavgift eller ikke, når den fakturerer sine egne kunder
+VATIsNotUsed=Salgsavgift er ikke brukt
 CopyAddressFromSoc=Fyll inn adressen med tredjepartsadressen
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjeparts verken kunde eller leverandør, ingen tilgjengelige henvisende objekter
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Bankkonto betaling
 OverAllProposals=Tilbud
 OverAllOrders=Ordre
@@ -239,7 +242,7 @@ ProfId3TN=Prof ID 3 (Douane code)
 ProfId4TN=Prof ID 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof ID
+ProfId1US=Prof-Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Organisasjonsnummer
-VATIntraShort=Organisasjonsnummer
+VATIntra=Salgsavgift-ID
+VATIntraShort=Avgifts-ID
 VATIntraSyntaxIsValid=Gyldig syntaks
+VATReturn=VAT return
 ProspectCustomer=Prospekt/Kunde
 Prospect=Prospekt
 CustomerCard=Kundekort
 Customer=Kunde
 CustomerRelativeDiscount=Relativ kunderabatt
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relativ rabatt
 CustomerAbsoluteDiscountShort=Absolutt rabatt
 CompanyHasRelativeDiscount=Denne kunden har en rabatt på <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Denne kunden har ingen relative rabatter angitt
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=Du har ingen standard relativ rabatt fra denne leverandøren
 CompanyHasAbsoluteDiscount=Denne kunden har tilgjengelige prisavslag (kreditnotaer eller tidligere innbetalinger) for <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Denne kunden har rabatt tilgjengelig (tilbud, nedbetalinger) for <b>%s</b>%s
 CompanyHasCreditNote=Denne kunden har fortsatt kreditnotaer for <b>%s %s</b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Denne kunden har ingen rabatt tilgjengelig
-CustomerAbsoluteDiscountAllUsers=Absolutte rabatter (innrømmet av alle brukere)
-CustomerAbsoluteDiscountMy=Absolutte rabatter (innrømmet av deg selv)
+CustomerAbsoluteDiscountAllUsers=Absolutte kunderabatter (gitt av alle brukere)
+CustomerAbsoluteDiscountMy=Absolutte kunderabatter (gitt av deg selv)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Ingen
 Supplier=Leverandør
 AddContact=Opprett kontakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Ingen tilgang til Dolibarr
 ExportDataset_company_1=Tredjeparter (Firmaer, organisasjoner, personer) og egenskaper
 ExportDataset_company_2=Kontaktpersoner og egenskaper
 ImportDataset_company_1=Tredjeparter (Firmaer, organisasjoner, personer) og egenskaper
-ImportDataset_company_2=Kontakter/adresser (av tredjeparter eller ikke) og attributter
-ImportDataset_company_3=Bankopplysninger
-ImportDataset_company_4=Tredjeparter/Salgsrepresentanter (Påvirker firmaers salgsrepresentanter)
+ImportDataset_company_2=Kontakter/adresser (til tredjeparter eller ikke) og attributter
+ImportDataset_company_3=Tredjeparters bankkontoer 
+ImportDataset_company_4=Tredjeparter/Salgsrepresentanter (Tilordne salgsrepresentanters brukere til bedrifter)
 PriceLevel=Prisnivå
 DeliveryAddress=Leveringsadresse
 AddAddress=Legg til adresse
@@ -406,15 +419,16 @@ ProductsIntoElements=Liste over varer/tjenester i %s
 CurrentOutstandingBill=Gjeldende utestående regning
 OutstandingBill=Max. utestående beløp
 OutstandingBillReached=Maksimun utestående beløp nådd
+OrderMinAmount=Minimumsbeløp for bestilling
 MonkeyNumRefModelDesc=Returnerer nummer med format %syymm-nnnn for kundekode og %syymm-nnnn for leverandørkode, der åå er året, er mm måned og nnnn er et løpenummer som starter på 0+1.
 LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
 MergeOriginThirdparty=Dupliser tredjepart (tredjepart du vil slette)
 MergeThirdparties=Flett tredjeparter
 ConfirmMergeThirdparties=Er du sikker på at du vil slå sammen denne tredjeparten med den nåværende? Alle koblede objekter (fakturaer, ordre, ...) blir flyttet til nåværende tredjepart, og tredjeparten blir slettet.
-ThirdpartiesMergeSuccess=Tredjepartene er blitt flettet
+ThirdpartiesMergeSuccess=Tredjeparter har blitt flettet
 SaleRepresentativeLogin=Innlogging for salgsrepresentant
 SaleRepresentativeFirstname=Selgers fornavn
 SaleRepresentativeLastname=Selgers etternavn
-ErrorThirdpartiesMerge=Det oppsto en feil ved sletting av tredjeparter. Vennligst sjekk loggen. Endringer er tilbakeført til opprinnelig stand.
+ErrorThirdpartiesMerge=Det oppsto en feil ved sletting av tredjepart. Vennligst sjekk loggen. Endringer er blitt tilbakestilt.
 NewCustomerSupplierCodeProposed=Ny kunde eller leverandørkode foreslått med duplisert kode
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 5a062dfee7b..0608409a03b 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -31,7 +31,7 @@ Credit=Kreditt
 Piece=Regnskapsdokument
 AmountHTVATRealReceived=Netto samlet
 AmountHTVATRealPaid=Netto betalt
-VATToPay=MVA selger
+VATToPay=Tax sales
 VATReceived=Skatt mottatt
 VATToCollect=Skattkjøp
 VATSummary=Skattebalanse
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Betalinger
 VATPayment=MVA.betaling
 VATPayments=MVA.betalinger
 VATRefund=Mva-betaling
+NewVATPayment=New sales tax payment
 Refund=Refusjon
 SocialContributionsPayments=Skatter- og avgiftsbetalinger
 ShowVatPayment=Vis MVA betaling
@@ -157,30 +158,34 @@ RulesResultDue=- Inkluderer utestående fakturaer, utgifter, MVA og donasjoner,
 RulesResultInOut=- Inkluderer betalinger gjort mot fakturaer, utgifter, MVA og lønn. <br> Basert på betalingsdato. Donasjonsdato for donasjoner
 RulesCADue=- Inkluderer kundens forfalte fakturaer, enten de er betalt eller ikke.<br> Basert på valideringsdatoen til disse fakturaene.<br>
 RulesCAIn=- Inkluderer alle betalinger av fakturaer mottatt fra klienter. <br> - Er basert på betalingsdatoen for disse fakturaene <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=Inkluderer poster i hovedboken med regnskapskontoer som har gruppen "UTGIFTER" eller "INNTEKT"
 RulesResultBookkeepingPredefined=Inkluderer poster i hovedboken med regnskapskontoer som har gruppen "UTGIFTER" eller "INNTEKT"
 RulesResultBookkeepingPersonalized=Viser poster i hovedboken med regnskapskontoer <b> gruppert etter tilpassede grupper </b>
 SeePageForSetup=Se meny <a href="%s">%s</a> for oppsett
 DepositsAreNotIncluded=- Nedbetalingsfakturaer er ikke inkludert
 DepositsAreIncluded=- Nedbetalingsfakturaer er inkludert
-LT2ReportByCustomersInInputOutputModeES=Rapport over tredjepart IRPF
-LT1ReportByCustomersInInputOutputModeES=Rapport etter tredjepart RE
-VATReport=MVA rapport
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Rapport etter tredjepart RE
+LT2ReportByCustomersES=Rapport over tredjepart IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Rapport over innhentet og betalt MVA etter kunde
-VATReportByCustomersInDueDebtMode=Rapport over innhentet og betalt MVA etter kunde
-VATReportByQuartersInInputOutputMode=Rapport over innhentet og betalt MVA etter sats
-LT1ReportByQuartersInInputOutputMode=Rapport etter RE sats
-LT2ReportByQuartersInInputOutputMode=Rapport etter IRPF sats
-VATReportByQuartersInDueDebtMode=Rapport over innhentet og betalt MVA etter sats
-LT1ReportByQuartersInDueDebtMode=Rapport etter RE sats
-LT2ReportByQuartersInDueDebtMode=Rapport etter IRPF sats
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Rapport etter RE sats
+LT2ReportByQuartersES=Rapport etter IRPF sats
 SeeVATReportInInputOutputMode=Se rapport <b>%sInkl MVA%s</b> for en standard utregning
 SeeVATReportInDueDebtMode=Se rapport <b>%sMVA%s</b> for en beregning med en opsjon på flyten
 RulesVATInServices=- For tjenester, omfatter rapporten MVA regnskap på grunnlag av betalingstidspunktet.
-RulesVATInProducts=- For materielle eiendeler, inkluderer MVA fakturaer på grunnlag av faktura dato.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For tjenester, omfatter forfalte MVA fakturaer , betalt eller ikke, basert på fakturadato.
-RulesVATDueProducts=- For materielle eiendeler, inkluderer MVA fakturaer på grunnlag av faktura dato.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Merk: For materielle verdier, bør man bruke leveringsdato å være mer rettferdig.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/Faktura
 NotUsedForGoods=Ikke brukt på varer
 ProposalStats=Tilbudsstatistikk
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=Velg utregningsmetode som gir leverandør forventet
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omsetningsrapport pr. produkt, er ikke relevant når du bruker en <b>kontantregnskap</b>-modus. Denne rapporten er bare tilgjengelig når du bruker <b>engasjement regnskap</b> modus (se oppsett av regnskap modul).
 CalculationMode=Kalkuleringsmodus
 AccountancyJournal=Regnskapskode journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Standard regnskapskonto for å utgående MVA - MVA på salg (brukes hvis ikke definert i oppsett av MVA-ordboken)
-ACCOUNTING_VAT_BUY_ACCOUNT=Standard regnskapskonto for å inngående MVA - MVA på kjøp (brukes hvis ikke definert i oppsett av MVA-ordboken)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Standard regnskapskonto for MVA.betaling
 ACCOUNTING_ACCOUNT_CUSTOMER=Regnskapskonto brukt til kunde-tredjepart
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Den dedikerte regnskapskontoen som er definert på tredjepartskort, vil kun bli brukt til subledger. Denne vil bli brukt til hovedboken og som standardverdi av Subledger-regnskap hvis dedikert kundekonto på tredjepart ikke er definert.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Feil: Bankkonto ikke funnet
 FiscalPeriod=Regnskapsperiode
 ListSocialContributionAssociatedProject=Liste over sosiale bidrag knyttet til prosjektet
 DeleteFromCat=Fjern fra regnskapsgruppe
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 75c60937ecb..22d6c9ff273 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Ingen registrerte jobber
 CronPriority=Prioritet
 CronLabel=Etikett
 CronNbRun=Antall starter
-CronMaxRun=Maks. ant. startes
+CronMaxRun=Max number launch
 CronEach=Alle
 JobFinished=Jobb startet og fullført
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Fra
 CronType=Jobbtype
 CronType_method=Anropsmetode for en PHP-klasse
 CronType_command=Shell kommando
-CronCannotLoadClass=Kan ikke laste klasse %s eller objekt %s
+CronCannotLoadClass=Kan ikke laste klassefil %s (for å bruke klasse %s)
+CronCannotLoadObject=Klassefil %s ble lastet, men objektet %s ble ikke funnet i den
 UseMenuModuleToolsToAddCronJobs=Gå til menyen "Hjem - Administrative verktøy - Planlagte jobber" for å se og endre planlagte jobber
 JobDisabled=Jobb deaktivert
 MakeLocalDatabaseDumpShort=Backup av lokal database
-MakeLocalDatabaseDump=Opprett en lokal database dump. Parametrene er: komprimering ('gz' eller 'bz' eller 'ingen'), backup type ('mysql' eller 'pgsql'), 1, 'auto' eller filnavn for å bygge, nb backupfiler for å beholde
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=NB, for ytelsesformål, uansett neste utførelsesdato for aktiverte jobber, kan jobbene dine forsinkes til maksimalt %s timer før de kjøres.
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index b12795e3aea..bed4f0d3623 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP oppsett er ikke komplett.
 ErrorLDAPMakeManualTest=En .ldif fil er opprettet i mappen %s. Prøv å lese den manuelt for å se mer informasjon om feil.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke lagre en handling med "status ikke startet" hvis feltet "gjort av" også er utfylt.
 ErrorRefAlreadyExists=Ref bruket til oppretting finnes allerede.
-ErrorPleaseTypeBankTransactionReportName=Skriv inn navn på kontoutskrift der oppføring er rapportert (Format YYYYMM eller YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Vennligst skriv inn kontoutskriftsnavnet der oppføringen skal rapporteres (Format YYYYMM eller YYYYMMDD)
 ErrorRecordHasChildren=Kunne ikke slette posten da den har koblinger.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har minst under-objekt av typen %s
 ErrorRecordIsUsedCantDelete=Kan ikke slette posten. Den er allerede brukt eller inkludert i et annet objekt
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Klarte ikke å legge post %s til Mailman-liste %s
 ErrorFailedToRemoveToMailmanList=Klarte ikke å fjerne post %s fra Mailman-liste %s eller SPIP-base
 ErrorNewValueCantMatchOldValue=Ny verdi kan ikke være lik den gamle
 ErrorFailedToValidatePasswordReset=Klarte ikke å initialisere passordet på nytt. Initialiseringen kan allerede ha blitt utført (denne lenken kan bare brukes en gang). Hvis ikke, prøv å starte prosessen på nytt
-ErrorToConnectToMysqlCheckInstance=Kobling til databasen mislykkes. Sjekk at Mysql-serveren kjører (i de fleste tilfeller kan du starte den fra kommandolinjen med 'sudo /etc/init.d/mysql start').
+ErrorToConnectToMysqlCheckInstance=Tilkobling til databasen feiler. Sjekk at databaseserveren kjører (for eksempel med mysql/mariadb, kan du starte den fra kommandolinjen med 'sudo service mysql start').
 ErrorFailedToAddContact=Klarte ikke å legge til kontakt
 ErrorDateMustBeBeforeToday=Datoen kan ikke settes til etter i dag
 ErrorPaymentModeDefinedToWithoutSetup=En betalingsmodus var satt til å skrive %s, men oppsett av modulen Faktura er ikke ferdig definert for å vise for denne betalingsmodusen.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=Rabatten du prøver å legge til
 ErrorFileNotFoundWithSharedLink=Filen ble ikke funnet. Kanskje delingsnøkkelen ble endret eller filen ble fjernet nylig.
 ErrorProductBarCodeAlreadyExists=Vare-strekkoden %s finnes allerede i en annen produktreferanse.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Vær også oppmerksom på at bruk av virtuelle varer som har automatisk økning/reduksjon av undervarer, ikke er mulig når minst en undervare (eller undervare av undervarer) trenger et serienummer/lotnummer.
+ErrorDescRequiredForFreeProductLines=Beskrivelse er obligatorisk for linjer med gratis vare
 
 # Warnings
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Noen tider ble registrert av noen brukere men
 WarningYourLoginWasModifiedPleaseLogin=Din innlogging er blitt endret. Av sikkerhetsgrunner må du logge inn på nytt før du kan gjøre noe.
 WarningAnEntryAlreadyExistForTransKey=En oppføring eksisterer allerede for oversettelsesnøkkel for dette språket
 WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antall forskjellige mottakere er begrenset til <b> %s</b> når du bruker bulkhandlinger på lister
+WarningDateOfLineMustBeInExpenseReportRange=Advarsel, datoen for linjen ligger utenfor tiden til utgiftsrapporten
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index bc667cdc7bc..eeaffcd9004 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -16,7 +16,12 @@ CancelCP=Kansellert
 RefuseCP=Nektet
 ValidatorCP=Godkjenner
 ListeCP=Liste over ferier
+LeaveId=Ferie-ID
 ReviewedByCP=Vil bli godkjent av
+UserForApprovalID=ID til godkjenningsbruker
+UserForApprovalFirstname=Fornavn godkjenningsbruker
+UserForApprovalLastname=Etternavn godkjenningsbruker
+UserForApprovalLogin=Innlogging av godkjenningsbruker
 DescCP=Beskrivelse
 SendRequestCP=Opprett feriesøknad
 DelayToRequestCP=Søknader må opprettes minst <b>%s dag(er)</b> før ferien skal starte
@@ -30,7 +35,14 @@ ErrorUserViewCP=Du er ikke autorisert for å lese denne feriesøknaden
 InfosWorkflowCP=Informasjon om arbeidsflyt
 RequestByCP=Forespurt av
 TitreRequestCP=Feriesøknad
+TypeOfLeaveId=Type ferie - ID
+TypeOfLeaveCode=Type feriekode
+TypeOfLeaveLabel=Ferietype-merke
 NbUseDaysCP=Antall brukte feriedager
+NbUseDaysCPShort=Dager brukt
+NbUseDaysCPShortInMonth=Dager brukt i måneden
+DateStartInMonth=Startdato i måned
+DateEndInMonth=Sluttdato i måned
 EditCP=Rediger
 DeleteCP=Slett
 ActionRefuseCP=Avvis
@@ -59,6 +71,7 @@ DateRefusCP=Avvist dato
 DateCancelCP=Kansellert dato
 DefineEventUserCP=Tildel ekstraordinær ferie for bruker
 addEventToUserCP=Tildel ferie
+NotTheAssignedApprover=Du er ikke den tilordnede godkjenneren
 MotifCP=Begrunnelse
 UserCP=Bruker
 ErrorAddEventToUserCP=En feil oppsto ved opprettelse av ekstraordinær ferie
@@ -81,7 +94,12 @@ EmployeeFirstname=Ansattes fornavn
 TypeWasDisabledOrRemoved=Ferietype (id %s) ble deaktivert eller slettet
 LastHolidays=Siste %s ferieforespørsler
 AllHolidays=Alle ferieforespørsler
-
+HalfDay=Halv dag
+NotTheAssignedApprover=Du er ikke den tilordnede godkjenneren
+LEAVE_PAID=Betalt ferie
+LEAVE_SICK=Sykefravær
+LEAVE_OTHER=Annen ferie
+LEAVE_PAID_FR=Betalt ferie
 ## Configuration du Module ##
 LastUpdateCP=Siste automatiske oppdatering av ferietildeling
 MonthOfLastMonthlyUpdate=Måned for siste automatiske oppdatering av ferietildeling
diff --git a/htdocs/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
index 4426c55220f..5f423b8db6f 100644
--- a/htdocs/langs/nb_NO/loan.lang
+++ b/htdocs/langs/nb_NO/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Oppset av lån-modulen
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard regnskapskonto kapital
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard regnskapskonto  rente
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard regnskapskonto forsikring
-CreateCalcSchedule=Opprett/endre låneplan
+FinancialCommitment=Finansiell forpliktelse
+CreateCalcSchedule=Rediger økonomisk forpliktelse
+InterestAmount=Rentebeløp
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 1997f5bebc5..f6b7b341e29 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Resultat av masseutsendelse av epost
 NbSelected=Ant. valgt
 NbIgnored=Ant. ignorert
 NbSent=Ant. sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Er du sikker på at du vil endre status på epost <b>%s</b> til kladd?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt med kundefilter
 MailingModuleDescContactsByCompanyCategory=Kontakter etter tredjeparts-kategori
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Nåværende antall kontakter på mailinglisten
 UseFormatFileEmailToTarget=Importert fil må følge formatet <strong>epost;navn;fornavn:annet</strong>
 UseFormatInputEmailToTarget=Tast inn en streng med format <strong>epost;navn;fornavn;annet</strong>
 MailAdvTargetRecipients=Mottakere (avansert utvalg)
-AdvTgtTitle=Fyll inn i feltene for å forhåndsvelge tredjeparter eller kontakter/adresser til målet
+AdvTgtTitle=Fyll inn felt for å forhåndsvelge tredjeparter eller kontakter/adresser som skal velges
 AdvTgtSearchTextHelp=Bruk %% som blindkarakterer. For eksempel å finne alle element som <b> jean, joe, jim </ b>, kan du skrive<b> j%% </b>. Du kan også bruke ; som separator for verdi, og bruke ! for bortsett fra denne verdien. For eksempel <b> jean, joe, jim %%;! jimo;! jima% </b> vil finne alle jean, joe, de som starter med jim men ikke jimo og ikke det som starter med jima
 AdvTgtSearchIntHelp=Bruk intervall for å velge heltall eller desimaltall
 AdvTgtMinVal=Minimumsverdi
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 972bdc2651e..c9c55064ba6 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s er ikke definert
 ErrorUnknown=Ukjent feil
 ErrorSQL=SQL-feil
 ErrorLogoFileNotFound=Fant ikke logofilen '%s'
-ErrorGoToGlobalSetup=Gå til 'Firma/Organisasjon' for å ordne dette
+ErrorGoToGlobalSetup=Gå til 'Firma/organisasjon' for å fikse dette
 ErrorGoToModuleSetup=Gå til Modul oppsett for å rette dette
 ErrorFailedToSendMail=Klarte ikke å sende epost (avsender=%s, mottager=%s)
 ErrorFileNotUploaded=Filen ble ikke lastet oppp. Sjekk at den ikke er større en maksimumsgrensen, at det er plass igjen på disken og at det ikke ligger en fil med samme navn i katalogen.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Feil: Det er ikke definert noen MVA-satser
 ErrorNoSocialContributionForSellerCountry=Feil! Ingen skatter og avgifter definert for landet '%s'
 ErrorFailedToSaveFile=Feil: Klarte ikke å lagre filen.
 ErrorCannotAddThisParentWarehouse=Du prøver å legge til en forelder-lager som allerede er et barn av nåværende
-MaxNbOfRecordPerPage=Maks. antall poster pr side
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Du er ikke autorisert for å gjøre dette.
 SetDate=Still dato
 SelectDate=Velg en dato
 SeeAlso=Se også %s
 SeeHere=Se her
+ClickHere=Klikk her
+Here=Here
 Apply=Legg til
 BackgroundColorByDefault=Standard bakgrunnsfarge
 FileRenamed=Filen har fått nytt navn
@@ -185,6 +187,7 @@ ToLink=Lenke
 Select=Velg
 Choose=Velg
 Resize=Endre størrelse
+ResizeOrCrop=Endre størrelse eller beskjær
 Recenter=Sentrer
 Author=Forfatter
 User=Bruker
@@ -325,8 +328,10 @@ Default=Standard
 DefaultValue=Standardverdi
 DefaultValues=Standardverdier
 Price=Pris
+PriceCurrency=Pris (valuta)
 UnitPrice=Enhetspris
 UnitPriceHT=Enhetspris (netto)
+UnitPriceHTCurrency=Enhetspris (netto) (valuta)
 UnitPriceTTC=Enhetspris
 PriceU=Pris
 PriceUHT=Pris (netto)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (valuta)
 PriceUTTC=U.P. (inkl. avgift)
 Amount=Beløp
 AmountInvoice=Fakturabeløp
+AmountInvoiced=Beløp fakturert
 AmountPayment=Betalingsbeløp
 AmountHTShort=Beløp (netto)
 AmountTTCShort=Beløp (inkl. MVA)
@@ -353,6 +359,7 @@ AmountLT2ES=Beløp IRPF
 AmountTotal=Totaltbeløp
 AmountAverage=Gjennomsnittsbeløp
 PriceQtyMinHT=Pris for minstekvantum (eksl. MVA)
+PriceQtyMinHTCurrency=Prismengde min. (uten MVA) (valuta)
 Percentage=Prosent
 Total=Totalt
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=MVA-sats
+VATCode=Avgiftsats-kode
+VATNPR=Avgiftsats NPR
 DefaultTaxRate=Standard avgiftssats
 Average=Gjennomsnitt
 Sum=Sum
@@ -420,6 +429,7 @@ ActionDoneShort=Fullført
 ActionUncomplete=Ikke komplett
 LatestLinkedEvents=Siste %s koblede hendelser
 CompanyFoundation=Firma/organisasjon
+Accountant=Regnskapsfører
 ContactsForCompany=Kontakter for denne tredjeparten
 ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresser for tredjepart
@@ -427,6 +437,9 @@ ActionsOnCompany=Handlinger ifm. denne tredjeparten
 ActionsOnMember=Hendelser om dette medlemmet
 ActionsOnProduct=Hendelser om denne varen
 NActionsLate=%s forsinket
+ToDo=To do
+Completed=Fullført
+Running=Pågår
 RequestAlreadyDone=Forespørsel allerede registrert
 Filter=Filter
 FilterOnInto=Søkekriterier '<strong>%s</strong>' i feltene %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Advarsel, du er i vedlikeholds-modus, så bare <b
 CoreErrorTitle=Systemfeil
 CoreErrorMessage=Beklager, en feil oppsto. Kontakt din systemadministrator for å sjekke loggene eller deaktiver $dolibarr_main_prod=1 for mer informasjon
 CreditCard=Kredittkort
+ValidatePayment=Godkjenn betaling
+CreditOrDebitCard=Kreditt- eller debetkort
 FieldsWithAreMandatory=Felt med <b>%s</b> er obligatoriske
 FieldsWithIsForPublic=Felt med <b>%s</b> er vist på den offentlige listen over medlemmene. Hvis du ikke ønsker dette, fjern merket "offentlig".
 AccordingToGeoIPDatabase=(Ifølge GeoIP konvertering)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bekreftelse av massesletting
 ConfirmMassDeletionQuestion=Er du sikker på at du vil slette den %s valgte posten?
 RelatedObjects=Relaterte objekter
 ClassifyBilled=Klassifisert fakturert
+ClassifyUnbilled=Klassifiser ufakturert
 Progress=Fremdrift
-ClickHere=Klikk her
 FrontOffice=Front office
 BackOffice=Back office
 View=Vis
@@ -851,6 +866,8 @@ FileNotShared=Filen er ikke delt eksternt
 Project=Prosjekt
 Projects=Prosjekter
 Rights=Rettigheter
+LineNb=Line no.
+IncotermLabel=Incotermer
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -916,3 +933,11 @@ CommentDeleted=Kommentar slettet
 Everybody=Alle
 PayedBy=Betalt av
 PayedTo=Betalt til
+Monthly=Månedlig
+Quarterly=Kvartalsvis
+Annual=Årlig
+Local=Lokal
+Remote=Ekstern
+LocalAndRemote=Lokal og ekstern
+KeyboardShortcut=Tastatursnarvei
+AssignedTo=Tildelt
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index ffb7e2f075a..1cbd2a130dc 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Sats må ha en numerisk verdi
 markRateShouldBeLesserThan100=Dekningsbidrag skal være lavere enn 100
 ShowMarginInfos=Vis info om marginer
 CheckMargins=Margindetaljer
-MarginPerSaleRepresentativeWarning=Rapporten for margin per bruker benytter koblingen mellom tredjeparter og salgsrepresentanter for å beregne marginen til hver salgsrepresentant. Fordi noen tredjeparter kanskje ikke har noen dedikert salgsrepresentant og noen tredjeparter kan være knyttet til flere, kan noen beløp bli ekskludert i denne rapporten (hvis det ikke er salgsrepresentant), og noen kan vises på forskjellige linjer (for hver salgsrepresentant).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index f08eb71eb6c..088609dae87 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Liste over godkjente offentlige medlemmer
 ErrorThisMemberIsNotPublic=Dette medlemet er ikke offentlig
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Et annet medlem (navn: <b>%s</b>, innlogging: <b>%s</b>) er allerede koblet til en tredje part <b>%s</b>. Fjern denne lenken først fordi en tredjepart ikke kan knyttes til bare ett medlem (og vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av sikkerhetsgrunner må du ha tilgang til å redigere alle brukere for å kunne knytte et medlem til en bruker som ikke er ditt.
-ThisIsContentOfYourCard=Hei.<br><br>Dette er en påminnelse om informasjonen vi får om deg. Ta kontakt hvis noe er feil.<br><br>
-CardContent=Innhold på medlemskortet ditt
 SetLinkToUser=Lenke til en Dolibarr bruker
 SetLinkToThirdParty=Lenke til en Dolibarr tredjepart
 MembersCards=Medlemmers visittkort
@@ -108,17 +106,33 @@ PublicMemberCard=Offentlig medlemskort
 SubscriptionNotRecorded=Abonnement ikke registrert
 AddSubscription=Opprett abonnement
 ShowSubscription=Vis abonnement
-SendAnEMailToMember=Send informasjons-epost til medlem
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Innhold på medlemskortet ditt
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Emnet i e-post som mottas i tilfelle auto-inskripsjon av en gjest
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-post som mottas i tilfelle av auto-inskripsjon av en gjest
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-postemne for medlem autoabonnement
-DescADHERENT_AUTOREGISTER_MAIL=E-post for medlem autoabonnement
-DescADHERENT_MAIL_VALID_SUBJECT=E-post emne for medlemsvalidering
-DescADHERENT_MAIL_VALID=E-post for medlemsvalidering 
-DescADHERENT_MAIL_COTIS_SUBJECT=E-post emne for medlemskontingent
-DescADHERENT_MAIL_COTIS=E-post for abonnement
-DescADHERENT_MAIL_RESIL_SUBJECT=E-post emne for medlemsoppsigelse
-DescADHERENT_MAIL_RESIL=E-post for medlemsoppsigelse
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=E-postadresse for automatisk e-post
 DescADHERENT_ETIQUETTE_TYPE=Side for etikettformat
 DescADHERENT_ETIQUETTE_TEXT=Tekst trykt på medlemsadresse ark
@@ -177,3 +191,8 @@ NoVatOnSubscription=Ingen MVA for abonnementer
 MEMBER_PAYONLINE_SENDEMAIL=E-post til bruk for e-postvarsel når Dolibarr mottar en bekreftelse på en validert betaling for et abonnement (Eksempel: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Vare brukt for abonnementslinje i faktura: %s
 NameOrCompany=Navn eller firma
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=E-post sendt til medlem på %s
+SendReminderForExpiredSubscriptionTitle=Send påminnelse via e-post for utløpt abonnement
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 9a31a0d0b6c..718b3a098e9 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Sti til zip-fil av modul/applikasjonspakke
 PathToModuleDocumentation=Sti til fil med modul/applikasjonsdokumentasjon
 SpaceOrSpecialCharAreNotAllowed=Mellomrom eller spesialtegn er ikke tillatt.
 FileNotYetGenerated=Filen er ikke generert ennå
+RegenerateClassAndSql=Slett og regenerer klasse- og sql-filer
+RegenerateMissingFiles=Generer manglende filer
 SpecificationFile=Fil med forretningsregler
 LanguageFile=Språkfil
 ConfirmDeleteProperty=Er du sikker på at du vil slette egenskapen<strong> %s</strong>? Dette vil endre kode i PHP klassen, og fjerne kolonne fra tabelldefinisjon av objekt.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=Her kan du bruke en nøkkel som er oversettelsesnøkkele
 DropTableIfEmpty=(Slett tabell hvis tom)
 TableDoesNotExists=Tabellen %s finnes ikke
 TableDropped=Tabell %s slettet
+InitStructureFromExistingTable=Bygg struktur-matrisestrengen fra en eksisterende tabell
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 2347ee4ead6..26a03eb3bdc 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Frakoblet. Gå til påloggingssiden ...
 MessageForm=Melding på elektronisk betalingsformular
 MessageOK=Returside for melding om validert betaling
 MessageKO=Returside for melding om avbrutt betaling
+ContentOfDirectoryIsNotEmpty=Denne katalogen er ikke tom.
+DeleteAlsoContentRecursively=Kryss av for å slette alt innhold rekursivt
 
 YearOfInvoice=År av fakturadato
 PreviousYearOfInvoice=Forrige års fakturadato
@@ -78,8 +80,8 @@ LinkedObject=Lenkede objekter
 NbOfActiveNotifications=Antall notifikasjoner (antall e-postmottakere)
 PredefinedMailTest=__(Hei)__\nDette er en testmelding sendt til __EMAIL__.\nDe to linjene er skilt fra hverandre med et linjeskift.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hei)__\nDette er en <b> test </b> e-post (ordtesten må være i fet skrift). De to linjene skilles med et linjeskift.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hei)__\n\nVedlagt faktura __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hallo)__\n\nVi vil minne deg på at fakturaen __REF__ ikke er betalt. \n\n__ONLINE_PAYMENT_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hei)__\n\nHer finner du faktura __REF__\n\nDette er koblingen for å kunne betale online hvis fakturaen ikke allerede er betalt:\n__ONLINE_PAYMENT_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hei)__\n\nVi kan ikke se at faktura __REF__ er betalt. Vedlagt kopi av faktura.\n\nDette er koblingen for å foreta online betaling:\n__ONLINE_PAYMENT_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hei)__\n\nVedlagt tilbud som avtalt __PREF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hei)__\n\nVedlagt tilbud som avtalt __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hei)__\n\nVedlagt ordre __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start opplasting
 CancelUpload=Avbryt opplasting
 FileIsTooBig=Filene er for store
 PleaseBePatient=Vent et øyeblikk eller to...
+NewPassword=Nytt passord
 ResetPassword=Tilbakestill passord
 RequestToResetPasswordReceived=Forespørsel om å endre Dolibarr-passordet ditt er blitt mottatt
 NewKeyIs=Dette er din nye innloggingsnøkkel
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=Side-URL
 WEBSITE_TITLE=Tittel
 WEBSITE_DESCRIPTION=Beskrivelse
 WEBSITE_KEYWORDS=Nøkkelord
+LinesToImport=Lines to import
diff --git a/htdocs/langs/nb_NO/paypal.lang b/htdocs/langs/nb_NO/paypal.lang
index 84bbad54106..96d8ffa765a 100644
--- a/htdocs/langs/nb_NO/paypal.lang
+++ b/htdocs/langs/nb_NO/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Kun PayPal
 ONLINE_PAYMENT_CSS_URL=Valgfri URL til CSS-stilark på online betalingsside
 ThisIsTransactionId=Transaksjons-ID: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Legg til url av Paypal-betaling når du sender et dokument i posten
-PredefinedMailContentLink=Du kan klikke på den sikre linken nedenfor for å betale (PayPal) hvis det ikke allerede er gjort. \n\n\n%s\n\n
+PredefinedMailContentLink=Du kan klikke på linken under for å utføre betalingen din hvis den ikke allerede er gjort.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=Du er for øyeblikket i %s "sandbox" -modus
 NewOnlinePaymentReceived=Ny online betaling mottatt
 NewOnlinePaymentFailed=Ny online betaling forsøkt, men mislyktes
@@ -30,3 +30,6 @@ ErrorCode=Feilkode
 ErrorSeverityCode=Feilkode alvorlighetsgrad
 OnlinePaymentSystem=Nettbasert betalingssystem
 PaypalLiveEnabled=Paypal Live aktivert (ellers test/sandbox modus)
+PaypalImportPayment=Importer Paypal-betalinger
+PostActionAfterPayment=Legg inn handlinger etter utbetalinger
+ARollbackWasPerformedOnPostActions=En tilbakerulling ble utført på alle posthandlinger. Du må fylle ut posthandlinger manuelt hvis de er nødvendige.
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 7b060827c42..5e968cd4032 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Regnskapskode (salgseksport)
 ProductOrService=Vare eller tjeneste
 ProductsAndServices=Varer og tjenester
 ProductsOrServices=Varer eller tjenester
+ProductsPipeServices=Varer | tjenester
 ProductsOnSaleOnly=Varer kun til salgs
 ProductsOnPurchaseOnly=Varer kun for kjøp
 ProductsNotOnSell=Varer som ikke er til salgs og ikke for kjøp
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Er du sikker på at du vil slette denne varelinjen?
 ProductSpecial=Spesial
 QtyMin=Minste kvantum
 PriceQtyMin=Pris for minstekvantum (uten rabatt)
+PriceQtyMinCurrency=Pris for denne min. antall (uten rabatt) (valuta)
 VATRateForSupplierProduct=MVA-sats (for denne leverandøren/varen)
 DiscountQtyMin=Standard kvantumsrabatt
 NoPriceDefinedForThisSupplier=Ingen pris/mengde definert for denne leverandør/varekombinasjonen
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index c32ab359d5d..4283e597398 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Prosjektkontakter
 ProjectsImContactFor=Prosjekter jeg er eksplisitt kontakt til
 AllAllowedProjects=Alt prosjekter jeg kan lese (min + offentlig)
 AllProjects=Alle prosjekter
-MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for.
+MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for
 ProjectsPublicDesc=Denne visningen presenterer alle prosjektene du har lov til å lese.
 TasksOnProjectsPublicDesc=Her vises alle prosjektoppgaver du har lov til å se
 ProjectsPublicTaskDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
 ProjectsDesc=Denne visningen presenterer alle prosjekter (dine brukertillatelser gir deg tillatelse til å vise alt).
 TasksOnProjectsDesc=Her vises alle prosjektoppgaver (dine brukerrettigheter gir deg adgang til å vise alt).
-MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for.
+MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for
 OnlyOpenedProject=Kun åpne prosjekter er synlige (prosjektkladder og lukkede prosjekter er ikke synlige).
 ClosedProjectsAreHidden=Lukkede prosjekter er ikke synlige
 TasksPublicDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Oppgaver i åpne prosjekter
 WorkloadNotDefined=Arbeidsmengde ikke definert
 NewTimeSpent=Tid brukt
 MyTimeSpent=Mitt tidsforbruk
+BillTime=Fakturer brukt tid 
 Tasks=Oppgaver
 Task=Oppgave
 TaskDateStart=Oppgave startdato
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Liste over donasjoner tilknyttet prosjektet
 ListVariousPaymentsAssociatedProject=Liste over diverse betalinger knyttet til prosjektet
 ListActionsAssociatedProject=Liste over hendelser knyttet til prosjektet
 ListTaskTimeUserProject=Liste over tidsbruk på oppgaver i prosjektet
+ListTaskTimeForTask=Liste over tid forbruket på oppgaven
 ActivityOnProjectToday=Prosjektaktivitet i dag
 ActivityOnProjectYesterday=Prosjektaktivitet i går
 ActivityOnProjectThisWeek=Aktiviteter i prosjektet denne uke
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktiviteter i prosjektet denne måned
 ActivityOnProjectThisYear=Aktivitet i prosjektet dette år
 ChildOfProjectTask=Tilhører prosjekt/oppgave
 ChildOfTask=Sub-oppgave
+TaskHasChild=Oppgave har underoppgaver
 NotOwnerOfProject=Ikke eier av dette private prosjektet
 AffectedTo=Tildelt
 CantRemoveProject=Dette prosjektet kan ikke fjernes da det er referert til av andre objekter (faktura, bestillinger eller annet). Se referanse-kategorien.
@@ -137,6 +140,7 @@ ProjectReportDate=Endre oppgavedatoer i henhold til ny prosjekt-startdato
 ErrorShiftTaskDate=Kan ikke skifte oppgave-dato etter nytt prosjekt-startdato
 ProjectsAndTasksLines=Prosjekter og oppgaver
 ProjectCreatedInDolibarr=Prosjekt %s opprettet
+ProjectValidatedInDolibarr=Prosjekt %s validert
 ProjectModifiedInDolibarr=Prosjekt %s er endret
 TaskCreatedInDolibarr=Oppgave %s opprettet
 TaskModifiedInDolibarr=Oppgave %s endret
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Tillat å koble prosjekt fra annet firma <br> <br> <
 LatestProjects=Siste %s prosjekter
 LatestModifiedProjects=Siste %s endrede prosjekter
 OtherFilteredTasks=Andre filtrerte oppgaver
-NoAssignedTasks=Ingen tildelte oppgaver (tilordne deg prosjekt/oppgaver fra toppvalgsruten for å legge inn tid på det)
+NoAssignedTasks=Ingen tildelte oppgaver (tilordne prosjekt/oppgaver til den nåværende brukeren fra den øverste valgboksen for å registrere tid)
 # Comments trans
 AllowCommentOnTask=Tillat brukerkommentarer på oppgaver
 AllowCommentOnProject=Tillat brukerkommentarer på prosjekter
-
+DontHavePermissionForCloseProject=Du har ikke tillatelse til å lukke prosjektet %s
+DontHaveTheValidateStatus=Prosjektet %s må være åpent for å kunne lukkes
+RecordsClosed=%s prosjekt(er) lukket
+SendProjectRef=About project %s
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index 3e876bf82fa..638e99647b7 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Akseptert(kan faktureres)
 PropalStatusNotSigned=Ikke akseptert(lukket)
 PropalStatusBilled=Fakturert
 PropalStatusDraftShort=Kladd
+PropalStatusValidatedShort=Validert
 PropalStatusClosedShort=Lukket
 PropalStatusSignedShort=Signert
 PropalStatusNotSignedShort=Ikke signert
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index 2646741ba86..807e5d33a9e 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Denne verdien kan brukes til å kalkulere tidsforbruket på et pr
 TJMDescription=Dene verdien er foreløpig brukt til informasjon, og er ikke brukt i noen kalkulasjoner
 LastSalaries=Siste %s lønnsutbetalinger
 AllSalaries=Alle lønnsutbetalinger
+SalariesStatistics=Lønnsstatistikk
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index c3ff628f3c9..20df6dce77c 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Endre lager
 MenuNewWarehouse=Nytt lager
 WarehouseSource=Kildelager
 WarehouseSourceNotDefined=Ingen lager definert
+AddWarehouse=Create warehouse
 AddOne=Legg til
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Mållager
 ValidateSending=Slett levering
 CancelSending=Avbryt levering
@@ -22,6 +24,7 @@ Movements=Bevegelser
 ErrorWarehouseRefRequired=Du må angi et navn på lageret
 ListOfWarehouses=Oversikt over lagre
 ListOfStockMovements=Oversikt over bevegelser
+ListOfInventories=List of inventories
 MovementId=Bevegelses-ID
 StockMovementForId=Bevegelse ID %d
 ListMouvementStockProject=Liste over varebevegelser tilknyttet prosjekt
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
index 0e622e2e9a4..7cf1d959c96 100644
--- a/htdocs/langs/nb_NO/stripe.lang
+++ b/htdocs/langs/nb_NO/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=Ny Stripe betaling mottatt
 NewStripePaymentFailed=Ny Stripe betaling prøvd men mislyktes
 STRIPE_TEST_SECRET_KEY=Hemmelig testnøkkel
 STRIPE_TEST_PUBLISHABLE_KEY=Publiserbar testnøkkel
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Hemmelig live-nøkkel
 STRIPE_LIVE_PUBLISHABLE_KEY=Publiserbar live-nøkkel
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live aktivert (ellers test/sandbox modus)
+StripeImportPayment=Importer Stripe-betalinger
+ExampleOfTestCreditCard=Eksempel på kredittkort for test: %s (gyldig), %s (feil CVC), %s (utløpt), %s (belastning mislykkes)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index 00f73a97a9e..164753f626e 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Vis utgiftsrapport
 NewTrip=Ny reiseregning
 LastExpenseReports=Siste %s utgiftsrapporter
 AllExpenseReports=Alle utgiftsrapporter
-CompanyVisited=Firma/organisasjon besøkt
+CompanyVisited=Selskap/organisasjon besøkt
 FeesKilometersOrAmout=Beløp eller kilometer
 DeleteTrip=Slett reiseregning
 ConfirmDeleteTrip=Er du sikker på at du vil slette denne utgiftsrapporten?
@@ -21,17 +21,17 @@ ListToApprove=Venter på godkjenning
 ExpensesArea=Område for reiseregninger
 ClassifyRefunded=Klassifisert 'refundert'
 ExpenseReportWaitingForApproval=En ny reiseregning er sendt inn for godkjenning
-ExpenseReportWaitingForApprovalMessage=En ny utgiftsrapport er blitt sendt inn og venter på godkjenning.\n-Bruker: %s\n-Periode: %s\nKlikk her for å validere: %s
+ExpenseReportWaitingForApprovalMessage=En ny kostnadsrapport er sendt og venter på godkjenning. <br> - Bruker: %s <br> - Periode: %s <br> Klikk her for å validere: %s
 ExpenseReportWaitingForReApproval=En utgiftsrapport er blitt sendt inn for ny godkjenning
-ExpenseReportWaitingForReApprovalMessage=En utgiftsrapport er blitt sendt inn og venter på ny godkjenning.\n%s, du godkjente ikke rapporten på grunn av: %s\nEn ny versjon er blitt sendt inn og venter på din godkjenning.\n- Bruker: %s\n- Periode: %s\nKlikk her for å validere: %s
+ExpenseReportWaitingForReApprovalMessage=En kostnadsrapport er sendt og venter på godkjenning. <br> %s, du nektet å godkjenne kostnadsrapporten av denne årsak: %s.<br> En ny versjon har blitt foreslått og venter på godkjenning.<br> - Bruker: %s <br> - Periode: %s<br> Klikk her for å validere: %s
 ExpenseReportApproved=En utgiftsrapport ble godkjent
-ExpenseReportApprovedMessage=Utgiftrapport %s ble godkjent.\n- Bruker: %s\n- Godkjent av: %s\nKlikk her for å vise utgiftsrapporten: %s
+ExpenseReportApprovedMessage=Utgiftsrapporten %s ble godkjent. <br> - Bruker: %s <br> - Godkjent av: %s <br> Klikk her for å vise utgiftsrapporten: %s
 ExpenseReportRefused=En utgiftsrapport ble avvist
-ExpenseReportRefusedMessage=Utgiftrapport %s ble avvist.\n- Bruker: %s\n- Avvist av: %s\n- Årsak for avvisning:%s\nKlikk her for å vise utgiftsrapporten: %s
+ExpenseReportRefusedMessage=Utgiftsrapporten %s ble avvist. <br> - Bruker: %s <br> - Avvist av: %s <br> - Årsak til avvisning: %s <br> Klikk her for å vise utgiftsrapporten: %s
 ExpenseReportCanceled=En utgiftsrapport ble kansellert
-ExpenseReportCanceledMessage=Utgiftrapport %s ble kansellert.\n- Bruker: %s\n- Kansellert av: %s\n- Årsak til kansellering: %s\nKlikk her for å vise utgiftsrapporten: %s
+ExpenseReportCanceledMessage=Utgiftsrapporten %s ble kansellert. <br> - Bruker: %s <br> - Avlyst av: %s <br> - Årsak til kansellering: %s <br> Klikk her for å vise utgiftsrapporten: %s
 ExpenseReportPaid=En utgiftsrapport ble betalt
-ExpenseReportPaidMessage=Utgiftrapport %s ble betalt.\n- Bruker: %s\n- Betalt av: %s\nKlikk her for å vise utgiftsrapporten: %s
+ExpenseReportPaidMessage=Utgiftsrapporten %s er betalt. <br> - Bruker: %s <br> - Betalt av: %s <br> Klikk her for å vise utgiftsrapporten: %s
 TripId=Reiseregnings - ID
 AnyOtherInThisListCanValidate=Person som skal informeres for godkjenning
 TripSociete=Firmainformasjon
@@ -74,6 +74,7 @@ EX_CAM_VP=PV vedlikehold og reparasjon
 DefaultCategoryCar=Standard transportmetode
 DefaultRangeNumber=Standard område nummer
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Feil, regelen for utgiftsrapport-nummerering ref ble ikke definert i oppsett av modulen 'Utgiftsrapport'
 ErrorDoubleDeclaration=Du har opprettet en annen reiseregning i overlappende tidsperiode
 AucuneLigne=Ingen reiseregning er opprettet enda
 
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 8764d907de0..50f09f7bb18 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -69,8 +69,8 @@ InternalUser=Intern bruker
 ExportDataset_user_1=Dolibarr brukere og egenskaper
 DomainUser=Domenebruker %s
 Reactivate=Reaktiver
-CreateInternalUserDesc=Dette skjemaet gir deg mulighet til å opprette en intern bruker til din bedrift/organisasjon. For å opprette en ekstern bruker (kunde, leverandør, ...), bruk knappen "Opprett Dolibarr-bruker" fra tredjeparts kontaktkort.
-InternalExternalDesc=En <b> intern </b> bruker er en bruker som er en del av firmaet / organisasjonen. <br> En <b> ekstern </b> bruker er en kunde, leverandør eller annen. <br><br>Begge tilfeller definerer rettigheter i Dolibarr. Også eksterne brukere kan ha en annen menybehandling enn interne brukere (Se Hjem - Oppsett - Skjerm)
+CreateInternalUserDesc=Dette skjemaet gir deg mulighet til å opprette en intern bruker til din bedrift / organisasjon. For å opprette en ekstern bruker (kunde, leverandør, ...), bruk knappen "Opprett Dolibarr-bruker" fra tredjeparts kontaktkort.
+InternalExternalDesc=En <b> intern </b> bruker er en bruker som er en del av firmaet/organisasjonen. <br> En <b> ekstern </b> bruker er en kunde, leverandør eller annen. <br><br>I begge tilfeller definerer tillatelser rettigheter på Dolibarr, også ekstern bruker kan ha en annen menybehandling enn intern bruker (se Hjem - Oppsett - Skjerm)
 PermissionInheritedFromAGroup=Rettigheter innvilget fordi de er arvet av en brukegruppe.
 Inherited=Arvet
 UserWillBeInternalUser=Opprettet bruker vil være en intern bruker (fordi ikke knyttet til en bestemt tredjepart)
@@ -93,6 +93,7 @@ NameToCreate=Navn på tredjepart til å lage
 YourRole=Dine roller
 YourQuotaOfUsersIsReached=Din kvote på aktive brukere er nådd!
 NbOfUsers=Antall brukere
+NbOfPermissions=Antall tillatelser
 DontDowngradeSuperAdmin=Bare en superadmin kan nedgradere en superadmin
 HierarchicalResponsible=Veileder
 HierarchicView=Hierarkisk visning
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 6da640dd322..549042c7251 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Sett inn antall ulike websider du ønsker. Deretter kan du redi
 DeleteWebsite=Slett wedside
 ConfirmDeleteWebsite=Er du sikker på at du vil slette denne websiden? Alle sider og innhold vil bli slettet.
 WEBSITE_TYPE_CONTAINER=Type side/container
+WEBSITE_PAGE_EXAMPLE=Webside for bruk som eksempel
 WEBSITE_PAGENAME=Sidenavn/alias
+WEBSITE_ALIASALT=Alternative sidenavn/aliaser
 WEBSITE_CSS_URL=URL til ekstern CSS-fil
 WEBSITE_CSS_INLINE=CSS-filinnhold (vanlig for alle sider)
 WEBSITE_JS_INLINE=Javascript-filinnhold (felles for alle sider)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Vis side i ny fane
 SetAsHomePage=Sett som startside
 RealURL=Virkelig URL
 ViewWebsiteInProduction=Vis webside ved hjelp av  hjemme-URL
-SetHereVirtualHost=Hvis du kan opprette, på din webserver (Apache, Nginx, ...), en dedikert Virtual Host med PHP aktivert og en Root-katalog på <strong>%s</strong><br>og skriv deretter inn det virtuelle vertsnavnet du har opprettet, slik at forhåndsvisningen kan gjøres også ved hjelp av denne direkte webservertilgangen, og ikke bare ved hjelp av Dolibarr-serveren.
-PreviewSiteServedByWebServer=Forhåndsvis %s i en ny fane. <br> <br> %s vil bli kjørt på en ekstern webserver (som Apache, Nginx, IIS). Du må installere og sette opp denne serveren før du peker på katalogen: <br> <strong>%s</strong>  <br> URL til ekstern server: <br> <strong> %s</strong>
-PreviewSiteServedByDolibarr=Forhåndsvis%s i en ny fane. <br> <br> %s vil bli servet av Dolibarr-serveren, slik at det ikke trengs noen ekstra webserver (som Apache, Nginx, IIS) som skal installeres. <br> Nettadressene til sidene er ikke brukervennlige og starter med banen til Dolibarr. <br> URL servet av Dolibarr:<br><strong>%s</strong><br><br> For å bruke din egen eksterne webserver til å betjene denne websiden , opprett en virtuell vert på webserveren din som peker på katalogen <br><strong>%s</strong><br>og skriv deretter inn navnet på denne virtuelle serveren og klikk på den andre forhåndsvisningsknappen.
+SetHereVirtualHost=Hvis du kan opprette en dedikert Virtual Host med PHP-aktivert og en Root-katalog på  på din webserver (Apache, Nginx, ...) <br> <strong> %s </strong><br>, skriv inn det virtuelle vertsnavnet du har opprettet, her. Slik kan forhåndsvisningen gjøres ved hjelp av denne dedikerte webservertilgangen også, i stedet for bare å bruke Dolibarr-serveren.
+YouCanAlsoTestWithPHPS=I utviklingsmiljø kan du foretrekke å teste nettstedet med PHP-innebygd webserver (PHP 5.5 nødvendig) ved å kjøre %s<strong> php -S 0.0.0.0:8080 -t  </strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Les
+WritePerm=Write
+PreviewSiteServedByWebServer=<u> Forhåndsvis %s i en ny fane. </u><br><br>%s vil bli servet av en ekstern webserver (som Apache, Nginx, IIS). Du må installere og sette opp denne serveren før du peker på katalogen:<br><strong>%s</strong><br>URL servet av ekstern server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u> Forhåndsvis %s i en ny fanei.</u><br><br>%s blir servet av Dolibarr-serveren, slik at den ikke trenger at en ekstra webserver (som Apache, Nginx, IIS)  installeres.<br>Ulempen er at nettadressen til sidene ikke er brukervennlig og begynner med banen til Dolibarr. <br> URL servet av Dolibarr:<br><strong>%s</strong> <br> <br> For å bruke din egen eksterne webserver for å betjene dette nettstedet, opprett en virtuell vert på webserveren din som peker på katalogen<br><strong>%s</strong><br>, og skriv deretter inn navnet til denne virtuelle serveren og klikk på den andre forhåndsvisningsknappen .
 VirtualHostUrlNotDefined=URL til ekstern webserver ikke definert
 NoPageYet=Ingen sider ennå
 SyntaxHelp=Hjelp med spesifikke syntakstips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Du kan inkludere PHP-kode i denne kilden ved hjelp av tagger <strong> &lt;?php ?&gt; </strong>. Følgende globale variabler er tilgjengelige: $conf, $langs, $db, $mysoc, $user, $website. <br><br><span class="fa fa-bug"></span> Du kan også inkludere innhold av en annen side/container med følgende syntaks: <br><strong> &lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> For å inkludere en <strong> lenke for å laste ned </strong> en fil som er lagret i <strong>dokument </strong> katalog, bruk <strong> document.php </strong> wrapper: <br> Eksempel, for en fil i documents/ecm (må logges), er syntaks:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br> For en fil i documents/medias (åpen mappe for offentlig tilgang) er syntaksen:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong> <br> For en fil delt med en delkobling (åpen tilgang ved hjelp av delings-hashnøkkelen til filen), er syntaks:<br><strong> &lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"> </span> For å inkludere et <strong> bilde </strong> som er lagret i <strong> dokument </strong> -katalogen, bruk <strong> viewimage.php </strong> wrapper: <br> Eksempel, for et bilde i documents/medias (åpen tilgang), er syntaks:<br><strong> &lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt; </strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Du kan inkludere PHP-kode i denne kilden ved hjelp av tagger <strong>&lt;?php ?&gt;</strong>. Følgende globale variabler er tilgjengelig: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> Du kan også inkludere innhold fra en annen side/container med følgende syntaks:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Du kan omdirigere til en annen side/container med følgende syntaks:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> For å inkludere en <strong>lenke til å laste ned</strong> en fil, lagret i<strong>dokument-</strong>katalogen, bruk<strong>document.php</strong> wrapper:<br>Eksempel, for en fil i documents/ecm (må logges), ersyntaks:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil i documents/medias (åpen katalog for offentlig adgang), er syntaks:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil delt med en link (åpen adgang ved deling av filers hash-nøkkel), er syntaks:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> For å inkludere et <strong>bilde</strong> lagret i<strong>dokument</strong>-katalogen, bruk <strong>viewimage.php</strong> wrapper:<br>Eksempel, for et bilde i documents/medias (åpen adgang), er syntaks:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Klon side/container
 CloneSite=Klon side
 SiteAdded=Nettsted lagt til
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Tilbake til listen over tredjeparter
 DisableSiteFirst=Deaktiver nettsted først
 MyContainerTitle=Mitt nettsteds tittel
 AnotherContainer=En annen container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver nettstedkontotabellen
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiver tabellen for å lagre nettstedkontoer (innlogging/pass) for hvert nettsted/tredjepart
+YouMustDefineTheHomePage=Du må først definere standard startside
+OnlyEditionOfSourceForGrabbedContentFuture=Merk: Bare utgaven av HTML-kilden vil være mulig når et sideinnhold er initiert ved å hente det fra en ekstern side (WYSIWYG editor vil ikke være tilgjengelig)
+OnlyEditionOfSourceForGrabbedContent=Kun HTML-kilde er mulig når innholdet ble tatt fra et eksternt nettsted
+GrabImagesInto=Hent bilder som er funnet i css og side også.
+ImagesShouldBeSavedInto=Bilder bør lagres i katalogen
+WebsiteRootOfImages=Rotkatalog for nettstedbilder
+SubdirOfPage=Underkatalog dedikert til side
+AliasPageAlreadyExists=Alias ​side <strong> %s </strong> eksisterer allerede
+CorporateHomePage=Firma hjemmeside
+EmptyPage=Tom side
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index c0e48992bd8..7d2a494494c 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Område for direktedebetsordre
 SuppliersStandingOrdersArea=Område for direktekreditordre
-StandingOrders=Direktedebet betalingsordre
-StandingOrder=Direktedebet betalingsordre
+StandingOrdersPayment=Direktedebet betalingsordre
+StandingOrderPayment=Direktedebet betalingsordre
 NewStandingOrder=Ny direktedebetsordre
 StandingOrderToProcess=Til behandling
 WithdrawalsReceipts=Direktedebetsordre
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Siste %s direktedebetskvitteringer
 MakeWithdrawRequest=Foreta en direktedebet betalingsforespørsel
 WithdrawRequestsDone=%s direktedebet-betalingforespørsler registrert
 ThirdPartyBankCode=Tredjepartens bankkonto
-NoInvoiceCouldBeWithdrawed=Ingen faktura tilbakekalt. Sjekk at faktura er på firmaer med gyldig BAN.
+NoInvoiceCouldBeWithdrawed=Ingen faktura tilbakekalt. Kontroller at fakturaer er mot selskaper med gyldig standard BAN, og at BAN har en RUM-modus <strong> %s </strong>.
 ClassCredited=Klassifiser som kreditert
 ClassCreditedConfirm=Er du sikker på at du vil klassifisere tilbakekallingen som kreditert din bankkonto?
 TransData=Dato for overføring
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=Dette vil også registrere innbetalinger til fak
 StatisticsByLineStatus=Statistikk etter linjestatus
 RUM=UMR
 RUMLong=Unik Mandat Referanse
-RUMWillBeGenerated=UMR.nummer vil bli generert når bankkonto-informasjon er lagret
+RUMWillBeGenerated=Hvis tomt, vil UMR-nummer bli generert når bankkontoinformasjon er lagret
 WithdrawMode=Direktedebetsmodus (FRST eller RECUR)
 WithdrawRequestAmount=Antall direktedebet-betalingforespørsler
 WithdrawRequestErrorNilAmount=Kan ikke opprette en tom direktedebet-betalingforespørsel
@@ -98,6 +98,10 @@ ModeFRST=Engangsbetaling
 PleaseCheckOne=Vennligs kryss av kun en
 DirectDebitOrderCreated=Direktedebet-ordre %s opprettet
 AmountRequested=Beløp forespurt
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Utførelsesdato
+CreateForSepa=Lag direkte debitfil
 
 ### Notifications
 InfoCreditSubject=Betaling av direktedebets-betalingsordre %s utført av banken
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 871020df87f..7dd6a0f0a7d 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -18,7 +18,6 @@ AccountAccountingSuggest=Voorgesteld boekhoudkundige rekening
 CreateMvts=Nieuwe transactie maken
 UpdateMvts=Wijzigen van een transactie
 WriteBookKeeping=Wegschrijven van transacties naar grootboek.
-Bookkeeping=Grootboek
 CAHTF=Totaal leveranciersaankoop voor BTW
 Processing=Verwerken
 EndProcessing=Verwerking beëindigd
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index db5ad2eaacf..3a9ceb934d0 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -40,4 +40,5 @@ ModuleFamilyHr=Personeelszaken (HR)
 HideDetailsOnPDF=Verberg product-detaillijnen op gemaakte PDF
 ExtrafieldPassword=Paswoord
 LibraryToBuildPDF=Bibliotheek om PDF bestanden te genereren.
+SalariesSetup=Setup van module salarissen
 AddBoxes=Widgets toevoegen
diff --git a/htdocs/langs/nl_BE/agenda.lang b/htdocs/langs/nl_BE/agenda.lang
index f936603a5cd..26c641c4863 100644
--- a/htdocs/langs/nl_BE/agenda.lang
+++ b/htdocs/langs/nl_BE/agenda.lang
@@ -14,16 +14,12 @@ ShipmentUnClassifyCloseddInDolibarr=Verzending %s werd geclassificieerd als opni
 ShipmentDeletedInDolibarr=Shipment %s gewist
 ContractSentByEMail=Contract %s verstuurd via Email
 ProposalDeleted=Offerte verwijderd
-PRODUCT_CREATEInDolibarr=Product %s aangemaakt
-PRODUCT_MODIFYInDolibarr=Product %s aangepast
-PRODUCT_DELETEInDolibarr=Product %s verwijderd
 EXPENSE_REPORT_CREATEInDolibarr=Onkostenrapport %s aangemaakt
 EXPENSE_REPORT_VALIDATEInDolibarr=Onkostenrapport %s gevalideerd
 EXPENSE_REPORT_APPROVEInDolibarr=Onkostenrapport %s goedgekeurd
 EXPENSE_REPORT_DELETEInDolibarr=Onkostenrapport %s verwijderd
 EXPENSE_REPORT_REFUSEDInDolibarr=Onkostenrapport %s geweigerd
 PROJECT_MODIFYInDolibarr=Project %s gewijzigd
-PROJECT_DELETEInDolibarr=Project %s verwijderd
 AgendaModelModule=Document sjablonen voor een gebeurtenis
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> om de uitvoer van acties te beperken die niet werden toegewezen aan de gebruiker <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> om de uitvoer van acties te beperken die aan de gebruiker <b>%s</b> is toegewezen. (eigenaar en anderen).
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index 16d8e5bdbf7..bb2b8d1d5d5 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -28,8 +28,6 @@ FrequencyPer_m=Iedere %s maanden
 FrequencyPer_y=Iedere %s jaren
 NextDateToExecution=Datum van volgende factuur generatie
 DateLastGeneration=Datum van laatste generatie
-MaxPeriodNumber=Max nr factuur generatie
-NbOfGenerationDone=Nr van reeds gedane factuur generatie's
 PaymentConditionShort30DENDMONTH=30 dagen einde maand
 PaymentCondition30DENDMONTH=Binnen 30 dagen volgend op einde maand
 PaymentConditionShort60DENDMONTH=60 dagen einde maand
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index 565a33311be..1d08f7b2dd1 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -26,8 +26,6 @@ ProfId3PT=Prof. Id 3 (Commerciële fiche aantal)
 ProfId2TN=Prof. id 2 (Fiscale inschrijving)
 CompanyHasAbsoluteDiscount=Deze afnemer heeft nog een kortingstegoed van <b> %s %s</b>
 CompanyHasCreditNote=Deze afnemer heeft nog creditnota's of eerdere stortingen voor <b> %s %s</b>
-CustomerAbsoluteDiscountAllUsers=Openstaand kortingsbedrag (toegekend aan alle gebruikers)
-CustomerAbsoluteDiscountMy=Mijn openstaand kortingsbedrag (toegekend aan uzelf)
 FromContactName=Naam:
 CustomerCodeShort=Klant code
 SupplierCodeShort=Leverancier code
@@ -43,7 +41,6 @@ StatusProspect2=Contact lopende
 ChangeToContact=Status veranderen naar 'Contact opnemen'
 ExportDataset_company_1=Derde partijen (Bedrijf/stichting/fysieke personen) en eigenschappen
 ImportDataset_company_1=Derde partijen (Bedrijven/stichtingen/fysieke mensen) en eigenschappen
-ImportDataset_company_4=Derde partij/Verkoopsverantwoordelijke (Affecteert verkoopsverantwoordelijke gebruikers naar bedrijven)
 JuridicalStatus200=Onafhankelijk
 AllocateCommercial=Toegewezen aan de verkoopsverantwoordelijke
 YouMustCreateContactFirst=U dient voor de Klant eerst contactpersonen met een e-mailadres in te stellen, voordat u kennisgevingen per e-mail kunt sturen.
@@ -54,8 +51,6 @@ OutstandingBillReached=Maximum bereikt voor openstaande rekening
 MergeOriginThirdparty=Kopieer derde partij (derde partij die je wil verwijderen)
 MergeThirdparties=Voeg derde partijen samen
 ConfirmMergeThirdparties=Bent u zeker dat u deze derde partij wil samenvoegen met de huidige? Alle gekoppelde objecten (facturen, orders, ...) worden verplaatst naar de huidige derde partij zodat u de gedupliceerde kan verwijderen.
-ThirdpartiesMergeSuccess=Derde partijen werden samen gevoegd.
 SaleRepresentativeLogin=Login van de verkoopsverantwoordelijke
 SaleRepresentativeFirstname=Voornaam van de verkoopsverantwoordelijke
 SaleRepresentativeLastname=Familienaam van de verkoopsverantwoordelijke
-ErrorThirdpartiesMerge=Er was een fout tijdens het verwijderen van derde partijen. controleer het logboek. Aanpassingen werden teruggezet.
diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
index f1e6f65a49a..98193bdebf7 100644
--- a/htdocs/langs/nl_BE/compta.lang
+++ b/htdocs/langs/nl_BE/compta.lang
@@ -30,7 +30,6 @@ RulesResultDue=- Dit omvat openstaande facturen, uitgaven, BTW, donaties, zowel
 RulesResultInOut=- Dit omvat alle betalingen van facturen, uitgaven, BTW en lonen. <br>- Dit is gebaseerd op de betalingsdata van de facturen, uitgaven, BTW en lonen. De donatiedatum voor donaties.
 RulesCADue=- Dit omvat de verschuldigde afnemersfacturen, betaald of niet. <br>- Dit is gebaseerd op de validatiedata van deze facturen.<br>
 RulesCAIn=- Dit omvat alle effectieve betalingen van afnemersfacturen.<br>- Het is gebaseerd op de betaaldatum van deze facturen<br>
-VATReport=BTW rapport
 CloneTax=Kopieer een sociale bijdrage/belasting
 ConfirmCloneTax=Bevestig kopie van betaling sociale bijdrage/belasting
 SimpleReport=Eenvoudig rapport
diff --git a/htdocs/langs/nl_BE/cron.lang b/htdocs/langs/nl_BE/cron.lang
index 59847189c91..6c363fa5735 100644
--- a/htdocs/langs/nl_BE/cron.lang
+++ b/htdocs/langs/nl_BE/cron.lang
@@ -2,4 +2,4 @@
 EnabledAndDisabled=Geactiveerd en gedeactiveerd
 CronDtStart=Niet voor
 CronDtEnd=Niet na
-CronMaxRun=Max. te starten aantal
+CronMethod=Methode
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 6af6615e1d5..fd434be2fcd 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -28,7 +28,6 @@ FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geu
 GoToHelpPage=Contacteer helpdesk
 RecordSaved=Tabelregel opgeslagen
 RecordDeleted=Record verwijderd
-NoFilter=Geen filter
 DateToday=Datum van vandaag
 DateReference=Referentie datum
 DateStart=Start datum
@@ -49,7 +48,6 @@ ExpenseReports=Uitgaven rapporten
 Select2NotFound=Geen resultaten gevonden
 Select2LoadingMoreResults=Laden van meer resultaten...
 Select2SearchInProgress=Zoeken is aan de gang...
-SearchIntoThirdparties=Derde partijen
 SearchIntoProductsOrServices=Producten of diensten
 SearchIntoCustomerInvoices=Klant facturen
 SearchIntoSupplierInvoices=Leverancier facturen
diff --git a/htdocs/langs/nl_BE/projects.lang b/htdocs/langs/nl_BE/projects.lang
index f6f51135409..31acdc03ff4 100644
--- a/htdocs/langs/nl_BE/projects.lang
+++ b/htdocs/langs/nl_BE/projects.lang
@@ -1,7 +1,5 @@
 # Dolibarr language file - Source file is en_US - projects
 ProjectsArea=Project Omgeving
-ConfirmDeleteAProject=Weet u zeker dat u dit project wilt verwijderen?
-ConfirmDeleteATask=Weet u zeker dat u deze taak wilt verwijderen?
 OpenedProjects=Open projecten
 OpenedTasks=Open taken
 ListOrdersAssociatedProject=Lijst van klantbestellingen die aan dit project gekoppeld zijn
diff --git a/htdocs/langs/nl_BE/propal.lang b/htdocs/langs/nl_BE/propal.lang
index d5a2f87d7d9..4a15c913e03 100644
--- a/htdocs/langs/nl_BE/propal.lang
+++ b/htdocs/langs/nl_BE/propal.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - propal
 ProposalsOpened=Openstaande offertes
-ConfirmDeleteProp=Weet u zeker dat u deze offerte wilt verwijderen?
 ConfirmValidateProp=Weet u zeker dat u deze offerte met naam <b>%s</b> wilt valideren?
-LastPropals=Laatste %s offertes
 LastModifiedProposals=Laatste %s gewijzigde offertes
 NoProposal=Geen offerte
 PropalStatusValidated=Gevalideerd (offerte staat open)
diff --git a/htdocs/langs/nl_BE/salaries.lang b/htdocs/langs/nl_BE/salaries.lang
index a25b727b4d0..722cad7b40d 100644
--- a/htdocs/langs/nl_BE/salaries.lang
+++ b/htdocs/langs/nl_BE/salaries.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standaard boekhoudkundige code voor persoonlijke uitgaves
 THM=Gemiddelde uurprijs
 TJM=Gemiddelde dagprijs
-CurrentSalary=Huidig salaris
diff --git a/htdocs/langs/nl_BE/users.lang b/htdocs/langs/nl_BE/users.lang
index c188bef1089..7ac8f3206b1 100644
--- a/htdocs/langs/nl_BE/users.lang
+++ b/htdocs/langs/nl_BE/users.lang
@@ -8,8 +8,6 @@ ConfirmSendNewPassword=Weet u zeker dat u een nieuw wachtwoord wilt genereren en
 LastGroupsCreated=Laatste %s gemaakte groepen
 LastUsersCreated=Laatste %s gemaakte gebruikers
 CreateDolibarrThirdParty=Maak Derden
-CreateInternalUserDesc=Met dit formulier kan u een gebruiker intern in uw bedrijf/organisatie aanmaken. Gebruik de knop 'Nieuwe Dolibarr gebruiker' van de derde partij contactkaart om een externe gebruiker (klant, leverancier, ...) aan te maken.
-InternalExternalDesc=Een <b>interne</b> gebruiker is een gebruiker die deel uitmaakt van uw bedrijf/organisatie.<br>Een <b>externe</b> gebruiker is een afnemer, leverancier of andere.<br><br>In beide gevallen kunnen de rechten binnen Dolibarr ingesteld worden. Ook kan een externe gebruiker over een ander menuverwerker beschikken dan een interne gebruiker (Zie Home->Instellingen->Scherm)
 ConfirmCreateContact=Weet u zeker dat u een Dolibarr account wilt maken voor deze contactpersoon?
 ConfirmCreateThirdParty=Weet u zeker dat u een 'derde' wilt maken voor dit lid?
 UserLogoff=Gebruiker logout
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 72f91c2893e..5fe398d8a32 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -10,117 +10,117 @@ Selectformat=Selecteer het formaat van het bestand
 ACCOUNTING_EXPORT_FORMAT=Selecteer het formaat van het bestand
 ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specificeer de prefix voor de bestandsnaam
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ThisService=Deze dienst
+ThisProduct=Dit product
+DefaultForService=Standaard bij dienst
+DefaultForProduct=Standaard bij product
+CantSuggest=Geen voorstel
+AccountancySetupDoneFromAccountancyMenu=Meeste instellingen boekhouding worden gedaan vanuit menu %s
 ConfigAccountingExpert=Configuration of the module accounting expert
-Journalization=Journalization
+Journalization=Journaal
 Journaux=Verkoopdagboek
 JournalFinancial=Financiëel dagboek
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Rekeningschema
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
+CurrentDedicatedAccountingAccount=Huidige toegewezen grootboekrekening
+AssignDedicatedAccountingAccount=Nieuwe grootboekrekening toewijzen
+InvoiceLabel=Factuur label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
-OtherInfo=Other information
-DeleteCptCategory=Remove accounting account from group
+OtherInfo=Overige informatie
+DeleteCptCategory=Verwijder grootboekrekening uit groep
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
-JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+JournalizationInLedgerStatus=Journaal-status
+AlreadyInGeneralLedger=Reeds doorgeboekt
+NotYetInGeneralLedger=Nog niet doorgeboekt
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
-DetailByAccount=Show detail by account
+DetailByAccount=Details grootboekrekening
 AccountWithNonZeroValues=Accounts with non zero values
-ListOfAccounts=List of accounts
+ListOfAccounts=Overzicht grootboekrekeningen
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for suppliers not defined in setup
 MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForVatPaymentNotDefined=Standaard grootboekrekening voor betaalde BTW is niet vastgelegd bij instellingen
 
-AccountancyArea=Accountancy area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyArea=Boekhoud omgeving
+AccountancyAreaDescIntro=Het gebruiken van de boekhoudmodule gaat met verschillende stappen
+AccountancyAreaDescActionOnce=De volgende werkzaamheden worden maar één keer uitgevoerd of jaarlijks
 AccountancyAreaDescActionOnceBis=De volgende stappen kunnen in de toekomst een tijdsbesparing opleveren bij het aanmaken van journaalposten (bij het schrijven van de journaalposten in de boekhouding)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescActionFreq=De volgende werkzaamheden worden meestal elke maand, week of dagelijks uitgevoerd bij grote bedrijven....
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
-AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+AccountancyAreaDescJournalSetup=STAP %s: Aanmaken of controleren journaal vanuit menu %s
+AccountancyAreaDescChartModel=STAP %s: Maak rekeningschema aan vanuit menu %s
+AccountancyAreaDescChart=STAP %s: Aanmaken of controleren van het rekeningschema menu %s
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescVat=STAP %s: Vastleggen grootboekrekeningen voor BTW registratie. Gebruik hiervoor menukeuze %s. 
+AccountancyAreaDescExpenseReport=STAP %s: Vastleggen grootboekrekeningen voor elke soort kostenoverzicht. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescSal=STAP %s: Vastleggen grootboekrekeningen voor salarisbetalingen. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescContrib=STAP %s: Vastleggen grootboekrekeningen bij overige kosten (diverse belastingen). Gebruik hiervoor menukeuze %s;
+AccountancyAreaDescDonation=STAP %s : Vastleggen grootboekrekeningen voor donaties. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescMisc=STAP %s: Vastleggen standaard grootboekrekeningen voor overige transacties. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescLoan=STAP %s: Vastleggen grootboekrekeningen voor salarisbetalingen. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescBank=STAP %s: Vastleggen dagboeken en balansrekeningen. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescProd=STAP %s: Vastleggen grootboekrekening bij producten/diensten. Gebruik hiervoor menu %s.
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=STAP %s: Als de koppeling tussen bestaande %s  boekingsregels en grootboekrekening is gecontroleerd, kunnen deze in de boekhouding worden weggeschreven met één muis-klik. Vul de eventuele ontbrekende koppelingen aan. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescWriteRecords=STAP %s: Wegschrijven transacties in boekhouding. Gebruik hiervoor menukeuze <strong>%s</strong> en klik op <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STAP %s: Maak boekingen aan of wijzigingen toe en maak rapporten of exportbestanden aan.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=STAP %s: Sluit periode af zodat er geen wijzigingen meer kunnen worden aangebracht.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Een verplichte stap is niet volledig afgewerkt (dagboek niet toegekend voor alle bankrekeningen). 
+Selectchartofaccounts=Selecteer actief rekeningschema
+ChangeAndLoad=Wijzigen en inlezen
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 SubledgerAccount=Subledger Account
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
+ShowAccountingAccount=Toon grootboekrekening
+ShowAccountingJournal=Toon dagboek
+AccountAccountingSuggest=Voorgestelde rekening
+MenuDefaultAccounts=Standaard GB-rekeningen
 MenuBankAccounts=Bankrekeningen
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-ProductsBinding=Products accounts
-Ventilation=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
-ExpenseReportsVentilation=Expense report binding
+MenuVatAccounts=BTW rekeningen
+MenuTaxAccounts=GB-rek. belastingen
+MenuExpenseReportAccounts=Resultaatrekeningen kosten
+MenuLoanAccounts=Grootboekrekeningen lonen
+MenuProductsAccounts=Grootboekrekeningen producten
+ProductsBinding=Grootboekrekeningen producten
+Ventilation=Koppelen aan grootboekrekening
+CustomersVentilation=Koppeling verkoopfacturen klant
+SuppliersVentilation=Koppeling inkoopfacturen leverancier
+ExpenseReportsVentilation=Koppelen aan kostenrekening
 CreateMvts=Nieuwe boeking
-UpdateMvts=Modification of a transaction
-ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
-Bookkeeping=Ledger
-AccountBalance=Account balance
+UpdateMvts=Aanpassing boeking
+ValidTransaction=Transacties valideren
+WriteBookKeeping=Doorboeken in boekhouding
+Bookkeeping=Grootboek
+AccountBalance=Saldo
 ObjectsRef=Source object ref
-CAHTF=Total purchase supplier before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
+CAHTF=Totaal inkoop exclusief BTW
+TotalExpenseReport=Totaal resultaatrekening kosten
+InvoiceLines=Te koppelen factuurregels
+InvoiceLinesDone=Gekoppelde factuurregels
+ExpenseReportLines=Te koppelen kostenboekingen
+ExpenseReportLinesDone=Gekoppelde kostenboekingen
+IntoAccount=Koppel regel aan grootboekrekening
 
 
-Ventilate=Bind
+Ventilate=Koppelen
 LineId=Id line
 Processing=verwerken
 EndProcessing=Proces afgebroken
 SelectedLines=Geselecteerde lijnen
 Lineofinvoice=factuur lijn
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+LineOfExpenseReport=Regel resultaatrekening
+NoAccountSelected=Geen grootboekrekening geselecteerd
+VentilatedinAccount=Koppeling aan grootboekrekening is voltooid
+NotVentilatedinAccount=Niet gekoppeld aan grootboekrekening
+XLineSuccessfullyBinded=%s producten/diensten met succes gekoppeld aan een grootboekrekening
+XLineFailedToBeBinded=%s producten/diensten zijn niet gekoppeld aan een grootboekrekening
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Aantal verbonden elementen per pagina (voorstel: max. 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -137,9 +137,9 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Grootboekrekening kruisposten
+ACCOUNTING_ACCOUNT_SUSPENSE=Grootboekrekening kruisposten (dagboeken)
+DONATION_ACCOUNTINGACCOUNT=Grootboeknummer voor donaties
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standaard grootboekrekening inkoop producten (indien niet opgegeven bij productgegevens)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standaard grootboekrekening omzet producten (indien niet opgegeven bij productgegevens)
@@ -149,44 +149,42 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standaard grootboekrekening omzet diensten (indi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Klant
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 Codejournal=Journaal
 NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+TransactionNumShort=Transactienummer
+AccountingCategory=Gepersonaliseerde groepen
+GroupByAccountAccounting=Groeperen per grootboekrekening
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
+ByAccounts=Op grootboekrekening
 ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Per jaar
 NotMatch=Niet ingesteld
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Verwijder boekingsregels
 DelYear=Te verwijderen jaar
 DelJournal=Te verwijderen journaal
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
+ConfirmDeleteMvtPartial=Dit zal de boeking verwijderen uit de boekhouding (tevens ook alle regels die met deze boeking verbonden zijn)
 FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
+ExpenseReportsJournal=Overzicht resultaatrekening
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
-VATAccountNotDefined=Account for VAT not defined
+VATAccountNotDefined=BTW rekeningen niet gedefinieerd
 ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+ProductAccountNotDefined=Grootboekrekening producten niet gedefinieerd
+FeeAccountNotDefined=Groetboekrekening vergoedingen niet vastgelegd
+BankAccountNotDefined=Grootboekrekening bank niet gedefinieerd
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Klant account
+ThirdPartyAccount=Tegenrekening relatie
 NewAccountingMvt=Nieuwe boeking
-NumMvts=Numero of transaction
+NumMvts=Boeknummer
 ListeMvts=List of movements
 ErrorDebitCredit=Debet en Credit mogen niet gelijktijdig worden opgegeven.
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third party account
+AddCompteFromBK=Grootboekrekeningen aan groep toevoegen
+ReportThirdParty=Relatie grootboeknummers
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
@@ -203,92 +201,96 @@ TotalMarge=Total sales margin
 DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
 DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+DescVentilTodoCustomer=Koppel factuurregels welke nog niet verbonden zijn met een product grootboekrekening
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilSupplier=Hier kunt u een lijst van leveranciersfacturen raadplegen waarvan de factuurregels wel of niet gekoppeld zijn aan een product-grootboekrekening
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilTodoExpenseReport=Koppel kosten-boekregels aan grootboekrekeningen welke nog niet zijn vastgelegd
+DescVentilExpenseReport=Hier kunt u de lijst raadplegen van kostenregels om te koppelen aan een grootboekrekening (of niet).
+DescVentilExpenseReportMore=Als er bij de instellingen bij de kostenposten een grootboekrekening is toegekend, zal het programma deze met een enkele muisklik <strong>"%s"</strong> kunnen koppelen. Als dit niet is gebeurt en u moet regels koppelen, dan zal dit handmatig moeten gebeuren via menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Hier kunt u de lijst raadplegen van kostenregels met hun tegenrekening
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=Automatisch boeken
+AutomaticBindingDone=Automatisch koppelen voltooid
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
-NoNewRecordSaved=No more record to journalize
+FicheVentilation=Koppelen card
+GeneralLedgerIsWritten=Grootboek transacties
+GeneralLedgerSomeRecordWasNotRecorded=Sommige transacties konden niet worden doorgeboekt. Als er geen andere foutmelding is, komt dit waarschijnlijk omdat ze reeds zijn doorgeboekt.
+NoNewRecordSaved=Geen posten door te boeken
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+ChangeBinding=Wijzig koppeling
+Accounted=Geboekt in grootboek
+NotYetAccounted=Nog niet doorgeboekt in boekhouding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group
 CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Accounting journals
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccoutingJournal=Show accounting journal
+AccountingJournals=Dagboeken
+AccountingJournal=Dagboek
+NewAccountingJournal=Nieuw dagboek
+ShowAccoutingJournal=Toon dagboek
 Nature=Natuur
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Verkopen
 AccountingJournalType3=Aankopen
 AccountingJournalType4=Bank
-AccountingJournalType5=Expenses report
+AccountingJournalType5=Kostenoverzicht
+AccountingJournalType8=Voorraad
 AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
+ErrorAccountingJournalIsAlreadyUse=Dit dagboek is al in gebruik
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
-ExportDraftJournal=Export draft journal
+ExportDraftJournal=Journaal exporteren
 Modelcsv=Export model
 Selectmodelcsv=Selecteer een export model
 Modelcsv_normal=Klassieke export
 Modelcsv_CEGID=Selecteer actieve rekeningschema
-Modelcsv_COALA=Export towards Sage Coala
-Modelcsv_bob50=Export towards Sage BOB 50
-Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export towards Quadratus QuadraCompta
+Modelcsv_COALA=Exporteren naar Sage Coala
+Modelcsv_bob50=Exporteren naar Sage BOB 50
+Modelcsv_ciel=Exporteren naar Sage Ciel Compta of Compta Evolution
+Modelcsv_quadratus=Exporteren naar Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
 Modelcsv_agiris=Export towards Agiris
 Modelcsv_configurable=Export Configurable
-ChartofaccountsId=Chart of accounts Id
+ChartofaccountsId=Rekeningschema Id
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
+InitAccountancy=Instellen boekhouding
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+DefaultBindingDesc=Hier kunt u een standaard grootboekrekening koppelen aan salaris betalingen, donaties, belastingen en BTW, wanneer deze nog niet apart zijn ingesteld.
+Options=Opties
+OptionModeProductSell=Instellingen verkopen
+OptionModeProductBuy=Instellingen inkopen
+OptionModeProductSellDesc=Omzet grootboekrekening bij producten
+OptionModeProductBuyDesc=Inkoop grootboekrekening bij producten
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
+CleanHistory=Verwijder alle koppelingen van gekozen boekjaar,
+PredefinedGroups=Voorgedefinieerde groepen
+WithoutValidAccount=Zonder geldig toegewezen grootboekrekening
+WithValidAccount=Met geldig toegewezen grootboekrekening
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 
 ## Dictionary
-Range=Range of accounting account
+Range=Grootboeknummer van/tot
 Calculated=Berekend
 Formula=Formule
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+SomeMandatoryStepsOfSetupWereNotDone=Sommige verplichte stappen zijn nog niet volledig uitgevoerd. Maak deze alsnog.
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=U probeert regels van factuur <strong>%s</strong> door te boeken, maar er zijn regels die nog niet verbonden zijn aan een grootboekrekening. Het doorboeken is daarom geannuleerd.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
+NoJournalDefined=Geen dagboek ingesteld
+Binded=Geboekte regels
+ToBind=Te boeken regels
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Pas op. Dit overzicht is niet afkomstig vanuit de boekhouding. Hierdoor bevat deze geen modificaties verricht in de boekhouding. Als het doorboeken up-to-date is, geeft de boekhouding een beter overzicht.
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 7a60a35696c..d1b662023af 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -89,7 +89,7 @@ Mask=Masker
 NextValue=Volgende waarde
 NextValueForInvoices=Volgende waarde (facturen)
 NextValueForCreditNotes=Volgende waarde (creditnota's)
-NextValueForDeposit=Next value (down payment)
+NextValueForDeposit=Volgende waarde (storting)
 NextValueForReplacements=Volgende waarde (vervangingen)
 MustBeLowerThanPHPLimit=Opmerking: uw PHP instellingen beperken de groote van bestanduploads naar <b>%s %s,</b> ongeacht wat de waarde van de instelling binnen Dolibarr is
 NoMaxSizeByPHPLimit=Opmerking: Geen limiet ingesteld in uw PHP instellingen
@@ -269,7 +269,7 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (standaard in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS-poort (niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS-host (Niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_EMAIL_FROM=E-mail afzender voor automatische e-mails (Standaard in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=E-mail gebruikt als 'Fout-Tot' veld in verzonden e-mail
 MAIN_MAIL_AUTOCOPY_TO= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle verzonden e-mails naar
 MAIN_DISABLE_ALL_MAILS=Schakel het versturen van alle e-mails uit (voor testdoeleinden of demonstraties)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
@@ -312,7 +312,7 @@ FindPackageFromWebSite=Vind een pakket die u de functionaliteit geeft die u wilt
 DownloadPackageFromWebSite=Download het pakket (voorbeeld vanaf de officiële web site %s).
 UnpackPackageInDolibarrRoot=Pak bestand uit op de Dolibarr server directory toegewezen aan de externe modules: <b>%s</b>
 UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+SetupIsReadyForUse=Module geïnstalleerd. U moet deze nog wel activeren en instellen: <a href="%s">%s</a>.
 NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd in een bestaande map.<br>
 InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren.  Dit stelt je in staat om op dezelfde plaats zowel plug-ins als eigen templates te bewaren. <br>Maak gewoon een directory op het niveau van de root van Dolibarr (bv met de naam: aanpassing).<br>
 InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
@@ -331,7 +331,7 @@ GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Voorbeeld op product gemaakt op 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> geeft <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> geeft <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> geeft <b>IN0701-0099-A</b> als het soort bedrijf is 'Responsable Inscripto' met de codesoort 'A_RI'
 GenericNumRefModelDesc=Geeft een aanpasbaar nummer volgens een gedefinieerd masker.
 ServerAvailableOnIPOrPort=Server is beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is niet beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>
@@ -342,12 +342,12 @@ ErrorCantUseRazIfNoYearInMask=Fout, kan optie @ niet gebruiken om teller te rese
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fout, kan optie @ niet gebruiken wanneer de volgorde {jj}{mm} of {jjjj}{mm} niet is opgenomen in het masker.
 UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD-bestandssysteem.
 UMaskExplanation=Deze parameter laat u de rechten bepalen welke standaard zijn ingesteld voor de bestanden aangemaakt door Dolibarr op de server (tijdens het uploaden, bijvoorbeeld).<br>Het moet de octale waarde zijn (bijvoorbeeld, 0666 betekent lezen en schrijven voor iedereen).<br>Deze parameter wordt NIET op een windows-server gebruikt
-SeeWikiForAllTeam=Zie de Wiki-pagina voor details van alle personen die bijgedragen hebben en hun organisaties
+SeeWikiForAllTeam=Ga naar de wiki-pagina voor een opsomming van alle acteurs en hun organisatie
 UseACacheDelay= Ingestelde vertraging voor de cacheexport in secondes (0 of leeg voor geen cache)
 DisableLinkToHelpCenter=Verberg de link "<b>ondersteuning of hulp nodig</b>" op de inlogpagina
 DisableLinkToHelp=Verberg de link naar online hulp "<b>%s</b>"
 AddCRIfTooLong=Er zijn geen automatische regeleinden, dus als uw tekst in de documenten te lang is, moet u zelf regeleinden in de teksteditor invoeren.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
+ConfirmPurge=Weet u zeker dat u ALLES wilt verwijderen? <br> Dit zal alle bestanden definitief verwijderen zonder de mogelijkheid deze terug te halen (ECM bestanden, gekoppelde bestanden....).
 MinLength=Minimale lengte
 LanguageFilesCachedIntoShmopSharedMemory=Bestanden .lang in het gedeelde geheugen
 LanguageFile=Taalbestand
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefin
 MassConvert=Start algemene omzetting
 String=String
 TextLong=Lange tekst
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Datum en uur
@@ -409,17 +410,17 @@ ExtrafieldRadio=Radio buttons (alleen keuze)
 ExtrafieldCheckBox=Checkboxen
 ExtrafieldCheckBoxFromList=Checkboxen uit tabel
 ExtrafieldLink=Link naar een object
-ComputedFormula=Computed field
+ComputedFormula=Berekend veld
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpcheckbox=Lijst van parameters moet telkens bestaan uit sleutel,waarde (waarbij de sleutel geen '0' kan zijn)<br><br>bv:<br>1,waarde<br>2,waarde2<br>3,waarde3<br>...
+ExtrafieldParamHelpradio=Lijst van parameters moet telkens bestaan uit sleutel,waarde<br><br>bv:<br>1,waarde<br>2,waarde2<br>3,waarde3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Gebruikte library voor generen PDF
-WarningUsingFPDF=Opgelet: je <br>conf.php</b> bevat de instelling <b>dolibarr_pdf_force_fpdf=1</b>.  Dat betekent dat je de FPDF bibliotheek gebruikt om PDF bestanden te maken.  Deze bibliotheek is oud, en ondersteunt een aantal mogelijkheden niet (Unicode, transparantie in beelden, cyrillische, arabische en aziatische talen, ...), dus er kunnen fouten optreden bij het maken van PDF's.  <br>Om dat op te lossen, en om volledige ondersteuning van PDF-maken te hebben, download aub <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, en dan verwijder of maak commentaar van de lijn <b>$dolibarr_pdf_force_fpdf=1</b>, en voeg in plaats daarvan <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b> toe.
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Sommige landen gebruiken 2 of 3 belastingen op iedere factuurregel. Als dit het geval is, kies type voor tweede en derde belasting en het tarief. Mogelijke typen zijn: <br>1 : Locale belasting van toepassing op producten en diensten zonder btw (btw wordt niet toegepast op locale belasting)<br>2 : Locale belasting van toepassing op producten en diensten voor btw (btw wordt berekend op bedrag + locale belasting )<br>3 : Locale belasting van toepassing op producten zonder btw  (btw wordt niet toegepast op locale belasting)<br>4 : Locale belasting van toepassing op producten voor btw (btw wordt berekend op bedrag + locale belasting)<br>5 : Locale belasting van toepassing op diensten zonder btw  (btw wordt niet toegepast op locale belasting)<br>6 :  Locale belasting van toepassing op diensten voor btw  (btw wordt berekend op bedrag + locale belasting )
 SMS=SMS
 LinkToTestClickToDial=Geef een telefoonnummer om de ClickToDial link te testen voor gebruiker <strong>%s</strong>
 RefreshPhoneLink=Herladen link
@@ -440,16 +441,17 @@ NoBarcodeNumberingTemplateDefined=Geen barcode nummering sjabloon ingeschakeld i
 EnableFileCache=Gebruik cache voor bestanden
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=Niet meer details in footer
-DisplayCompanyInfo=Display company address
+DisplayCompanyInfo=Geen adresgegevens bedrijf weer
 DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
+DisplayCompanyInfoAndManagers=Geef adresgegevens en namen manager weer
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Klik voor omschrijving
 DependsOn=Deze module heeft de volgende module(s) nodig
 RequiredBy=Deze module is vereist bij module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Zet dit op 1 als u het hoofddocument als standaard aan e-mail wilt toevoegen (indien van toepassing)
 FilesAttachedToEmail=Voeg een bestand toe
 SendEmailsReminders=Stuur agendaherinneringen per e-mail
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Gebruikers & groepen
 Module0Desc=Groepenbeheer gebruikers/werknemers
@@ -489,7 +492,7 @@ Module30Name=Facturen
 Module30Desc=Factuur- en creditnotabeheer voor klanten. Factuurbeheer voor leveranciers
 Module40Name=Leveranciers
 Module40Desc=Leveranciersbeheer (inkoopopdrachten en -facturen)
-Module42Name=Debug Logs
+Module42Name=Debug logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editorbeheer
@@ -508,7 +511,7 @@ Module55Desc=Streepjescodesbeheer
 Module56Name=Telefonie
 Module56Desc=Telefoniebeheer
 Module57Name=Incasso-opdrachten
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
+Module57Desc=Beheer van Incasso opdrachten. Inclusief het aanmaken van een SEPA bestand zoals gebruikt in Europese landen.
 Module58Name=ClickToDial
 Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
 Module59Name=Bookmark4u
@@ -567,15 +570,15 @@ Module1520Desc=Massa mail document generen
 Module1780Name=Labels/Categorien
 Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
 Module2000Name=Fckeditor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
+Module2000Desc=Toestaan aanpassen tekst met behulp de uitgebreide editor( Gebaseerd op de CKEditor)
 Module2200Name=Dynamische prijzen
 Module2200Desc=Het gebruik van wiskundige uitdrukkingen voor prijzen mogelijk te maken
 Module2300Name=Geplande taken
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2300Desc=Taakplanning (ook wel cron of chrono tabel)
 Module2400Name=Gebeurtenissen/Agenda
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2500Desc=Document Management System / Electronic Content Management. Geautomatiseerde organisatie van gemaakte en opgeslagen documenten. Deel deze indien gewenst.
 Module2600Name=API/Web services (SOAP server)
 Module2600Desc=Schakel de Dolibarr SOAP server in die API services aanbiedt
 Module2610Name=API/Web services (REST server)
@@ -619,6 +622,8 @@ Module59000Name=Marges
 Module59000Desc=Module om de marges te beheren
 Module60000Name=Commissies
 Module60000Desc=Module om commissies te beheren
+Module62000Name=Incoterm
+Module62000Desc=Onderdelen toevoegen voor Incoterms
 Module63000Name=Resources
 Module63000Desc=Bronnen beheren (printers, auto's kamers, ...) zodat u deze kunt delen met evenementen
 Permission11=Bekijk afnemersfacturen
@@ -640,7 +645,7 @@ Permission32=Creëer / wijzig producten / diensten
 Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission41=Inlezen projecten en taken (gedeeld project en project waarbij ik decontactpersoon ben). Kan ook de gebruikte tijd invoeren op toegewezen taken (rooster).
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Verwijder projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
 Permission45=Exporteer projecten
@@ -688,9 +693,9 @@ Permission142=Aanmaak/wijzig alle projecten en taken (ook private projecten waar
 Permission144=Verwijder alle projecten en taken (ook de private projecten waarvoor ik geen contactpersoon ben)
 Permission146=Bekijk leveranciers
 Permission147=Bekijk statistieken
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
+Permission151=Inlezen incasso-opdracht
+Permission152=Aanmaken/aanpassen incasso-opdracht
+Permission153=Versturen/verzenden incasso-opdrachten
 Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Lees contracten/abonnementen
 Permission162=Creëren/aanpassen contracten/abonnementen
@@ -833,11 +838,11 @@ Permission1251=Voer massale invoer van externe gegevens in de database uit (data
 Permission1321=Exporteer afnemersfacturen, attributen en betalingen
 Permission1322=Reopen a paid bill
 Permission1421=Exporteer afnemersfacturen en attributen
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Lees geplande taak
 Permission23002=Maak/wijzig geplande taak
@@ -869,7 +874,7 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Verwijder resources
 Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
+DictionaryCompanyType=Relatiesoort
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potentiële niveau
 DictionaryCanton=Provincie
@@ -877,13 +882,14 @@ DictionaryRegion=Regio
 DictionaryCountry=Landen
 DictionaryCurrency=Valuta
 DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
+DictionaryActions=Agenda evenementen
 DictionarySocialContributions=Sociale/fiscale belastingtypen
 DictionaryVAT=BTW-tarieven of Verkoop Tax tarieven
 DictionaryRevenueStamp=Bedrag van de fiscale zegels
 DictionaryPaymentConditions=Betalingsvoorwaarden
 DictionaryPaymentModes=Betaalwijzen
 DictionaryTypeContact=Contact / Adres soorten
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Papierformaten
 DictionaryFormatCards=Cards formats
@@ -895,7 +901,7 @@ DictionaryOrderMethods=Bestel methodes
 DictionarySource=Oorsprong van offertes / bestellingen
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Modellen voor rekeningschema
-DictionaryAccountancyJournal=Accounting journals
+DictionaryAccountancyJournal=Daboeken
 DictionaryEMailTemplates=Email documentensjablonen
 DictionaryUnits=Eenheden
 DictionaryProspectStatus=Status prospect
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=BTW-beheer
 VATIsUsedDesc=Het standaard BTW-tarief bij het aanmaken van prospecten, facturen, orders etc volgt de actieve standaard regel:<br>Als de verkoper onderworpen is aan BTW, dan wordt BTW standaard op 0 gezet. Einde van de regel.<br>Als het 'land van de verkoper' = 'het land van de koper' dan wordt de BTW standaard ingesteld op de BTW van het product in het verkopende land. Einde van de regel.<br>Als verkoper en koper zich in de Europese Gemeenschap bevinden en het betreft een nieuw vervoersmiddel (auto, boot, vliegtuig), dan wordt de BTW standaard ingesteld op 0 (De BTW moet worden betaald door koper in het grenskantoor van zijn land en niet door de verkoper). Einde van de regel.<br>Als verkoper en koper zich in de Europese Unie bevinden en de koper is een persoon of bedrijf zonder BTW-registratienummer = BTW-standaard van het verkochte product. Einde van de regel.<br>Als verkoper en koper zich in de Europese Gemeenschap bevinden en de koper geen bedrijf is, dan wordt de BTW standaard ingesteld op de BTW van het verkochte product. Einde van de regel<br><br>In alle andere gevallen wordt de BTW standaard ingesteld op 0. Einde van de regel.<br>
 VATIsNotUsedDesc=Standaard is de voorgestelde BTW 0. Dit kan gebruikt worden in situaties zoals verenigingen, particulieren of kleine bedrijven.
-VATIsUsedExampleFR=In Frankrijk, betekent dit dat bedrijven of organisaties met een echt fiscaalsysteem (Vereenvoudigd reëel of normaal reëel). Een systeem waarbij de BTW wordt aangegeven.
-VATIsNotUsedExampleFR=In Frankrijk, betekent dit verenigingen die geen BTW aangegeven of bedrijven, organisaties of vrije beroepen die hebben gekozen voor het micro-onderneming fiscale stelsel (BTW in franchise) en een franchise BTW betaalden zonder BTW aangifte. Bij het maken van deze keuze verschijnt de vermelding "Niet van toepassing BTW - art-293B van CGI" op de facturen.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Tarief
 LocalTax1IsNotUsed=Gebruik geen tweede belasting
@@ -1014,8 +1020,8 @@ DelaysOfToleranceDesc=In dit scherm kunt u de getolereerde vertraging voordat ee
 Delays_MAIN_DELAY_ACTIONS_TODO=Getolereerde vertraging (in dagen) voor geplande evenementen (agenda) nog niet voltooid
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
 Delays_MAIN_DELAY_TASKS_TODO=Getolereerde vertraging (in dagen) voor geplande taken (project-taken) nog niet voltooid
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Getolereerde vertraging (in dagen) voor een kennisgeving, op nog niet uitgevoerde orders.
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Vertragingstolerantie (in dagen) voor kennisgeving van nog niet verwerkte leveranciersopdrachten.
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Getolereerde vertraging (in dagen) voor een kennisgeving, op af te sluiten offertes word getoond
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Getolereerde vertraging (in dagen) voor een kennisgeving, op niet-gefactureerde offertes word getoond
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Getolereerde vertraging (in dagen) voor een kennisgeving, op te activeren diensten word getoond
@@ -1026,7 +1032,7 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Getolereerde vertraging (in dagen)
 Delays_MAIN_DELAY_MEMBERS=Getolereerde vertraging (in dagen) voor een kennisgeving, op niet betaalde contributie word getoond
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Getolereerde vertraging (in dagen) voor de kennisgeving voor nog te doen cheques aanbetaling
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
+SetupDescription1=Bij Instellingen kunt u de onderdelen instellen voordat u begint Dolibarr.
 SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
 SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
 SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
@@ -1039,16 +1045,17 @@ InfoOS=Over OS
 InfoWebServer=Over Web Server
 InfoDatabase=Over Database
 InfoPHP=Over PHP
-InfoPerf=About Performances
+InfoPerf=Over Prestaties
 BrowserName=Browser naam
 BrowserOS=Browser OS
 ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen
 SecurityEventsPurged=Beveiliging gebeurtenissen verwijderd
 LogEventDesc=Hier kunt u de de gewenste veiligheidslogs in- of uitschakelen. Beheerders kunnen de inhoud ervan dan zien via het menu <b>Home->Systeemwerkset->Audit.</b> Waarschuwing, deze functionaliteit kan een grote hoeveelheid gegevens in de database wegschrijven.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+AreaForAdminOnly=Setup functies kunnen alleen door <b>Administrator gebruikers</b> worden ingesteld
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
 SystemAreaForAdminOnly=Dit scherm is alleen beschikbaar voor de beheerders. Andere Dolibarr gebruikers kunnen hier niets wijzigen.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=U kunt hier instellingen doen die het uiterlijk van Dolibarr instellen
 AvailableModules=Beschikbare app/modules
 ToActivateModule=Om modules te activeren, ga naar Home->Instellingen->Modules.
@@ -1063,7 +1070,7 @@ TriggerActiveAsModuleActive=Initiatoren in dit bestand zijn actief als module <b
 GeneratedPasswordDesc=Stel hier de regel in die u wilt gebruiken voor het genereren van een nieuwe wachtwoord als u vraagt om een automatisch gegenereerd wachtwoord
 DictionaryDesc=Insert all reference data. You can add your values to the default.
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
+MiscellaneousDesc=Overige beveiliging gerelateerde instellingen worden hier vastgelegd.
 LimitsSetup=Limieten- en precisieinstellingen
 LimitsDesc=U kunt hier limieten en preciseringen die Dolibarr gebruikt instellen
 MAIN_MAX_DECIMALS_UNIT=Maximaal aantal decimalen voor eenheidsprijzen
@@ -1142,7 +1149,7 @@ TranslationOverwriteDesc2=You can use the other tab to help you know translation
 TranslationString=Vertaal regel
 CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
+NewTranslationStringToShow=Weergeven nieuwe vertaal string
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
 TotalNumberOfActivatedModules=Geactiveerde applicaties/modules: <b>%s</b> / <b>%s</b>
@@ -1401,10 +1408,10 @@ MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is
 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
+FilesOfTypeCached=Bestandtype %s wordt gecached door de HTTP server
+FilesOfTypeNotCached=Bestanden van het type %s, worden niet bewaard door de HTTP server
+FilesOfTypeCompressed=Bestanden van het type %s , worden gecomprimeerd door de HTTP server
+FilesOfTypeNotCompressed=Bestanden van het type %s , worden niet gecomprimeerd door de HTTP server
 CacheByServer=Cache via server
 CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache via browser
@@ -1415,7 +1422,7 @@ DefaultValuesDesc=You can define/force here the default value you want to get wh
 DefaultCreateForm=Default values (on forms to create)
 DefaultSearchFilters=Standaard zoekfilters
 DefaultSortOrder=Standaard order-sortering
-DefaultFocus=Default focus fields
+DefaultFocus=Standaard velden voor focus
 ##### Products #####
 ProductSetup=Productenmoduleinstellingen
 ServiceSetup=Services module setup
@@ -1423,9 +1430,9 @@ ProductServiceSetup=Producten en Diensten modules setup
 NumberOfProductShowInSelect=Maximaal aantal producten in 'combo-lijsten' (0 = onbeperkt)
 ViewProductDescInFormAbility=Visualisatie van de productomschrijvingen in de formulieren (anders getoond als popup-tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
+ViewProductDescInThirdpartyLanguageAbility=Visualisatie van productomschrijvingen in andere taal
 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=Wait you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+UseSearchToSelectProduct=Systeem begint te zoeken uit de combolijst op het moment dat u een toets indrukt (dit kan de prestaties aanzienlijk verhogen bij het zoeken in een groot aantal artikelen, maar als minder gebruiksvriendelijk worden ervaren)
 SetDefaultBarcodeTypeProducts=Standaard streepjescodetype voor produkten
 SetDefaultBarcodeTypeThirdParties=Standaard streepjescodetype voor derde partijen
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
@@ -1441,6 +1448,9 @@ SyslogFilename=Bestandsnaam en -pad
 YouCanUseDOL_DATA_ROOT=U kunt DOL_DATA_ROOT/dolibarr.log gebruiken voor een logbestand in de Dolibarr "documenten"-map. U kunt ook een ander pad gebruiken om dit bestand op te slaan.
 ErrorUnknownSyslogConstant=Constante %s is geen bekende 'syslog' constante
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donatiemoduleinstellingen
 DonationsReceiptModel=Sjabloon van donatie-ontvangst
@@ -1463,7 +1473,7 @@ GenbarcodeLocation=Opdrachtregelprogramma voor streepjescodegeneratie (gebruikt
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Beheerder om automatisch barcode nummers te bepalen.
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
+WithdrawalsSetup=Instellen automatische incasso module
 ##### ExternalRSS #####
 ExternalRSSSetup=Externe RSS importeerinstellingen
 NewRSS=Nieuwe RSS Feed
@@ -1482,7 +1492,7 @@ FixedEmailTarget=Vaste email bestemmeling
 SendingsSetup=Verzendingsmoduleinstellingen
 SendingsReceiptModel=Verzendontvangstsjabloon
 SendingsNumberingModules=Verzendingen nummering modules
-SendingsAbility=Support shipping sheets for customer deliveries
+SendingsAbility=Ondersteun verzendingsbrieven voor afnemersleveringen
 NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Vrije tekst op verzendingen
 ##### Deliveries #####
@@ -1498,7 +1508,7 @@ FCKeditorForProduct=WYSIWIG creatie / bewerking van product- / dienstomschrijvin
 FCKeditorForProductDetails=WYSIWIG creatie / bewerking van produktdetailregels voor alle entiteiten (Offertes, opdrachten, facturen, etc)<br><font class="warning">Waarschuwing: Gebruik van deze optie, voor dit doeleinde, wordt sterk afgeraden, omdat het problemen kan geven met speciale karakters en de paginaopmaak wanneer er PDF bestanden worden gegenereerd van deze gegevens.</font>
 FCKeditorForMailing= WYSIWIG creatie / bewerking van mailings
 FCKeditorForUserSignature=WYSIWIG creatie /aanpassing van ondertekening
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForMail=WYSIWIG creatie / bewerking voor alle e-mail (behalve Gereedschap-> E-mailing)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Verbinding geslaagd, maar de database lijkt geen OSCommerce database te zijn (Sleutel %s niet gevonden in tabel %s).
 OSCommerceTestOk=Verbinding met de server '%s' en database '%s' met gebruiker '%s' succesvol.
@@ -1535,12 +1545,14 @@ DeleteMenu=Menu-item verwijderen
 ConfirmDeleteMenu=Weet u zeker dat u menu-item: <b>%s</b> wilt verwijderen?
 FailedToInitializeMenu=Initialisatie van menu is mislukt
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+TaxSetup=Moduleinstellingen voor belastingen, sociale bijdragen en dividenden
 OptionVatMode=BTW verplicht
-OptionVATDefault=Kasbasis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Transactiebasis
 OptionVatDefaultDesc=BTW is verplicht:<br>- op levering / betalingen van goederen (wij gebruiken de factuurdatum)<br>- op betalingen van diensten
 OptionVatDebitOptionDesc=BTW is verplicht:<br>- op levering / betalingen van goederen<br>- op factuur (debet) voor diensten
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Tijd van BTW opeisbaarheid standaard volgens gekozen optie:
 OnDelivery=Bij levering
 OnPayment=Bij betaling
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Factuurdatum gebruiken
 Buy=Kopen
 Sell=Verkopen
 InvoiceDateUsed=Factuurdatum gebruiken
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Uw bedrijf is ingesteld als zijnde vrijgesteld van BTW (Home->Instellingen->Bedrijf /Stichting), er zijn dus geen BTW opties in te stellen.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Boekhoudkundige afnemerscode
 AccountancyCodeBuy=Boekhoudkundige leverancierscode
@@ -1650,7 +1662,7 @@ NbNumMin=Minimum aantal numerieke tekens
 NbSpeMin=Minimum aantal speciale tekens
 NbIteConsecutive=Maximum aantal repeterende dezelfde karakters
 NoAmbiCaracAutoGeneration=Voor het automatisch genereren, gebruik geen dubbelzinnige tekens ("1","l","i","|","0","O")
-SalariesSetup=Setup van module salarissen
+SalariesSetup=Setup salaris module
 SortOrder=Sorteervolgorde
 Format=Formaat
 TypePaymentDesc=0: Klant betalingswijze, 1: Leverancier betalingswijze 2: Zowel klanten en leveranciers betaalwijze
@@ -1681,7 +1693,7 @@ PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache a
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
+TopMenuDisableImages=Verberg afbeeldingen in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1718,6 +1730,7 @@ MailToSendContract=Contract versturen
 MailToThirdparty=To send email from third party page
 MailToMember=Om e-mail van lid pagina te verzenden
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1744,11 +1757,11 @@ AddPermissions=Voeg rechten toe
 AddExportProfiles=Voeg exporteer-profiel toe
 AddImportProfiles=Voeg importeer-profiel toe
 AddOtherPagesOrServices=Voeg andere pagina's of diensten toe
-AddModels=Add document or numbering templates
+AddModels=Voeg document of genummerde templates toe
 AddSubstitutions=Voeg vervangende toetscombinaties toe
 DetectionNotPossible=Detectie is niet mogelijk
 UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
+ListOfAvailableAPIs=Lijst beschikbare APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
 LandingPage=Startpagina
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Linker marge op PDF
 MAIN_PDF_MARGIN_RIGHT=Rechter marge op PDF
 MAIN_PDF_MARGIN_TOP=Bovenmarge op PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 3207dee8080..d7dc3c5e1cb 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -12,7 +12,7 @@ Event=Actie
 Events=Gebeurtenissen
 EventsNb=Aantal gebeurtenissen
 ListOfActions=Gebeurtenissenlijst
-EventReports=Event reports
+EventReports=Overzicht gebeurtenissen
 Location=Locatie
 ToUserOfGroup=Naar elke gebruiker in deze groep
 EventOnFullDay=Gebeurtenis volledige dag
@@ -35,7 +35,7 @@ AgendaAutoActionDesc= Definieer hier een gebeurtenis waar Dolibarr deze automati
 AgendaSetupOtherDesc= Op deze pagina kunt u andere instellingen van de agendamodule instellen.
 AgendaExtSitesDesc=Op deze pagina kunt configureren externe agenda.
 ActionsEvents=Gebeurtenissen waarvoor Dolibarr automatisch een item zal maken in de agenda
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
+EventRemindersByEmailNotEnabled=Herinneringen via e-mail van agenda afspraken is niet aangezet in de module set-up van het Agenda onderdeel.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Derde partij %s aangemaakt
 ContractValidatedInDolibarr=Contract %s gevalideerd
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Lid %s gevalideerd
 MemberModifiedInDolibarr=Lid %s gewijzigd
 MemberResiliatedInDolibarr=Lidmaatschap %s beëindigd
 MemberDeletedInDolibarr=Lid %s verwijderd
-MemberSubscriptionAddedInDolibarr=Abonnement voor lid %s toegevoegd
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Verzending %s gevalideerd
 ShipmentClassifyClosedInDolibarr=Verzending %s geclassificeerd als gefactureerd
 ShipmentUnClassifyCloseddInDolibarr=Verzending %s geclassificeerd als heropend
@@ -67,7 +69,7 @@ OrderApprovedInDolibarr=Bestel %s goedgekeurd
 OrderRefusedInDolibarr=Order %s is geweigerd
 OrderBackToDraftInDolibarr=Bestel %s terug te gaan naar ontwerp-status
 ProposalSentByEMail=Offerte %s verzonden per e-mail
-ContractSentByEMail=Contract %s sent by EMail
+ContractSentByEMail=Contract %s verstuurd per e-mail
 OrderSentByEMail=Afnemersopdracht %s verzonden per e-mail
 InvoiceSentByEMail=Afnemersfactuur %s verzonden per e-mail
 SupplierOrderSentByEMail=Leveranciersopdracht %s verzonden per e-mail
@@ -78,17 +80,17 @@ InterventionSentByEMail=Interventie %s via mail verzonden
 ProposalDeleted=Voorstel verwijderd
 OrderDeleted=Bestelling verwijderd
 InvoiceDeleted=Factuur verwijderd
-PRODUCT_CREATEInDolibarr=Product %s created
-PRODUCT_MODIFYInDolibarr=Product %s modified
-PRODUCT_DELETEInDolibarr=Product %s deleted
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PRODUCT_CREATEInDolibarr=Product %s aangemaakt
+PRODUCT_MODIFYInDolibarr=Product %s aangepast
+PRODUCT_DELETEInDolibarr=Product %s verwijderd
+EXPENSE_REPORT_CREATEInDolibarr=Overzicht van kosten %s aangemaakt 
+EXPENSE_REPORT_VALIDATEInDolibarr=Kosten rapportage %s goedgekeurd
+EXPENSE_REPORT_APPROVEInDolibarr=Overzicht van kosten %s goedgekeurd
+EXPENSE_REPORT_DELETEInDolibarr=Overzicht van kosten %s verwijderd
+EXPENSE_REPORT_REFUSEDInDolibarr=Kosten rapportage %s afgekeurd
 PROJECT_CREATEInDolibarr=Project %s gecreëerd
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
+PROJECT_MODIFYInDolibarr=Project %s aangepast
+PROJECT_DELETEInDolibarr=Project %s verwijderd
 ##### End agenda events #####
 AgendaModelModule=Document sjablonen voor evenement
 DateActionStart=Startdatum
@@ -97,7 +99,8 @@ AgendaUrlOptions1=U kunt ook de volgende parameters gebruiken om te filteren:
 AgendaUrlOptions3=<b>login=%s</b> om uitvoer van acties gedaan door gebruiker <b>%s</b> te beperken.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> om uitvoer van acties toegewezen aan project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Verjaardagen van contacten weergeven
 AgendaHideBirthdayEvents=Verjaardagen van contacten verbergen
 Busy=Bezig
@@ -109,7 +112,7 @@ ExportCal=Export kalender
 ExtSites=Externe agenda
 ExtSitesEnableThisTool=Toon externe kalenders (gedefinieerd in de globale setup) in de agenda. Heeft geen invloed op de externe agenda's gedefinieerd door gebruikers.
 ExtSitesNbOfAgenda=Aantal kalenders
-AgendaExtNb=Kalender nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL aan. Ical bestand te openen
 ExtSiteNoLabel=Geen omschrijving
 VisibleTimeRange=Zichtbare werktijd
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index e4086f1c7bd..9cd205da8e5 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Terugbetaald
 DeletePayment=Betaling verwijderen
 ConfirmDeletePayment=Weet u zeker dat u deze betaling wilt verwijderen?
 ConfirmConvertToReduc=Will u deze %s converteren naar een absolute korting?<br>Het bedrag zal worden verspreid over alle kortingen en kan worden gebruikt als een korting voor een bestaande of toekomstige factuur voor deze klant.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Leveranciersbetalingen
 ReceivedPayments=Ontvangen betalingen
 ReceivedCustomersPayments=Ontvangen betalingen van afnemers
@@ -81,7 +82,7 @@ PaymentMode=Betalingstype
 PaymentTypeDC=Debet / Kredietkaart
 PaymentTypePP=PayPal
 IdPaymentMode=Betalingstype (Id)
-CodePaymentMode=Payment type (code)
+CodePaymentMode=Soort betaling (code)
 LabelPaymentMode=Betalingstype (label)
 PaymentModeShort=Betalingstype
 PaymentTerm=Betalingstermijn
@@ -91,7 +92,7 @@ PaymentAmount=Betalingsbedrag
 ValidatePayment=Valideer deze betaling
 PaymentHigherThanReminderToPay=Betaling hoger dan herinnering te betalen
 HelpPaymentHigherThanReminderToPay=Pas op, het bedrag van een of meerdere betalingen is hoger is dan de uitstaande factuur. <br> Corrigeer uw invoer, of anders bevestigen en na denken over het verlenen van een krediet van te veel betaald bij het afsluiten van elke betaalde factuur.
-HelpPaymentHigherThanReminderToPaySupplier=Opgelet, het bedrag van de betaling van een of meer facturen is hoger dan het te betalen.<br> Wijzigen of toch bevestigen.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Klassificeer 'betaald'
 ClassifyPaidPartially=Classificeer 'gedeeltelijk betaald'
 ClassifyCanceled=Classificeer 'verlaten'
@@ -110,6 +111,7 @@ DoPayment=Geef betaling in
 DoPaymentBack=Geef terugstorting in
 ConvertToReduc=Omzetten in een toekomstige korting
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in
 EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in
 DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan nul
@@ -119,12 +121,12 @@ StatusOfGeneratedInvoices=Status van gegenereerde facturen
 BillStatusDraft=Concept (moet worden gevalideerd)
 BillStatusPaid=Betaald
 BillStatusPaidBackOrConverted=Teruggestort of omgezet in korting
-BillStatusConverted=Omgezet in korting
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Verlaten
 BillStatusValidated=Gevalideerd (moet worden betaald)
 BillStatusStarted=Gestart
 BillStatusNotPaid=Niet betaald
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Niet terugbetaald
 BillStatusClosedUnpaid=Gesloten (onbetaald)
 BillStatusClosedPaidPartially=Betaald (gedeeltelijk)
 BillShortStatusDraft=Concept
@@ -135,7 +137,7 @@ BillShortStatusCanceled=Verlaten
 BillShortStatusValidated=Gevalideerd
 BillShortStatusStarted=Gestart
 BillShortStatusNotPaid=Niet betaald
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Niet terugbetaald
 BillShortStatusClosedUnpaid=Gesloten
 BillShortStatusClosedPaidPartially=Betaald (gedeeltelijk)
 PaymentStatusToValidShort=Te valideren
@@ -152,7 +154,7 @@ ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or ano
 BillFrom=Van
 BillTo=Geadresseerd aan
 ActionsOnBill=Acties op factuur
-RecurringInvoiceTemplate=Template / Recurring invoice
+RecurringInvoiceTemplate=Template / Factuurherhaling
 NoQualifiedRecurringInvoiceTemplateFound=Geen geschikte sjablonen gevonden voor terugkerende facturen
 FoundXQualifiedRecurringInvoiceTemplate=%s geschikte sjablonen gevonden voor terugkerende factu(u)r(en)
 NotARecurringInvoiceTemplate=Is geen template voor een herhalingsfactuur
@@ -220,6 +222,7 @@ RemainderToPayBack=Resterende bedrag terug te storten
 Rest=Hangende
 AmountExpected=Gevorderde bedrag
 ExcessReceived=Overbetaling
+ExcessPaid=Excess paid
 EscompteOffered=Korting aangeboden (betaling vóór termijn)
 EscompteOfferedShort=Korting
 SendBillRef=Stuur factuur %s
@@ -283,16 +286,20 @@ Deposit=Deposito / Borgsom
 Deposits=Deposito's
 DiscountFromCreditNote=Korting van creditnota %s
 DiscountFromDeposit=Betalingen van depositofactuur %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Dit soort krediet kan gebruikt worden op de factuur voorafgaande aan de validatie
 CreditNoteDepositUse=Om dit soort crediet te gebruiken moet deze factuur gevalideerd worden.
 NewGlobalDiscount=Nieuwe korting
 NewRelativeDiscount=Nieuwe relatiekorting
+DiscountType=Soort korting
 NoteReason=Notitie / Reden
 ReasonDiscount=Reden
 DiscountOfferedBy=Verleend door
 DiscountStillRemaining=Beschikbare kortingen
 DiscountAlreadyCounted=Reeds gebruikte kortingen
+CustomerDiscounts=Klantkorting
+SupplierDiscounts=Leverancierskorting
 BillAddress=Factuuradres
 HelpEscompte=Deze korting wordt toegekend aan de afnemer omdat de betaling werd gemaakt ruim voor de termijn.
 HelpAbandonBadCustomer=Dit bedrag is verlaten (afnemer beschouwt als slechte betaler) en wordt beschouwd als een buitengewoon verlies.
@@ -336,15 +343,15 @@ FrequencyPer_d=Elke %s dagen
 FrequencyPer_m=Elke %s maanden
 FrequencyPer_y=Elke %s jaar
 FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+toolTipFrequency=Voorbeeld: <br><b>Set 7, Dag</b>:Maak om de 7 dagen een nieuwe factuur <br><b>Set3, Dag</b>: Maak elke 3 maanden een nieuwe factuur
 NextDateToExecution=Datum voor aanmaak nieuwe factuur
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Aanmaakdatum laatste factuur
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Valideer facturen automatisch
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Datum nog niet bereikt
@@ -372,11 +379,11 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% voorschot, 50%% bij levering
 PaymentConditionShort10D=10 dagen
 PaymentCondition10D=10 dagen
-PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentConditionShort10DENDMONTH=Einde maand over 10 dagen
 PaymentCondition10DENDMONTH=Within 10 days following the end of the month
 PaymentConditionShort14D=14 dagen
 PaymentCondition14D=14 dagen
-PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentConditionShort14DENDMONTH=Einde maand over 14 dagen
 PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Vast bedrag
 VarAmount=Variabel bedrag  (%% tot.)
@@ -392,7 +399,7 @@ PaymentTypeShortCB=CreditCard
 PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeShortTIP=Betaling fooi
 PaymentTypeVAD=Internetbetaling
 PaymentTypeShortVAD=Internetbetaling
 PaymentTypeTRA=Bankcheque
@@ -459,7 +466,7 @@ Reported=Uitgestelde
 DisabledBecausePayments=Niet beschikbaar omdat er betalingen bestaan
 CantRemovePaymentWithOneInvoicePaid=Verwijder onmogelijk wanneer er minstens een factuur betaald is ingedeeld.
 ExpectedToPay=Verwachte betaling
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Kan een afgestemde betaling niet verwijderen
 PayedByThisPayment=Betaald door deze betaling
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classeer terugbetaalde creditnotas automatisch naar status &quot;Betaald&quot;.
@@ -521,3 +528,7 @@ BillCreated=%s rekening(en) gecreëerd
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Vanaf datum
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Tot datum
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index f7dd6afac48..a2c3e835c89 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -43,7 +43,8 @@ Individual=Particulier
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Moedermaatschappij
 Subsidiaries=Dochterondernemingen
-ReportByCustomers=Rapportage naar afnemers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Rapportage naar kwartaal
 CivilityCode=Aanspreekvorm
 RegisteredOffice=Statutaire zetel
@@ -75,10 +76,12 @@ Town=Plaats
 Web=Internetadres
 Poste= Functie
 DefaultLang=Standaard taal
-VATIsUsed=BTW wordt gebruikt
-VATIsNotUsed=BTW wordt niet gebruikt
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Zakelijke voorstellen / Offertes
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof. Id 3 (Douane code)
 ProfId4TN=Prof. id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=BTW-nummer
-VATIntraShort=BTW-nummer
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is geldig
+VATReturn=VAT return
 ProspectCustomer=Prospect / afnemer
 Prospect=Prospect
 CustomerCard=Afnemerskaart
 Customer=Afnemer
 CustomerRelativeDiscount=Kortingspercentage
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Kortingspercentage
 CustomerAbsoluteDiscountShort=Kortingsbedrag
 CompanyHasRelativeDiscount=Voor deze afnemer geldt een kortingspercentage van <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Voor deze afnemer geldt geen kortingspercentage
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Deze afnemer heeft nog creditnota's of eerder stortingen voor <b> %s %s</b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Voor deze afnemer is geen kortingsbedrag ingesteld
-CustomerAbsoluteDiscountAllUsers=Openstaande kortingsbedrag (toegekend aan alle gebruikers)
-CustomerAbsoluteDiscountMy=Mijn openstaande kortingsbedrag (toegekend aan uzelf)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Geen
 Supplier=Leverancier
 AddContact=Nieuwe contactpersoon
@@ -377,9 +390,9 @@ NoDolibarrAccess=Geen Dolibarr toegang
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contactpersonen en eigenschappen
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacten/adressen (al dan niet derde partijen) en eigenschappen
-ImportDataset_company_3=Bankgegevens
-ImportDataset_company_4=Third parties/Verkoopvertegenwoordiger (Beïnvloed verkoopvertegenwoordiging gebruikers naar bedrijven)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Prijsniveau
 DeliveryAddress=Afleveradres
 AddAddress=Adres toevoegen
@@ -406,15 +419,16 @@ ProductsIntoElements=Lijst producten/diensten in %s
 CurrentOutstandingBill=Huidige openstaande rekening
 OutstandingBill=Max. voor openstaande rekening
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Geeft een nummer als %syymm-nnnn voor afnemerscodes en %sjjmm-nnnn voor leverancierscodes waar jj het jaar is, mm de maand en nnnn een opeenvolgend nummer vanaf 0.
 LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te allen tijde worden gewijzigd.
 ManagingDirectors=Manager(s) Naam (CEO, directeur, voorzitter ...)
 MergeOriginThirdparty=Dupliceren third party (third party die u wilt verwijderen)
 MergeThirdparties=Samenvoegen third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Third parties zijn samengevoegd
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Vertegenwoordiger voornaam
 SaleRepresentativeLastname=Vertegenwoordiger achternaam
-ErrorThirdpartiesMerge=Er is iets fout gegaan tijdens verwijderen third parties. Check de log. Veranderingen zijn teruggedraaid.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 0bcf05e6bce..36efa28dc7e 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Facturatie | Betaling
 TaxModuleSetupToModifyRules=Ga naar <a href="%s">Belastingen module setup</a> om regels voor de berekening wijzigen
 TaxModuleSetupToModifyRulesLT=Ga naar <a href="%s">Bedrijf instellingen</a> om regels voor de berekening wijzigen
 OptionMode=Optie voor boekhouding
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Boekhouding Doc.
 AmountHTVATRealReceived=Netto ontvangen
 AmountHTVATRealPaid=Netto betaald
-VATToPay=BTW verkopen
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Betalingen
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Toon BTW-betaling
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Het bevat alle effectieve betalingen van afnemersfacturen.<br>- Het is gebaseerd op de betaaldatum van deze facturen<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Verslag van derden IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Verslag van derden IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Bevestigd door de klant btw geïnd en betaald
-VATReportByCustomersInDueDebtMode=Bevestigd door de klant btw geïnd en betaald
-VATReportByQuartersInInputOutputMode=Bevestigd door de klant btw geïnd en betaald
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Bevestigd door de klant btw geïnd en betaald
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Zie rapportage <b>%sBTW-inning%s</b> voor een standaard berekening
 SeeVATReportInDueDebtMode=Zie rapportage <b>%sBTW op doorstroming%s</b> voor een berekening met een optie op de doorstroming
 RulesVATInServices=- Voor diensten, het rapport bevat de BTW-regelgeving daadwerkelijk ontvangen of afgegeven op basis van de datum van betaling.
-RulesVATInProducts=- Voor materiële goederen, het bevat de btw-facturen op basis van de factuurdatum.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Voor diensten, het rapport is inclusief BTW vervallen facturen, betaald of niet, op basis van de factuurdatum.
-RulesVATDueProducts=- Voor materiële goederen, het bevat de btw-facturen, op basis van de factuurdatum.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Opmerking: Voor materiële activa, zou het gebruik moeten maken van de afleverdatum om eerlijker te zijn.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/factuur
 NotUsedForGoods=Niet gebruikt voor goederen
 ProposalStats=Statistieken over de voorstellen
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een <b>kas boukhoudings-modus</b> is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van <b>betrokkenheid accountancy-modus</b> (zie setup van boukhoud module).
 CalculationMode=Berekeningswijze
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Standaard grootboekrekening BTW te verrekenen - BTW op verkopen (indien niet opgegeven bij BTW instellingen)
-ACCOUNTING_VAT_BUY_ACCOUNT=Standaard grootboekrekening BTW inkopen (indien niet opgegeven bij BTW instellingen)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Standaard grootboekrekening BTW af te dragen
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 339f7afe0b4..5d39d79b394 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -37,13 +37,13 @@ CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
 CronFrequency=Frequentie
 CronClass=Class
-CronMethod=Methode
+CronMethod=Wijze
 CronModule=Module
 CronNoJobs=Geen taken opgenomen
 CronPriority=Prioriteit
 CronLabel=Naam
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Elke
 JobFinished=Taak gestart en be-eindigd
 #Page card
@@ -67,16 +67,17 @@ CronObjectHelp=The object name to load. <BR> For exemple to call the fetch metho
 CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
 CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
+CronCreateJob=Aanmaken nieuwe geplande taak
 CronFrom=Van
 # Info
 # Common
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell commando
-CronCannotLoadClass=Kan klasse %s of object %s niet laden
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index ea7a3785bae..b687a2692a4 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -39,12 +39,13 @@ ShowECMSection=Toon map
 DeleteSection=Verwijder map
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relatieve map voor bestanden
+CannotRemoveDirectoryContainsFilesOrDirs=Removed not possible because it contains some files or sub-directories
 CannotRemoveDirectoryContainsFiles=Verwijderen is niet mogelijk omdat het een aantal bestanden bevat
 ECMFileManager=Bestandsbeheer
-ECMSelectASection=Selecteer een map van de linker structuur
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+FileNotYetIndexedInDatabase=Bestand nog niet geïndexeerd in database (probeer deze opnieuw te uploaden)
 FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 74f09a12ab6..cc7f5b34966 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=De Dolibarr-LDAP installatie is niet compleet.
 ErrorLDAPMakeManualTest=Een .ldif bestand is gegenereerd in de map %s. Probeer het handmatig te laden vanuit een opdrachtregel om meer informatie over fouten te verkrijgen.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan een actie met de status "Nog niet gestart" niet opslaan als het veld "door" niet ook gevuld is.
 ErrorRefAlreadyExists=De referentie gebruikt voor het maken bestaat al
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Kan record niet verwijderen. Het wordt al gebruikt of opgenomen in een ander object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
 ErrorNewValueCantMatchOldValue=Nieuwe waarde kan niet gelijk is aan de oude
 ErrorFailedToValidatePasswordReset=Mislukt om wachtwoord opnieuw te initialiseren. Misschien werd de her-init al gedaan (deze link kan slechts een keer worden). Zo niet, probeer dan het her-init proces opnieuw te starten.
-ErrorToConnectToMysqlCheckInstance=Verbinding met de database mislukt. Controleer of Mysql server draait (in de meeste gevallen kunt u het programma starten vanaf de command line met 'sudo /etc/init.d/mysql start').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Mislukt om contact toe te voegen
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -164,11 +164,11 @@ ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock move
 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'
+ErrorGlobalVariableUpdater1=Niet geldig JSON formaat '%s'
+ErrorGlobalVariableUpdater2=Ontbrekende parameter '%s'
 ErrorGlobalVariableUpdater3=The requested data was not found in result
 ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
+ErrorGlobalVariableUpdater5=Geen globale variabele geselecteerd
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -223,9 +224,10 @@ WarningCloseAlways=Warning, closing is done even if amount differs between sourc
 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).
 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.
+WarningPaymentDateLowerThanInvoiceDate=Betaaldatum (%s) ligt vóór de factuurdatum (%s) van factuur%s
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
index 115d0991630..4c46e281c03 100644
--- a/htdocs/langs/nl_NL/exports.lang
+++ b/htdocs/langs/nl_NL/exports.lang
@@ -120,7 +120,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+ComputedField=Berekend veld
 ## filters
 SelectFilterFields=Vul hier de waarden in waarop je wil filteren.
 FilteredFields=Gefilterde velden
diff --git a/htdocs/langs/nl_NL/loan.lang b/htdocs/langs/nl_NL/loan.lang
index 51ce9f6f304..1e0da4d0202 100644
--- a/htdocs/langs/nl_NL/loan.lang
+++ b/htdocs/langs/nl_NL/loan.lang
@@ -1,53 +1,55 @@
 # Dolibarr language file - Source file is en_US - loan
 Loan=Lening
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-LoanPayment=Loan payment
-ShowLoanPayment=Show Loan Payment
+Loans=Leningen
+NewLoan=Nieuwe lening
+ShowLoan=Toon lening
+PaymentLoan=Aflossing
+LoanPayment=Aflossing
+ShowLoanPayment=Toon aflossingen
 LoanCapital=Kapitaal
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
+Insurance=Verzekering
+Interest=Rente
+Nbterms=Aantal termijnen
+LoanAccountancyCapitalCode=Tegenrekening Lening
+LoanAccountancyInsuranceCode=Tegenrekening verzekering
+LoanAccountancyInterestCode=Tegenrekening rente
+ConfirmDeleteLoan=Bevestigen verwijderen lening
+LoanDeleted=Lening verwijderd
 ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
+LoanPaid=Afgeloste lening
 # Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
+LoanCalc=Lening Calculator
+PurchaseFinanceInfo=Aankoop- en Financiering informatie
+SalePriceOfAsset=Onderliggende waarde
+PercentageDown=Lager percentage
+LengthOfMortgage=Duur lening
+AnnualInterestRate=Rente tarief
+ExplainCalculations=Verklaar berekeningen
+ShowMeCalculationsAndAmortization=Toon berekeningen en amortisatieschema
+MortgagePaymentInformation=Informatie hypotheekbetaling
+DownPayment=Aanbetaling
 DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
 InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
 MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
 MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
 MonthTermDesc=The <b>month term</b> 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
+MonthlyPaymentDesc=Het maandbedrag is tot stand gekomen door gebruik van de volgende formule
 AmortizationPaymentDesc=The <a href="#amortization">amortization</a> 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
+AmountFinanced=Gefinancierd bedrag
 AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
+Totalsforyear=Totalen per jaar
+MonthlyPayment=Maandelijks bedrag
 LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also 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.<br>
 GoToInterest=%s will go towards INTEREST
 GoToPrincipal=%s will go towards PRINCIPAL
 YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
+AddLoan=Aanmaken lening
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standaard grootboekrekening kapitaal
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standaard grootboekrekening rente
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standaard grootboekrekening verzekeringen
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 3cf5ab70822..e32217b1c53 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Gedeeltelijk verzonden
 MailingStatusSentCompletely=Volledig verzonden
 MailingStatusError=Fout
 MailingStatusNotSent=Niet verzonden
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailSuccessfulySent=E-mail berichten (%s tot %s) zijn geaccepteerd voor verzending
 MailingSuccessfullyValidated=Emailing succesvol gevalideerd
 MailUnsubcribe=Uitschrijven
 MailingStatusNotContact=Niet meer contacten
@@ -57,10 +57,10 @@ MailingAddFile=Voeg dit bestand bij
 NoAttachedFiles=Geen bijgevoegde bestanden
 BadEMail=Onjuiste waarde voor e-mail
 CloneEMailing=Kloon EMailing
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+ConfirmCloneEMailing=Weet u zeker dat u deze mailing wilt klonen?
 CloneContent=Kloon bericht
 CloneReceivers=Kloon ontvangers
-DateLastSend=Date of latest sending
+DateLastSend=Laatste verzendatum
 DateSending=Datum verzonden
 SentTo=Verzonden aan <b>%s</b>
 MailingStatusRead=Lezen
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -94,7 +95,7 @@ LineInFile=Regel %s in bestand
 RecipientSelectionModules=Gedefinieerde verzoeken om ontvangers te selecteren
 MailSelectedRecipients=Geselecteerde ontvangers
 MailingArea=EMailingsoverzicht
-LastMailings=Latest %s emailings
+LastMailings=Laatste %s e-mails
 TargetsStatistics=Geaddresseerdenstatistieken
 NbOfCompaniesContacts=Unieke contacten van bedrijven
 MailNoChangePossible=Ontvangers voor gevalideerde EMailings kunnen niet worden gewijzigd
@@ -115,7 +116,7 @@ DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=U kunt het <b>komma</b> scheidingsteken gebruiken om meerdere ontvangers te specificeren.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Uitschrijf link
-TagSignature=Signature of sending user
+TagSignature=Ondertekening verzendende gebruiker
 EMailRecipient=Ontvanger e-mail
 TagMailtoEmail=Recipient EMail (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
@@ -131,11 +132,11 @@ MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
 YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
+NbOfTargetedContacts=Aantal geselecteerde contact e-mailadressen
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index c4145d16aa2..dccbd1ba9ef 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -15,7 +15,7 @@ FormatDateShortJavaInput=dd-MM-yyyy
 FormatDateShortJQuery=dd-mm-yy
 FormatDateShortJQueryInput=dd-mm-yy
 FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M
+FormatHourShort=%H:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s is niet gedefinieerd
 ErrorUnknown=Onbekende fout
 ErrorSQL=SQL fout
 ErrorLogoFileNotFound=Logobestand '%s' is niet gevonden
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Ga naar Bedrijf/Organisatie instellingen om dit te herstellen
 ErrorGoToModuleSetup=Ga naar Moduleinstellingen om dit te corrigeren
 ErrorFailedToSendMail=Mail versturen mislukt (afzender=%s, ontvanger=%s)
 ErrorFileNotUploaded=Bestand is niet geüploadet. Controleer of de grootte niet meer is dan maximaal toegestaan, of er vrije ruimte beschikbaar is op de schijf en of er niet al een bestand met dezelfde naam in deze map bestaat.
@@ -64,19 +64,21 @@ ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land '%s'.
 ErrorNoSocialContributionForSellerCountry=Fout, geen sociale/fiscale belastingtypen gedefinieerd voor land '%s'.
 ErrorFailedToSaveFile=Fout, bestand opslaan mislukt.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=U bent hiervoor niet bevoegd.
 SetDate=Stel datum in
 SelectDate=Selecteer een datum
 SeeAlso=Zie ook %s
 SeeHere=Zie hier
+ClickHere=Klik hier
+Here=Here
 Apply=Toepassen
 BackgroundColorByDefault=Standaard achtergrondkleur
 FileRenamed=The file was successfully renamed
 FileGenerated=Het bestand is succesvol aangemaakt
 FileSaved=The file was successfully saved
 FileUploaded=Het bestand is geüpload
-FileTransferComplete=File(s) was uploaded successfully
+FileTransferComplete=Bestand(en) succesvol geupload
 FilesDeleted=File(s) successfully deleted
 FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geüploadet. Klik hiervoor op "Bevestig dit bestand".
 NbOfEntries=Aantal invoeringen
@@ -97,10 +99,10 @@ PreviousConnexion=Laatste keer ingelogd
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Aangesloten bij Meervoudig bedrijf
 ConnectedSince=Aangesloten sinds
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+AuthenticationMode=Authentificatie modus
+RequestedUrl=Gezochte URL
 DatabaseTypeManager=Database Type Manager
-RequestLastAccessInError=Latest database access request error
+RequestLastAccessInError=Database fout bij laatste verzoek
 ReturnCodeLastAccessInError=Return code for latest database access request error
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr heeft een technische fout gedetecteerd
@@ -114,7 +116,7 @@ NotePrivate=Notitie (privé)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr is geconfigureerd om de precisie van de stuksprijzen op <b>%s</b> decimalen te beperken.
 DoTest=Test
 ToFilter=Filter
-NoFilter=No filter
+NoFilter=Geen filter
 WarningYouHaveAtLeastOneTaskLate=Let op, u heeft minstens een vertraagd element dat de getolereerde vertraging heeft overschreden.
 yes=ja
 Yes=Ja
@@ -160,7 +162,7 @@ Edit=Bewerken
 Validate=Valideer
 ValidateAndApprove=Valideren en goedkeuren
 ToValidate=Te valideren
-NotValidated=Not validated
+NotValidated=Niet gevalideerd
 Save=Opslaan
 SaveAs=Opslaan als
 TestConnection=Test verbinding
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Selecteer
 Choose=Kies
 Resize=Schalen
+ResizeOrCrop=Resize or Crop
 Recenter=Hercentreer
 Author=Auteur
 User=Gebruiker
@@ -216,8 +219,8 @@ Info=Info
 Family=Familie
 Description=Omschrijving
 Designation=Omschrijving
-Model=Doc template
-DefaultModel=Default doc template
+Model=Document sjabloon
+DefaultModel=Standaard document sjabloon
 Action=Actie
 About=Over
 Number=Aantal
@@ -241,14 +244,14 @@ HourStart=Start uur
 Date=Datum
 DateAndHour=Datum en uur
 DateToday=Huidige datum
-DateReference=Reference date
+DateReference=Referentiedatum
 DateStart=Begindatum
 DateEnd=Einddatum
 DateCreation=Aanmaakdatum
 DateCreationShort=Aanmaakdatum
 DateModification=Wijzigingsdatum
 DateModificationShort=Wijzigingsdatum
-DateLastModification=Latest modification date
+DateLastModification=Laatste wijzigingsdatum
 DateValidation=Validatiedatum
 DateClosing=Sluitingsdatum
 DateDue=Vervaldatum
@@ -264,8 +267,8 @@ DatePayment=Datum van betaling
 DateApprove=Goedkeurings datum
 DateApprove2=Goedkeurings datum (tweede goedkeuring)
 RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
+UserCreation=Aanmaken gebruiker
+UserModification=Wijzigen gebruiker
 UserValidation=Validation user
 UserCreationShort=Gebruiker aanmaken
 UserModificationShort=Gebruiker wijzigen
@@ -304,7 +307,7 @@ MonthOfDay=Maand van de dag
 HourShort=U
 MinuteShort=mn
 Rate=Tarief
-CurrencyRate=Currency conversion rate
+CurrencyRate=Valuta omrekening
 UseLocalTax=Inclusief btw
 Bytes=Bytes
 KiloBytes=KiloBytes
@@ -325,8 +328,10 @@ Default=Standaard
 DefaultValue=Standaardwaarde
 DefaultValues=Default values
 Price=Prijs
+PriceCurrency=Price (currency)
 UnitPrice=Eenheidsprijs
 UnitPriceHT=Eenheidsprijs (netto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Eenheidsprijs (bruto)
 PriceU=E.P.
 PriceUHT=EP (netto)
@@ -334,18 +339,19 @@ PriceUHTCurrency=Valuta
 PriceUTTC=U.P. (inc. belasting)
 Amount=Hoeveelheid
 AmountInvoice=Factuurbedrag
+AmountInvoiced=Amount invoiced
 AmountPayment=Betalingsbedrag
 AmountHTShort=Bedrag ex. BTW
 AmountTTCShort=Bedrag met BTW
 AmountHT=Bedrag (exclusief BTW)
 AmountTTC=Bedrag (incl. BTW)
 AmountVAT=Bedrag BTW
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
+MulticurrencyAlreadyPaid=Reeds betaald, originele valuta
+MulticurrencyRemainderToPay=Rest openstaand, originele valuta
 MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAmountHT=Nettobedrag, oorspronkelijke valuta
+MulticurrencyAmountTTC=Bedrag (incl. BTW), oorspronkelijke valuta
+MulticurrencyAmountVAT=BTW bedrag, oorspronkelijke valuta
 AmountLT1=Bedrag tax 2
 AmountLT2=Bedrag tax 3
 AmountLT1ES=Bedrag RE
@@ -353,11 +359,12 @@ AmountLT2ES=Bedrag IRPF
 AmountTotal=Totaal bedrag
 AmountAverage=Gemiddeld bedrag
 PriceQtyMinHT=Prijs hoeveelheid min. (exclusief BTW)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Totaal
 SubTotal=Subtotaal
 TotalHTShort=Totaal excl. BTW
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Totaal netto (in valuta)
 TotalTTCShort=Totaal incl. BTW
 TotalHT=Totaal excl. BTW
 TotalHTforthispage=Totaal (na belastingen) voor deze pagina
@@ -389,11 +396,13 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=BTW-tarief
-DefaultTaxRate=Default tax rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=BTW tarief
 Average=Gemiddeld
 Sum=Som
 Delta=Variantie
-Module=Module/Application
+Module=Module/Applicatie
 Modules=Modules/Applications
 Option=Optie
 List=Lijstoverzicht
@@ -415,11 +424,12 @@ ActionsToDoShort=Te doen
 ActionsDoneShort=Uitgevoerd
 ActionNotApplicable=Niet van toepassing
 ActionRunningNotStarted=Niet gestart
-ActionRunningShort=In progress
+ActionRunningShort=Reeds bezig
 ActionDoneShort=Uitgevoerd
 ActionUncomplete=Onvolledig
 LatestLinkedEvents=Latest %s linked events
 CompanyFoundation=Bedrijf/Organisatie
+Accountant=Accountant
 ContactsForCompany=Bedrijfscontacten
 ContactsAddressesForCompany=Contacten / adressen voor deze relatie
 AddressesForCompany=Adressen voor deze relatie
@@ -427,6 +437,9 @@ ActionsOnCompany=Acties voor bedrijf
 ActionsOnMember=Events over dit lid
 ActionsOnProduct=Events about this product
 NActionsLate=%s is laat
+ToDo=Te doen
+Completed=Completed
+Running=Reeds bezig
 RequestAlreadyDone=Aanvraag reeds opgenomen
 Filter=Filter
 FilterOnInto=Zoekcriteria '<strong>%s</strong>' in velden %s
@@ -438,8 +451,8 @@ Generate=Genereer
 Duration=Duur
 TotalDuration=Totale duur
 Summary=Samenvatting
-DolibarrStateBoard=Database statistics
-DolibarrWorkBoard=Open items dashboard
+DolibarrStateBoard=Database statistieken
+DolibarrWorkBoard=Te verwerken items in dashboard
 NoOpenedElementToProcess=No opened element to process
 Available=Beschikbaar
 NotYetAvailable=Nog niet beschikbaar
@@ -571,7 +584,7 @@ ReportName=Rapportnaam
 ReportPeriod=Periode-analyse
 ReportDescription=Omschrijving
 Report=Verslag
-Keyword=Keyword
+Keyword=Trefwoord
 Origin=Origineel
 Legend=Legende
 Fill=Invullen
@@ -589,7 +602,7 @@ NbOfThirdParties=Aantal derden
 NbOfLines=Aantal regels
 NbOfObjects=Aantal objecten
 NbOfObjectReferers=Number of related items
-Referers=Related items
+Referers=Gerelateerde items
 TotalQuantity=Totale hoeveelheid
 DateFromTo=Van %s naar %s
 DateFrom=Vanaf %s
@@ -625,7 +638,7 @@ Priority=Prioriteit
 SendByMail=Verzend per mail
 MailSentBy=E-mail verzonden door
 TextUsedInTheMessageBody=E-mailinhoud
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=Stuur e-mail ter bevestiging
 SendMail=Verzend e-mail
 EMail=E-mail
 NoEMail=Geen e-mail
@@ -642,11 +655,11 @@ ValueIsValid=Prijs is geldig
 ValueIsNotValid=Waarde is niet geldig
 RecordCreatedSuccessfully=Record succesvol aangemaakt
 RecordModifiedSuccessfully=Tabelregel succesvol gewijzigd
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
+RecordsModified=Tabelregel %s bijgewerkt
+RecordsDeleted=%s records verwijderd
 AutomaticCode=Automatische code
 FeatureDisabled=Functie uitgeschakeld
-MoveBox=Move widget
+MoveBox=Verplaats widget
 Offered=Beschikbaar
 NotEnoughPermissions=U heeft geen toestemming voor deze actie
 SessionName=Sessienaam
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Let op, u bevind zich in de onderhoudmodus, dus a
 CoreErrorTitle=Systeemfout
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=CreditCard
+ValidatePayment=Valideer deze betaling
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Velden met een <b>%s</b> zijn verplicht
 FieldsWithIsForPublic=Velden gemarkeerd door <b>%s</b> zullen worden geplaatst op de openbare lijst van de leden. Indien u dat niet wenst, schakelt u de toegang "publiek" uit.
 AccordingToGeoIPDatabase=(verkregen door conversie GeoIP)
@@ -766,14 +781,14 @@ Deductible=Aftrekbaar
 from=van
 toward=richting
 Access=Toegang
-SelectAction=Select action
-SelectTargetUser=Select target user/employee
+SelectAction=Maak keuze
+SelectTargetUser=Kies gebruiker/medewerker
 HelpCopyToClipboard=Gebruik Ctrl + C om te kopiëren naar het klembord
 SaveUploadedFileWithMask=Sla het bestand op de server met de naam "<strong>%s</strong>" (anders "%s")
 OriginFileName=Oorspronkelijke bestandsnaam
 SetDemandReason=Stel bron in
 SetBankAccount=Definieer Bank Rekening
-AccountCurrency=Account currency
+AccountCurrency=Rekening Valuta
 ViewPrivateNote=Notities bekijken
 XMoreLines=%s regel(s) verborgen
 ShowMoreLines=Show more/less lines
@@ -781,7 +796,7 @@ PublicUrl=Openbare URL
 AddBox=Box toevoegen
 SelectElementAndClick=Select an element and click %s
 PrintFile=Bestand afdrukken %s
-ShowTransaction=Show entry on bank account
+ShowTransaction=Toon bankmutatie
 ShowIntervention=Tonen tussenkomst
 ShowContract=Toon contract
 GoIntoSetupToChangeLogo=Ga naar Home - Setup - Bedrijf om logo te wijzigen of ga naar Home - Instellingen - Scherm om te verbergen.
@@ -798,7 +813,7 @@ Hello=Hallo
 GoodBye=GoodBye
 Sincerely=Oprecht
 DeleteLine=Verwijderen regel
-ConfirmDeleteLine=Are you sure you want to delete this line?
+ConfirmDeleteLine=Weet u zeker dat u deze regel wilt verwijderen?
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
 TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=Geen record geselecteerd
@@ -808,30 +823,30 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classificeer als gefactureerd
+ClassifyUnbilled=Classify unbilled
 Progress=Voortgang
-ClickHere=Klik hier
 FrontOffice=Front office
 BackOffice=Back office
 View=Bekijk
 Export=Export
 Exports=Export
-ExportFilteredList=Export filtered list
+ExportFilteredList=Exporteren gefilterde lijst
 ExportList=Exporteer lijst
 ExportOptions=Exporteeropties
 Miscellaneous=Diversen
 Calendar=Kalender
 GroupBy=Sorteer op
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
+ViewFlatList=Weergeven als lijst
+RemoveString='%s' string verwijderen
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link (public/external)
+DirectDownloadLink=Directe download link (openbaar/extern)
 DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
-Download=Download
+Download=Downloaden
 DownloadDocument=Download document
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Bijwerken valutakoers
 Fiscalyear=Boekjaar
-ModuleBuilder=Module Builder
-SetMultiCurrencyCode=Set currency
+ModuleBuilder=Module ontwerper
+SetMultiCurrencyCode=Kies valuta
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 WebSite=Web site
@@ -840,7 +855,7 @@ WebSiteAccounts=Web site accounts
 ExpenseReport=Expense report
 ExpenseReports=Onkostennota's 
 HR=HR
-HRAndBank=HR and Bank
+HRAndBank=HR en Bank
 AutomaticallyCalculated=Automatisch berekend
 TitleSetToDraft=Go back to draft
 ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projecten
 Rights=Rechten
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Maandag
 Tuesday=Dinsdag
@@ -880,7 +897,7 @@ ShortThursday=Do
 ShortFriday=Vr
 ShortSaturday=Za
 ShortSunday=Zo
-SelectMailModel=Select an email template
+SelectMailModel=Selecteer een e-mail template
 SetRef=Stel ref in
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Geen resultaat gevonden
@@ -890,7 +907,7 @@ Select2MoreCharacters=of meer karakters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Laad meer resultaten...
 Select2SearchInProgress=Zoeken...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Klant
 SearchIntoContacts=Contacten
 SearchIntoMembers=Leden
 SearchIntoUsers=Gebruikers
@@ -905,7 +922,7 @@ SearchIntoCustomerProposals=Klantenoffertes
 SearchIntoSupplierProposals=Leveranciersoffertes
 SearchIntoInterventions=Interventies
 SearchIntoContracts=Contracten
-SearchIntoCustomerShipments=Customer shipments
+SearchIntoCustomerShipments=Klantzendingen
 SearchIntoExpenseReports=Onkostennota's 
 SearchIntoLeaves=Leaves
 CommentLink=Opmerkingen
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Iedereen
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Geaffecteerden
diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang
index c35d4847fc4..27b981ebed1 100644
--- a/htdocs/langs/nl_NL/margins.lang
+++ b/htdocs/langs/nl_NL/margins.lang
@@ -20,17 +20,17 @@ UserMargins=Gebruiker marges
 ProductService=Trainning of Dienst
 AllProducts=Alle Trainingen en Diensten
 ChooseProduct/Service=Kies Training of Dienst
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNull=Forceren inkoop/kostprijs naar verkoopprijs als dit niet is gedefinieerd
 ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
 MARGIN_METHODE_FOR_DISCOUNT=Marge methode voor globale discounts
 UseDiscountAsProduct=Als een training
 UseDiscountAsService=Als een dienst
 UseDiscountOnTotal=Op subtotaal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definieert als een globale discount wordt behandelt als een training, een dienst, of alleen een subtotaal voor marge berekening.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
+MARGIN_TYPE=Inkoop/kostprijs voorgesteld al standaard bij margeberekening
+MargeType1=Marge op gunstigste inkoopprijs
+MargeType2=Marge op gewogen inkoopprijs 
+MargeType3=Marge inkoopprijs
 MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Kostprijs
 UnitCharges=Unit toeslag
@@ -40,5 +40,5 @@ AgentContactTypeDetails=Definiëren welk contact type (gekoppeld aan facturen) z
 rateMustBeNumeric=Tarief moet een numerieke waarde zijn
 markRateShouldBeLesserThan100=Markeer tarief moet lager zijn dan 100 zijn
 ShowMarginInfos=Toon marge info
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+CheckMargins=Marge details
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 1cd17e1d894..072a0ee2803 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Lijst van gevalideerde openbare leden
 ErrorThisMemberIsNotPublic=Dit lid is niet openbaar
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Een ander lid <b>(naam: %s, login: %s)</b> is al gekoppeld aan een derde partij <b>%s</b>. Verwijder deze link eerst omdat een derde partij niet kan worden gekoppeld aan slechts een lid (en vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Om veiligheidsredenen, moeten aan u rechten worden verleend voor het bewerken van alle gebruikers om in staat te zijn een lid te koppelen aan een gebruiker die niet van u is.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Inhoud van uw lidmaatschapskaart
 SetLinkToUser=Link naar een Dolibarr gebruiker
 SetLinkToThirdParty=Link naar een derde partij in Dolibarr
 MembersCards=Visitekaarten van leden
@@ -23,13 +21,13 @@ MembersListToValid=Lijst van conceptleden (te valideren)
 MembersListValid=Lijst van geldige leden
 MembersListUpToDate=Lijst van geldige leden met een geldig lidmaatschap
 MembersListNotUpToDate=Lijst van geldige leden met een verlopen lidmaatschap
-MembersListResiliated=List of terminated members
+MembersListResiliated=Lijst verwijderde leden
 MembersListQualified=Lijst van gekwalificeerde leden
 MenuMembersToValidate=Conceptleden
 MenuMembersValidated=Gevalideerde leden
 MenuMembersUpToDate=Bijgewerkte leden
 MenuMembersNotUpToDate=Niet bijgewerkte leden
-MenuMembersResiliated=Terminated members
+MenuMembersResiliated=Verwijderde leden
 MembersWithSubscriptionToReceive=Leden die abonnement moeten ontvangen
 DateSubscription=Inschrijvingsdatum
 DateEndSubscription=Einddatum abonnement
@@ -45,14 +43,14 @@ MemberStatusDraft=Concept (moet worden gevalideerd)
 MemberStatusDraftShort=Ontwerp
 MemberStatusActive=Gevalideerd (wachtend op abonnement)
 MemberStatusActiveShort=Gevalideerd
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=Abonnement verlopen
 MemberStatusActiveLateShort=Verlopen
 MemberStatusPaid=Abonnement bijgewerkt
 MemberStatusPaidShort=Bijgewerkt
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusResiliated=Verwijderd lid
+MemberStatusResiliatedShort=Verwijderd
 MembersStatusToValid=Conceptleden
-MembersStatusResiliated=Terminated members
+MembersStatusResiliated=Verwijderde leden
 NewCotisation=Nieuwe bijdrage
 PaymentSubscription=Nieuwe bijdragebetaling
 SubscriptionEndDate=Einddatum abonnement
@@ -81,7 +79,7 @@ Physical=Fysiek
 Moral=Moreel
 MorPhy=Moreel / Fysiek
 Reenable=Opnieuw inschakelen
-ResiliateMember=Terminate a member
+ResiliateMember=Verwijder een lid
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Lid verwijderen
 ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
@@ -92,33 +90,49 @@ ValidateMember=Valideer een lid
 ConfirmValidateMember=Are you sure you want to validate this member?
 FollowingLinksArePublic=De volgende links zijn publieke pagina's die niet beschermd worden door Dolibarr. Het zijn niet opgemaakte voorbeeldpagina's om te tonen hoe de ledenlijst database eruit ziet.
 PublicMemberList=Publieke ledenlijst
-BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionForm=Abonnement aanmeldformulier (openbaar)
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
 EnablePublicSubscriptionForm=Enable the public website with self-subscription form
 ForceMemberType=Force the member type
 ExportDataset_member_1=Leden en abonnementen
 ImportDataset_member_1=Leden
-LastMembersModified=Latest %s modified members
+LastMembersModified=Laatste %s gewijzigde leden
 LastSubscriptionsModified=Latest %s modified subscriptions
 String=String
 Text=Tekst
 Int=Numeriek
 DateAndTime=Datum en tijd
 PublicMemberCard=Publieke lidmaatschapskaart
-SubscriptionNotRecorded=Subscription not recorded
+SubscriptionNotRecorded=Abonnement niet vastgelegd
 AddSubscription=Creëer abonnement
 ShowSubscription=Toon abonnement
-SendAnEMailToMember=Stuur een informatieve e-mail naar lid
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Inhoud van uw lidmaatschapskaart
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Onderwerp van de e-mail ontvangen door automatische inschrijving van een gast
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail ontvangen door automatische inschrijving van een gast
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Onderwerp van de e-mail verzonden als een automatische inschrijving
-DescADHERENT_AUTOREGISTER_MAIL=Mail verzonden als een automatische inschrijving
-DescADHERENT_MAIL_VALID_SUBJECT=Email onderwerp voor de lidvalidatie
-DescADHERENT_MAIL_VALID=E-mail voor lid validatie
-DescADHERENT_MAIL_COTIS_SUBJECT=E-mailonderwerp voor de inschrijving
-DescADHERENT_MAIL_COTIS=E-mail voor abonnement
-DescADHERENT_MAIL_RESIL_SUBJECT=E-mailonderwerp voor uitschrijving van leden
-DescADHERENT_MAIL_RESIL=E-mail voor uitschrijving van leden
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=E-mailafzender voor automatische e-mails
 DescADHERENT_ETIQUETTE_TYPE=Etikettenformaat
 DescADHERENT_ETIQUETTE_TEXT=Tekst op leden adres-blad
@@ -133,8 +147,8 @@ NoThirdPartyAssociatedToMember=Geen derde partijen geassocieerd aan dit lid
 MembersAndSubscriptions= Leden en Abonnementen
 MoreActions=Aanvullende acties bij inschrijving
 MoreActionsOnSubscription=Bijkomende aktie die standaard wordt voorgesteld bij registratie van een inschrijving
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankDirect=Aanmaken boeking in bankboek
+MoreActionBankViaInvoice=Aanmaken factuur en betaling in bankboek
 MoreActionInvoiceOnly=Creëer een factuur zonder betaling
 LinkToGeneratedPages=Genereer visitekaartjes
 LinkToGeneratedPagesDesc=Met behulp van dit scherm kunt u PDF-bestanden genereren met visitekaartjes voor al uw leden of een bepaald lid.
@@ -177,3 +191,8 @@ NoVatOnSubscription=Geen BTW bij inschrijving
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product gebruikt voor abbonement regel in factuur: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 8104651bd02..0ae2b4e42a8 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -5,11 +5,11 @@ EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use upp
 ModuleBuilderDesc2=Path where modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
+NewModule=Nieuwe module
 NewObject=New object
 ModuleKey=Module key
 ObjectKey=Object key
-ModuleInitialized=Module initialized
+ModuleInitialized=Module geïnitialiseerd
 FilesForObjectInitialized=Files for new object '%s' initialized
 FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
 ModuleBuilderDescdescription=Enter here all general information that describe your module.
@@ -26,7 +26,7 @@ EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files relat
 DangerZone=Danger zone
 BuildPackage=Build package/documentation
 BuildDocumentation=Build documentation
-ModuleIsNotActive=This module was not activated yet. Go into %s to make it live or click here:
+ModuleIsNotActive=Module is nog niet geactiveerd. Ga naar %s om deze te activeren of klik hier:
 ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
 DescriptionLong=Long description
 EditorName=Name of editor
@@ -42,7 +42,9 @@ PageForNoteTab=PHP page for note tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
+FileNotYetGenerated=Bestand nog niet aangemaakt
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 9f2c0d95b3f..76e1857d38b 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -10,22 +10,24 @@ DateToBirth=Geboortedatum
 BirthdayAlertOn=Verjaardagskennisgeving actief
 BirthdayAlertOff=Verjaardagskennisgeving inactief
 TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+MonthOfInvoice=Maand (nummer 1-12) van factuurdatum
+TextMonthOfInvoice=Maand (tekst) van factuurdatum
+PreviousMonthOfInvoice=Vorige maand (nummer 1-12) van factuurdatum
+TextPreviousMonthOfInvoice=Voorgaande maand (tekst) van factuurdatum.
+NextMonthOfInvoice=Volgende maand (nummer 1-12) van factuurdatum
+TextNextMonthOfInvoice=Volgende maand (tekst) van factuurdatum
+ZipFileGeneratedInto=ZIP bestand aangemaakt in <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Bericht opde  bevestigingspagina van een gevalideerde betaling
 MessageKO=Bericht op de bevestigingspagina van een geannuleerde betaling
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
+YearOfInvoice=Jaar van factuurdatum
+PreviousYearOfInvoice=Voorgaand jaar van factuurdatum
+NextYearOfInvoice=Volgend jaar van factuurdatum
 DateNextInvoiceBeforeGen=Date of next invoice (before generation)
 DateNextInvoiceAfterGen=Date of next invoice (after generation)
 
@@ -63,7 +65,7 @@ Notify_SHIPPING_SENTBYMAIL=Verzenden per e-mail
 Notify_MEMBER_VALIDATE=Lid gevalideerd
 Notify_MEMBER_MODIFY=Lid gewijzigd
 Notify_MEMBER_SUBSCRIPTION=Lid ingeschreven
-Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_RESILIATE=Lid verwijderd
 Notify_MEMBER_DELETE=Lid verwijderd
 Notify_PROJECT_CREATE=Creatie project
 Notify_TASK_CREATE=Taak gemaakt
@@ -78,11 +80,11 @@ LinkedObject=Gekoppeld object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Geachte)__\n\nU ontvangt hierbij order  __REF__\n\n\n__(Hoogachtend)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nYou will find here the shipping __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -114,7 +116,7 @@ CanceledByLogin=User login who canceled
 ClosedByLogin=User login who closed
 FileWasRemoved=Bestand %s is verwijderd
 DirWasRemoved=Map %s is verwijderd
-FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotYetAvailable=Onderdeel nog niet beschikbaar in huidige versie
 FeaturesSupported=Supported features
 Width=Breedte
 Height=Hoogte
@@ -189,7 +191,7 @@ EMailTextProposalValidated=De offerte %s is gevalideerd.
 EMailTextProposalClosedSigned=The proposal %s has been closed signed.
 EMailTextOrderValidated=De opdracht %s is gevalideerd.
 EMailTextOrderApproved=De opdracht %s is goedgekeurd.
-EMailTextOrderValidatedBy=The order %s has been recorded by %s.
+EMailTextOrderValidatedBy=Order %s is vastgelegd door %s.
 EMailTextOrderApprovedBy=De order %s is goedgekeuerd door %s.
 EMailTextOrderRefused=De order %s is geweigerd.
 EMailTextOrderRefusedBy=De order %s is geweigerd door %s.
@@ -214,6 +216,7 @@ StartUpload=Start uploaden
 CancelUpload=Uploaden annuleren
 FileIsTooBig=Bestanden is te groot
 PleaseBePatient=Even geduld a.u.b.
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Een verzoek om uw Dolibarr wachtwoord te wijzigen is ontvangen
 NewKeyIs=Dit is uw nieuwe sleutel om in te loggen
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Omschrijving
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/nl_NL/paypal.lang b/htdocs/langs/nl_NL/paypal.lang
index 225ec5974e0..7eeb3e3abec 100644
--- a/htdocs/langs/nl_NL/paypal.lang
+++ b/htdocs/langs/nl_NL/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Dit is id van de transactie: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Voeg de url van Paypal betaling wanneer u een document verzendt via e-mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index ce310ad70d7..c6a52765bf7 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -27,17 +27,18 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product of Dienst
 ProductsAndServices=Producten en Diensten
 ProductsOrServices=Producten of diensten
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Producten alleen voor verkoop
 ProductsOnPurchaseOnly=Producten alleen voor aankoop
-ProductsNotOnSell=Products not for sale and not for purchase
+ProductsNotOnSell=Producten niet voor aan- en verkoop
 ProductsOnSellAndOnBuy=Producten voor verkoop en aankoop
 ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
+ServicesNotOnSell=Diensten niet voor aan- en verkoop
 ServicesOnSellAndOnBuy=Diensten voor verkoop en aankoop
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+LastModifiedProductsAndServices=Laatste %s aangepaste producten/diensten
+LastRecordedProducts=Laatste %s geregistreerde producten
+LastRecordedServices=Laatste %s geregistreerde diensten
 CardProduct0=Productdetails
 CardProduct1=Dienstdetails
 Stock=Voorraad
@@ -56,9 +57,9 @@ ProductStatusOnBuy=Beschikbaar
 ProductStatusNotOnBuy=Vervallen
 ProductStatusOnBuyShort=Beschikbaar
 ProductStatusNotOnBuyShort=Vervallen
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
+UpdateVAT=Bijwerken BTW
+UpdateDefaultPrice=Bijwerken standaard verkoopprijs
+UpdateLevelPrices=Verkoopprijzen bijwerken voor elk niveau
 AppliedPricesFrom=Toegepaste prijzen vanaf
 SellingPrice=Verkoopprijs
 SellingPriceHT=Verkoopprijs (na aftrek belastingen)
@@ -68,13 +69,13 @@ CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Aantal verkocht
 PurchasedAmount=Aantal ingekocht
 NewPrice=Nieuwe prijs
-MinPrice=Min. selling price
+MinPrice=Min. verkoopprijs
 CantBeLessThanMinPrice=De verkoopprijs kan niet lager zijn dan de minimumprijs voor dit product ( %s zonder belasting)
 ContractStatusClosed=Gesloten
 ErrorProductAlreadyExists=Een product met verwijzing %s bestaat reeds.
 ErrorProductBadRefOrLabel=Verkeerde waarde voor de referentie of label.
 ErrorProductClone=Er was een probleem bij het clonen van het product of de dienst.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+ErrorPriceCantBeLowerThanMinPrice=Fout, verkoopprijs mag niet lager zijn dan de minimumprijs.
 Suppliers=Leveranciers
 SupplierRef=Leveranciersreferentie
 ShowProduct=Toon product
@@ -95,7 +96,7 @@ NoteNotVisibleOnBill=Notitie (niet zichtbaar op facturen, offertes, etc)
 ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid:
 MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
 MultiPricesNumPrices=Aantal prijzen
-AssociatedProductsAbility=Activate the feature to manage virtual products
+AssociatedProductsAbility=Mogelijkheid voor virtuele producten activeren
 AssociatedProducts=Onderliggende producten
 AssociatedProductsNumber=Aantal producten waaruit dit product bestaat
 ParentProductsNumber=Aantal ouder pakket producten
@@ -106,7 +107,7 @@ KeywordFilter=Trefwoord filter
 CategoryFilter=Categorie filter
 ProductToAddSearch=Zoek product om toe te voegen
 NoMatchFound=Geen resultaten gevonden
-ListOfProductsServices=List of products/services
+ListOfProductsServices=Producten/diensten lijst
 ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Lijst van producten / diensten met dit product als een onderdeel
 ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Weet u zeker dat u deze productlijn wilt verwijderen?
 ProductSpecial=Speciaal
 QtyMin=Minimum aantal
 PriceQtyMin=Prijs voor dit minimum aantal (zonder korting)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=BTW tarief (voor deze leverancier/product)
 DiscountQtyMin=Standaard korting voor aantal
 NoPriceDefinedForThisSupplier=Geen prijs / hoeveelheid gedefinieerd voor deze leverancier / product
@@ -143,7 +145,7 @@ RowMaterial=Ruw materiaal
 CloneProduct=Kopieer product of dienst
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Kloon alle hoofdinformatie van het product / de dienst
-ClonePricesProduct=Clone prices
+ClonePricesProduct=Prijzen klonen
 CloneCompositionProduct=Clone packaged product/service
 CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Dit product wordt gebruikt
@@ -151,8 +153,8 @@ NewRefForClone=Referentie naar nieuw produkt / dienst
 SellingPrices=Verkoop prijzen
 BuyingPrices=Inkoop prijzen
 CustomerPrices=Consumenten prijzen
-SuppliersPrices=Supplier prices
-SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
+SuppliersPrices=Levernaciersprijs
+SuppliersPricesOfProductsOrServices=Leveranciersprijs (van producten/diensten)
 CustomCode=Customs/Commodity/HS code
 CountryOrigin=Land van herkomst
 Nature=Natuur
@@ -228,13 +230,13 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar c
 BarCodeDataForProduct=Barcodegegevens voor product %s :
 BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
+PriceByCustomer=Verschillende prijzen voor elke klant
+PriceCatalogue=Enkele verkoopprijs per product/dienst
 PricingRule=Regels voor verkoop prijzen
-AddCustomerPrice=Add price by customer
+AddCustomerPrice=Koppel verkoopprijs aan klant
 ForceUpdateChildPriceSoc=Stel dezelfde prijs in dochterondernemingen klant
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
+PriceByCustomerLog=Prijshistorie klant
+MinimumPriceLimit=Minimumprijs kan niet onder %s
 MinimumRecommendedPrice=Minimaal aanbevolen prijs is:% s
 PriceExpressionEditor=Prijs expressie editor
 PriceExpressionSelected=Geselecteerde prijs uitdrukking
@@ -249,13 +251,13 @@ DefaultPrice=Standaard prijs
 ComposedProductIncDecStock=Verhogen/verlagen voorraad bij de ouder verandering
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum leverancier prijs
-MinCustomerPrice=Minimum customer price
+MinCustomerPrice=Minimum verkoopprijs bij klant
 DynamicPriceConfiguration=Dynamische prijs configuratie
 DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
+AddVariable=Variabele toevoegen
 AddUpdater=Add Updater
 GlobalVariables=Globale variabelen
-VariableToUpdate=Variable to update
+VariableToUpdate=Variabele bijwerken
 GlobalVariableUpdaters=Globale variabele aanpassers
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Ontleedt JSON gegevens van opgegeven URL, VALUE bepaalt de locatie van de relevante waarde,
@@ -269,10 +271,10 @@ CorrectlyUpdated=Correct bijgewerkt
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Selecteer PDF bestanden
 IncludingProductWithTag=Including product/service with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
+DefaultPriceRealPriceMayDependOnCustomer=Standaard verkoopprijs, echte verkoopprijs kan bij klant zijn vastgelegd
+WarningSelectOneDocument=Selecteer tenminste één document
 DefaultUnitToShow=Eenheid
-NbOfQtyInProposals=Qty in proposals
+NbOfQtyInProposals=Aantal in voorstellen
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
 ProductsOrServicesTranslations=Products or services translation
 TranslatedLabel=Vertaalde label
@@ -283,7 +285,7 @@ ProductVolume=Volume per eenheid
 WeightUnits=Gewicht collie
 VolumeUnits=Volume collie
 SizeUnits=Afmeting collie
-DeleteProductBuyPrice=Delete buying price
+DeleteProductBuyPrice=Inkoopprijs verwijderen
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 SubProduct=Sub product
 ProductSheet=Product sheet
@@ -292,29 +294,29 @@ PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+VariantAttributes=Variatie attributen
+ProductAttributes=Variatie attributen bij producten
+ProductAttributeName=Variatie attribuut %s
+ProductAttribute=Variatie attribuut
+ProductAttributeDeleteDialog=Weet u zeker dat u deze attribuut wilt verwijderen? Alle waarden hierbij zullen ook verwijderd worden
 ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
+ProductCombinations=Variaties
 PropagateVariant=Propagate variants
 HideProductCombinations=Hide products variant in the products selector
-ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
+ProductCombination=Variatie
+NewProductCombination=Nieuwe variatie
+EditProductCombination=Wijzigen variatie
 NewProductCombinations=New variants
 EditProductCombinations=Editing variants
 SelectCombination=Select combination
-ProductCombinationGenerator=Variants generator
+ProductCombinationGenerator=Variatie generator
 Features=Kenmerken
-PriceImpact=Price impact
-WeightImpact=Weight impact
+PriceImpact=Gevolgen voor prijs
+WeightImpact=Gevolgen voor gewicht
 NewProductAttribute=Nieuwe attribuut
-NewProductAttributeValue=New attribute value
+NewProductAttributeValue=Waarde nieuw attribuut
 ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
 ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
 TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index dbba3867668..bb146ecd864 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -3,35 +3,35 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-ProjectsArea=Projects Area
+ProjectsArea=Project omgeving
 ProjectStatus=Project status
 SharedProject=Iedereen
 PrivateProject=Projectcontacten
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Alle projecten
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Deze weergave toont alle projecten waarvoor u gerechtigd bent deze in te zien.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=Dit overzicht laat alle taken zien van projecten waarvoor u gemachtigd bent.
 ProjectsPublicTaskDesc=Deze weergave toont alle projecten en taken die je mag lezen.
 ProjectsDesc=Deze weergave toont alle projecten (Uw gebruikersrechten staan het u toe alles in te zien).
-TasksOnProjectsDesc=This view presents all tasks on 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.
+TasksOnProjectsDesc=Dit overzicht laat alle projecten en alle taken zien (uw gebruikers-rechten geven u hiervoor toestemming).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Deze weergave toont alle projecten en taken die u mag inzien.
 TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staan het u toe alles in te zien).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
+ImportDatasetTasks=Taken bij projecten
 ProjectCategories=Project tags/categories
 NewProject=Nieuw project
 AddProject=Nieuw project
 DeleteAProject=Project verwijderen
 DeleteATask=Taak verwijderen
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
+ConfirmDeleteAProject=Weet u zeker dat u dit project wilt verwijderen?
+ConfirmDeleteATask=Weet u zeker dat u deze taak wilt verwijderen?
+OpenedProjects=Projecten in bewerking
 OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
@@ -40,7 +40,7 @@ ShowTask=Toon taak
 SetProject=Stel project in
 NoProject=Geen enkel project gedefinieerd of in eigendom
 NbOfProjects=Aantal projecten
-NbOfTasks=Nb of tasks
+NbOfTasks=Aantal taken
 TimeSpent=Bestede tijd
 TimeSpentByYou=Uw tijdsbesteding
 TimeSpentByUser=Gebruikers tijdsbesteding
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload niet gedefinieerd
 NewTimeSpent=Bestede tijd
 MyTimeSpent=Mijn bestede tijd
+BillTime=Bill the time spent
 Tasks=Taken
 Task=Taak
 TaskDateStart=Taak startdatum
@@ -62,7 +63,7 @@ TaskDateEnd=Taak einddatum
 TaskDescription=Taakomschrijving
 NewTask=Nieuwe taak
 AddTask=Nieuwe taak
-AddTimeSpent=Create time spent
+AddTimeSpent=Aanmaken gespendeerde tijd
 AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activiteit
 Activities=Taken / activiteiten
@@ -78,8 +79,8 @@ GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 GanttView=Gantt View
 ListProposalsAssociatedProject=Lijst van aan het project verbonden offertes
-ListOrdersAssociatedProject=List of customer orders associated with the project
-ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListOrdersAssociatedProject=Lijst met relaties gekoppeld aan dit project
+ListInvoicesAssociatedProject=Lijst met facturen gekoppeld aan dit project
 ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Lijst van donaties in verband met het project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Lijst van aan het project verbonden acties
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Projectactiviteit in deze week
@@ -98,23 +100,24 @@ ActivityOnProjectThisMonth=Projectactiviteit in deze maand
 ActivityOnProjectThisYear=Projectactiviteit in dit jaar
 ChildOfProjectTask=Sub- van het project / taak
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Geen eigenaar van dit privé-project
 AffectedTo=Toegewezen aan
 CantRemoveProject=Dit project kan niet worden verwijderd, er wordt naar verwezen door enkele andere objecten (facturen, opdrachten of andere). Zie verwijzingen tabblad.
 ValidateProject=Valideer project
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=Weet u zeker dat u dit project wilt valideren?
 CloseAProject=Sluit project
-ConfirmCloseAProject=Are you sure you want to close this project?
+ConfirmCloseAProject=Weet u zeker dat u dit project wilt afsluiten?
 AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Project heropenen
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=Weet u zeker dat u dit project wilt her-openen?
 ProjectContact=Projectcontacten
 TaskContact=Task contacts
 ActionsOnProject=Acties in het project
 YouAreNotContactOfProject=U bent geen contactpersoon van dit privé project
 UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Verwijder gespendeerde tijd
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+ConfirmDeleteATimeSpent=Weet u zeker dat u gebruikte tijd wilt verwijderen?
 DoNotShowMyTasksOnly=Bekijk ook taken niet aan mij toegewezen
 ShowMyTasksOnly=Bekijk alleen taken die aan mij toegewezen
 TaskRessourceLinks=Contacts task
@@ -132,12 +135,13 @@ CloneNotes=Kloon notities
 CloneProjectFiles=Kloon project samengevoegde bestanden
 CloneTaskFiles=Kloon taak(en) samengevoegde bestanden (als taak(en) gekloond)
 CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
+ConfirmCloneProject=Weet u zeker dat u dit project wilt klonen?
 ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Onmogelijk taak datum te verschuiven volgens de nieuwe startdatum van het project
 ProjectsAndTasksLines=Projecten en taken
 ProjectCreatedInDolibarr=Project %s gecreëerd
-ProjectModifiedInDolibarr=Project %s modified
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s aangepast
 TaskCreatedInDolibarr=Taak %s gecreëerd
 TaskModifiedInDolibarr=Taak %s gewijzigd
 TaskDeletedInDolibarr=Taak %s verwijderd
@@ -149,7 +153,7 @@ OpportunityAmount=Opportunity amount
 OpportunityAmountShort=Opp. amount
 OpportunityAmountAverageShort=Average Opp. amount
 OpportunityAmountWeigthedShort=Weighted Opp. amount
-WonLostExcluded=Won/Lost excluded
+WonLostExcluded=Exclusief akkoord/niet doorgegaan
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Projectmanager
 TypeContact_project_external_PROJECTLEADER=Projectleider
@@ -166,7 +170,7 @@ DocumentModelBeluga=Project template for linked objects overview
 DocumentModelBaleine=Project report template for tasks
 PlannedWorkload=Geplande workload
 PlannedWorkloadShort=Workload
-ProjectReferers=Related items
+ProjectReferers=Gerelateerde items
 ProjectMustBeValidatedFirst=Project moet eerst worden gevalideerd
 FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per dag
@@ -178,12 +182,12 @@ TasksWithThisUserAsContact=Taken toegekend aan gebruiker
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
 TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
-AssignTaskToUser=Assign task to %s
+TasksAssignedTo=Taken toegekend aan
+AssignTaskToMe=Taak aan mij toewijzen
+AssignTaskToUser=Ken taak toe aan %s
 SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
+AssignTask=Toewijzen
+ProjectOverview=Overzicht
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
@@ -204,19 +208,22 @@ OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
 OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
+OppStatusQUAL=Kwalificatie
 OppStatusPROPO=Offerte
-OppStatusNEGO=Negociation
+OppStatusNEGO=Onderhandeling
 OppStatusPENDING=Hangende
 OppStatusWON=Won
-OppStatusLOST=Lost
+OppStatusLOST=Verloren
 Budget=Budget
 AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values :</u><br>- Keep empty: Can link any project of the company (default)<br>- "all" : Can link any projects, even project of other companies<br>- A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)<br>
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index 6116eed3cff..fa7ef74194f 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -13,10 +13,10 @@ Prospect=Prospect
 DeleteProp=Offerte verwijderen
 ValidateProp=Offerte valideren
 AddProp=Nieuwe offerte
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
+ConfirmDeleteProp=Weet u zeker dat u deze offerte wilt verwijderen?
+ConfirmValidateProp=Weet u zeker dat u deze offerte wilt goedkeuren met de naam <b>%s</b>?
+LastPropals=Laatste %s offertes
+LastModifiedProposals=Laatste %s aangepaste offertes
 AllPropals=Alle offertes
 SearchAProposal=Zoek een offerte
 NoProposal=Geen ontwerpofferte
@@ -28,11 +28,12 @@ ShowPropal=Toon offerte
 PropalsDraft=Concepten
 PropalsOpened=Open
 PropalStatusDraft=Concept (moet worden gevalideerd)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Goedgekeurd (offerte is geopend)
 PropalStatusSigned=Ondertekend (te factureren)
 PropalStatusNotSigned=Niet ondertekend (gesloten)
 PropalStatusBilled=Gefactureerd
 PropalStatusDraftShort=Concept
+PropalStatusValidatedShort=Gevalideerd
 PropalStatusClosedShort=Gesloten
 PropalStatusSignedShort=Ondertekend
 PropalStatusNotSignedShort=Niet ondertekend
@@ -46,8 +47,8 @@ SendPropalByMail=Stuur offerte per e-mail
 DatePropal=Offertedatum
 DateEndPropal=Vervaldatum
 ValidityDuration=Geldigheidsduur
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Wijzig status in
+SetAcceptedRefused=Markeer geaccepteerd/geweigerd
 ErrorPropalNotFound=Offerte %s niet gevonden
 AddToDraftProposals=Toevoegen aan ontwerp offerte
 NoDraftProposals=Geen ontwerpoffertes
@@ -56,8 +57,8 @@ CreateEmptyPropal=Creëer een lege offerte of uit de lijst van producten / diens
 DefaultProposalDurationValidity=Standaardgeldigheid offerte (in dagen)
 UseCustomerContactAsPropalRecipientIfExist=Gebruik,  indien ingesteld, het afnemerscontactadres als offerteontvangstadres in plaats van het adres van de Klant
 ClonePropal=Kloon offerte
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ConfirmClonePropal=Weet u zeker dat u offerte <b>%s</b>  wilt kopiëren?
+ConfirmReOpenProp=Weet u zeker dat u offerte <b>%s</b> wilt her-openen?
 ProposalsAndProposalsLines=Offertes en offerteregels
 ProposalLine=Offerteregel
 AvailabilityPeriod=Leveringstermijn
@@ -80,4 +81,4 @@ DefaultModelPropalCreate=Standaard model aanmaken
 DefaultModelPropalToBill=Standaard sjabloon bij het sluiten van een zakelijk voorstel (te factureren)
 DefaultModelPropalClosed=Standaard sjabloon bij het sluiten van een zakelijk voorstel (nog te factureren)
 ProposalCustomerSignature=Schriftelijke aanvaarding , stempel , datum en handtekening
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalsStatisticsSuppliers=Statistieken offertes leverancier
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index 6518f533be7..77c714ed739 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -1,17 +1,18 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Grootboekrekening voor medewerker derde partij
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=De toegewezen grootboekrekening welke is vastgelegd bij de medewerker, zal alleen gebruikt in de sub-boekhouding. Deze grootboekrekening zal worden gebruikt in de -boekhouding indien de toegewezen gebruikers grootboekrekening bij de medewerker niet is gedefinieerd.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standaard grootboekrekening voor salaris betalingen
 Salary=Salaris
 Salaries=Salarissen
 NewSalaryPayment=Nieuwe salarisbetaling
 SalaryPayment=Salarisbetaling
 SalariesPayments=Salarissen betalingen
 ShowSalaryPayment=Toon salarisbetaling
-THM=Average hourly rate
-TJM=Average daily rate
-CurrentSalary=Huidige salaris
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+THM=Gemiddeld uurtarief
+TJM=Gemiddeld dagtarief
+CurrentSalary=Huidig salaris
+THMDescription=Deze waarde kan worden gebruikt om de kosten te berekenen van de benodigde project-tijd. Werkt alleen indien de module Project is geactiveerd
+TJMDescription=Deze waarde is momenteel alleen voor informatie en wordt niet gebruikt in een berekening
+LastSalaries=Laatste %s salaris betalingen
+AllSalaries=Alle salarisbetalingen
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 005f6208fb9..486a678e0f3 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -8,20 +8,23 @@ WarehouseEdit=Magazijn wijzigen
 MenuNewWarehouse=Nieuw magazijn
 WarehouseSource=Bronmagazijn
 WarehouseSourceNotDefined=Geen magazijn bepaald
+AddWarehouse=Create warehouse
 AddOne=Voeg toe
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Doelmagazijn
 ValidateSending=Valideer verzending
 CancelSending=Annuleer verzending
 DeleteSending=Verwijder verzending
 Stock=Voorraad
 Stocks=Voorraden
-StocksByLotSerial=Stocks by lot/serial
+StocksByLotSerial=Voorraad volgorde op lot/serienummer
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
 Movements=Mutaties
 ErrorWarehouseRefRequired=Magazijnreferentienaam is verplicht
 ListOfWarehouses=Magazijnenlijst
 ListOfStockMovements=Voorraadmutatielijst
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
@@ -158,23 +161,23 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
+inventoryTitle=Voorraad
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+inventoryCreate=Nieuw
 inventoryEdit=Bewerken
 inventoryValidate=Gevalideerd
 inventoryDraft=Lopende
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Magazijn
 inventoryConfirmCreate=Create
 inventoryOfWarehouse=Inventory for warehouse : %s
 inventoryErrorQtyAdd=Error : one quantity is leaser than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Categorie filter
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
+SelectFournisseur=Filter leverancier
+inventoryOnDate=Voorraad
 INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
@@ -191,7 +194,7 @@ RegulatedQty=Regulated Qty
 AddInventoryProduct=Add product to inventory
 AddProduct=Toevoegen
 ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
+FlushInventory=Voorraad op 'nul' zetten
 ConfirmFlushInventory=Do you confirm this action ?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
diff --git a/htdocs/langs/nl_NL/stripe.lang b/htdocs/langs/nl_NL/stripe.lang
index c95fa602a74..ec56ca43df5 100644
--- a/htdocs/langs/nl_NL/stripe.lang
+++ b/htdocs/langs/nl_NL/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index f3c1c947a15..71836e9b529 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Kilometerskosten
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -44,7 +44,7 @@ TF_LUNCH=Lunch
 TF_METRO=Metro
 TF_TRAIN=Train
 TF_BUS=Bus
-TF_CAR=Car
+TF_CAR=Auto
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
 TF_HOTEL=Hotel
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
@@ -106,9 +107,9 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 ConfirmCancelTrip=Are you sure you want to cancel this expense report?
 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?
-NoTripsToExportCSV=No expense report to export for this period.
+SaveTrip=Valideren resultaatrekening kosten
+ConfirmSaveTrip=Weet u zeker dat u dit kosten-rapport wilt valideren?
+NoTripsToExportCSV=Geen kosten-rapport voor deze periode om te exporteren.
 ExpenseReportPayment=Expense report payment
 ExpenseReportsToApprove=Expense reports to approve
 ExpenseReportsToPay=Expense reports to pay
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 3c6dc49f736..717544858d2 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -6,7 +6,7 @@ Permission=Toestemming
 Permissions=Rechten
 EditPassword=Wijzig wachtwoord
 SendNewPassword=Genereer en stuur nieuw wachtwoord
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Verzend link om wachtwoord te resetten
 ReinitPassword=Genereer een nieuw wachtwoord
 PasswordChangedTo=Wachtwoord gewijzigd in: %s
 SubjectNewPassword=Uw nieuw wachtwoord voor %s
@@ -44,9 +44,9 @@ NewGroup=Nieuwe groep
 CreateGroup=Groep maken
 RemoveFromGroup=Verwijderen uit groep
 PasswordChangedAndSentTo=Wachtwoord veranderd en verstuurd naar <b>%s</b>.
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=Wachtwoord aanpassing verzoek voor <b>%s</b>
 PasswordChangeRequestSent=Verzoek om wachtwoord te wijzigen van <b>%s</b> verstuurt naar <b>%s</b>.
-ConfirmPasswordReset=Confirm password reset
+ConfirmPasswordReset=Bevestig wachtwoord reset
 MenuUsersAndGroups=Gebruikers & groepen
 LastGroupsCreated=Laatste %s gecreëerde groepen
 LastUsersCreated=Laatste %s gecreëerde gebruikers
@@ -69,8 +69,8 @@ InternalUser=Interne gebruiker
 ExportDataset_user_1=Dolibarr's gebruikers en eigenschappen
 DomainUser=Domeingebruikersaccount %s
 Reactivate=Reactiveren
-CreateInternalUserDesc=Dit fomulier maakt het mogelijk om een interne gebruiker aan uw bedrijf / organisatie toe te voegen. Om een externe gebruiker (klant, leverancier, ...) toe te voegen gebruik de 'Maak Dolibarr account' knop in de contactpersonen kaart.
-InternalExternalDesc=Een <b>interne</b> gebruiker is een gebruiker die onderdeel uitmaakt van uw bedrijf / organisatie.<br>\nEen <b>externe</b> gebruiker is een klant, leverancier of andere 3de partij.<br><br>In beide gevallen definiëren permissies de rechten in Dolibarr. Tevens kunnen externe gebruikers een andere menu manager hebben dan interne gebruikers. (Kijk bij Home - Instellingen - Menu's)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Toestemming verleend, omdat geërfd van een bepaalde gebruikersgroep.
 Inherited=Overgeërfd
 UserWillBeInternalUser=Gemaakt gebruiker een interne gebruiker te zijn (want niet gekoppeld aan een bepaalde derde partij)
@@ -93,6 +93,7 @@ NameToCreate=Naam van derden maken
 YourRole=Uw rollen
 YourQuotaOfUsersIsReached=Uw quotum van actieve gebruikers is bereikt!
 NbOfUsers=Nb van gebruikers
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Alleen een superadmin kan downgrade een superadmin
 HierarchicalResponsible=Opzichter
 HierarchicView=Hiërarchisch schema
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 6b4e2ada84a..854ff1c80b9 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -24,7 +26,7 @@ Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Een voorbeeld van uw website <strong>%s</strong> is nog niet beschikbaar. U moet eerst een pagina toevoegen.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Lezen
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 71a43ac41db..9f0a8e654a2 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Orders automatisch te incasseren
-StandingOrder=Incasso betalingsopdracht
+StandingOrdersPayment=Orders automatisch te incasseren
+StandingOrderPayment=Incasso betalingsopdracht
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Te verwerken
 WithdrawalsReceipts=Incasso-opdrachten
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 648efab6e5b..10d64759fdb 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Plan kont
 CurrentDedicatedAccountingAccount=Aktualne dedykowane konto
 AssignDedicatedAccountingAccount=Nowe konto do przypisania
 InvoiceLabel=Etykieta faktury
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Inne informacje
 DeleteCptCategory=Usuń konto księgowe z grupy
 ConfirmDeleteCptCategory=Czy jesteś pewien, że chcesz usunąć konto księgowe z grupy kont księgowych?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Konto księgowe używane domyślnie dla sprzedan
 Doctype=Rodzaj dokumentu
 Docdate=Data
 Docref=Odniesienie
-Code_tiers=Kontrahent
 LabelAccount=Etykieta konta
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Rok do usunęcia
 DelJournal=Dziennik do usunięcia
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Usuń pozycję z księgi głównej
 FinanceJournal=Dziennik finansów
 ExpenseReportsJournal=Dziennik raportów kosztów
 DescFinanceJournal=Dziennik finansów zawiera wszystkie typy płatności wykonane przez konto bankowe
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Konto dla niezdefiniowanego VATu
 ThirdpartyAccountNotDefined=Konto dla niezdefiniowanego kontrahenta
 ProductAccountNotDefined=Konto dla produktu nie zdefiniowane
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Konto dla banku nie zdefiniowane
-CustomerInvoicePayment=Zapłata faktury klienta
-ThirdPartyAccount=Konto kontrahenta
+CustomerInvoicePayment=Płatność za fakturę klienta
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Nowa transakcja
 NumMvts=Ilość transakcji
 ListeMvts=Lista ruchów
@@ -193,8 +191,8 @@ UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
 
-Pcgtype=Group of account
-Pcgsubtype=Subgroup of account
+Pcgtype=Grupa konta
+Pcgsubtype=Podgrupa konta
 PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
 TotalVente=Łączny obrót przed opodatkowaniem
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąc tego konta księgowe
 MvtNotCorrectlyBalanced=Ruch nie zbilansowany poprawnie. Uznanie = %s. Obciążenie = %s
 FicheVentilation=Karta dowiązania
 GeneralLedgerIsWritten=Transakcje zapisane w księdze głównej
-GeneralLedgerSomeRecordWasNotRecorded=Niektóre transakcje nie mogły zostać wysłane. Jeżeli nie ma innych informacji o błędach, oznacza to, że najprawdopodobniej zostały już wysłane.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=Lista produktów nie dowiązanych do żadnego konta księgowego
 ChangeBinding=Zmień dowiązanie
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Dodaj masowo kategorie
@@ -234,13 +234,15 @@ AccountingJournal=Dziennik księgowy
 NewAccountingJournal=Nowy dziennik księgowy
 ShowAccoutingJournal=Wyświetl dziennik konta księgowego
 Nature=Natura
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sprzedaż
 AccountingJournalType3=Zakupy
 AccountingJournalType4=Bank
 AccountingJournalType5=Raport kosztów
+AccountingJournalType8=Inwentaryzacja
 AccountingJournalType9=Ma nowe
 ErrorAccountingJournalIsAlreadyUse=Ten dziennik jest już w użytku
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export dziennika projektu
@@ -282,6 +284,8 @@ Formula=Formuła
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Niektóre obowiązkowe kroki konfiguracji nie zostały wykonane. Proszę je uzupełnić.
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Ustawiony format exportu nie jest wspierany na tej stronie
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=Nie zdefiniowano dziennika
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 4609a4c7383..f82a63d00b6 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -107,7 +107,7 @@ MenuIdParent=ID Rodzica menu
 DetailMenuIdParent=ID menu rodzica (pusty dla górnego menu)
 DetailPosition=Sortuj numer do zdefiniowania pozycji menu
 AllMenus=Wszyscy
-NotConfigured=Moduły/Aplikacje nie skonfigurowane
+NotConfigured=Moduł/Aplikacja nie skonfigurowana
 Active=Aktywne
 SetupShort=Konfiguracja
 OtherOptions=Inne opcje
@@ -134,8 +134,8 @@ MaxNbOfLinesForBoxes=Maks. ilość linii dla widgetów
 AllWidgetsWereEnabled=All available widgets are enabled
 PositionByDefault=Domyślny porządek
 Position=Pozycja
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusDesc=Menadżer menu ustawia zawartość dwóch pasków menu (poziomego i pionowego)
+MenusEditorDesc=Edytor menu pozwala na ustawienie własnych pozycji menu. Używaj go ostrożnie, aby nie spowodować niedostępności pozycji menu. <br>Niektóre moduły i pozycje menu (w menu <b>Wszystkie</b>szczególnie). Jeżeli usuniesz te pozycje przez pomyłkę, możesz przywrócić je wyłączając a następnie włączając moduł.
 MenuForUsers=Menu dla użytkowników
 LangFile=Plik. Lang
 System=System
@@ -196,13 +196,13 @@ OnlyActiveElementsAreShown=Tylko elementy z <a href="%s">aktywnych modułów</a>
 ModulesDesc=Moduły Dolibarr definiują, która aplikacja / funkcja jest włączona w oprogramowaniu. Niektóre aplikacje / moduły wymagają uprawnień, które musisz przyznać użytkownikom po ich aktywacji. Kliknij przycisk ON/OFF, aby włączyć moduł/aplikację.
 ModulesMarketPlaceDesc=Możesz znaleźć więcej modułów do pobrania na zewnętrznych stronach internetowych...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
+ModulesMarketPlaces=Znajdź dodatkowe aplikacje / moduły
 ModulesDevelopYourModule=Develop your own app/modules
 ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
 NewModule=Nowy
 FreeModule=Free
-CompatibleUpTo=Compatible with version %s
+CompatibleUpTo=Kompatybilne z wersją %s
 NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
@@ -243,35 +243,35 @@ OfficialWebHostingService=Opisywane usługi hostingowe (Cloud hosting)
 ReferencedPreferredPartners=Preferowani Partnerzy
 OtherResources=Inne zasoby
 ExternalResources=External resources
-SocialNetworks=Media społecznościowe
+SocialNetworks=Sieci społecznościowe
 ForDocumentationSeeWiki=Aby zapoznać się z dokumentacją użytkownika lub dewelopera (Doc, FAQ ...), <br> zajrzyj do Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Aby znaleźć odpowiedzi na pytania / uzyskać dodatkową pomoc, możesz skorzystać z  forum Dolibarr : <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Obszar ten może pomóc w uzyskaniu wsparcia dla usługi Dolibarr.
 HelpCenterDesc2=Niektóre elementy tej usługi są dostępne <b>tylko</b> w języku <b>angielskim.</b>
 CurrentMenuHandler=Aktualne menu obsługi
 MeasuringUnit=Jednostki pomiarowe
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
+LeftMargin=Lewy margines
+TopMargin=Górny margines
+PaperSize=Typ papieru
+Orientation=Orientacja
 SpaceX=Space X
 SpaceY=Space Y
 FontSize=Wielkość czcionki
-Content=Content
+Content=Zawartość
 NoticePeriod=Okres wypowiedzenia
 NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
+Emails=Wiadomości email
+EMailsSetup=Ustawienia wiadomości email
+EMailsDesc=Ta strona pozwala na nadpisanie parametrów PHP dla wysyłki wiadomości email. W większości przypadków w systemach Unix/Linux, twoje ustawienia PHP są poprawne i te parametry są bezużyteczne.
 EmailSenderProfiles=Emails sender profiles
 MAIN_MAIL_SMTP_PORT=Port SMTP (domyślnie w <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_SERVER=Host SMTP (domyślnie w <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP (Nie zdefiniowany w PHP dla systemów z rodziny Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP (Nie zdefiniowany w PHP dla systemów z rodziny Unix)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
+MAIN_MAIL_EMAIL_FROM=E-mail wysyłający do automatycznych wiadomości e-mail (domyślnie w php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Wysyłaj systematycznie ukryte kopie wszystkich wysłanych e-maili do
-MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_DISABLE_ALL_MAILS=Wyłącz wszystkie wysyłki wiadomości (dla testu ustawień lub trybu demo)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_SENDMODE=Metoda używana do wysłania E-maili
 MAIN_MAIL_SMTPS_ID=Identyfikator SMTP, jeżeli wymaga uwierzytelniania
@@ -291,7 +291,7 @@ ModuleSetup=Moduł konfiguracji
 ModulesSetup=Ustawienia Modułów/Aplikacji
 ModuleFamilyBase=System
 ModuleFamilyCrm=Zarządzanie relacjami z klientem (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Zarządzanie Relacjami z Dostawcami (ZRD)
 ModuleFamilyProducts=Zarządzanie produktami
 ModuleFamilyHr=Zarządzanie zasobami ludzkimi
 ModuleFamilyProjects=Projekty / Praca zespołowa
@@ -310,7 +310,7 @@ ThisIsAlternativeProcessToFollow=This is an alternative setup to process manuall
 StepNb=Krok %s
 FindPackageFromWebSite=Odnajdź pakiet, który zapewnia wybraną przez Ciebię funkcję (np. na oficjalnej stronie internetowej %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Rozpakuj spakowane pliki do katalogu serwera poświęconego Dolibarr:<b>%s</b>
+UnpackPackageInDolibarrRoot=Rozpakuj spakowane pliki do katalogu serwera przeznaczonego na Dollibar:<b>%s</b>
 UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
 SetupIsReadyForUse=Wdrażanie modułu zostało zakończone. Musisz jednak włączyć i skonfigurować moduł w aplikacji, przechodząc na stronę do konfiguracji modułów: <a href="%s">%s</a>.
 NotExistsDirect=Alternatywny katalog główny nie jest zdefiniowany w istniejącym katalogu.<br>
@@ -320,9 +320,9 @@ YouCanSubmitFile=For this step, you can submit the .zip file of module package h
 CurrentVersion=Aktualna wersja Dolibarr
 CallUpdatePage=Przejdź na stronę, która pomoże w zaktualizować strukturę bazy danych i dane: %s.
 LastStableVersion=Ostatnia stabilna wersja
-LastActivationDate=Latest activation date
+LastActivationDate=Data ostatniej aktywacji
 LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
+LastActivationIP=Numer IP ostatniej aktywacji
 UpdateServerOffline=Aktualizacja serwera nieaktywny
 WithCounter=Manage a counter
 GenericMaskCodes=Można wpisać dowolną maskę numeracji. W tej masce, może stosować następujące tagi: <br> <b>{000000}</b> 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. <br> <b>{000000 + 000}</b> sama jak poprzednia, ale przesunięciem odpowiadającym numerem, na prawo od znaku + odnosi się począwszy od pierwszego% s. <br> <b>{000000} @ x,</b> 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}. <br> <b>{Dd}</b> dni (01 do 31). <br> <b>{Mm}</b> miesięcy (01 do 12). <br> <b>{Rr}, {rrrr}</b> lub <b>{r}</b> roku ponad 2, 4 lub 1 liczb. <br>
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Błąd, nie można korzystać z opcji @ na reset l
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Błąd, nie można użyć opcji @ jeżeli sekwencja {rr}{mm} lub {yyyy}{mm} nie jest elementem maski.
 UMask=Parametr Umask dla nowych plików systemów Unix / Linux / BSD / Mac.
 UMaskExplanation=Ten parametr pozwala określić uprawnienia ustawione domyślnie na pliki stworzone przez Dolibarr na serwerze (na przykład podczas przesyłania). <br> To musi być wartość ósemkowa (na przykład, 0666 oznacza odczytu i zapisu dla wszystkich). <br> Paramtre Ce ne sert pas sous un serveur Windows.
-SeeWikiForAllTeam=Zapraszamy na stronę wiki dla zapoznania się z pełną listą wszystkich uczestników i ich organizacji
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Opóźnienie dla buforowania odpowiedzi eksportu w sekundach (0 lub puste pole oznacza brak buforowania)
 DisableLinkToHelpCenter=Ukryj link <b>"Potrzebujesz pomocy lub wsparcia"</b> na stronie logowania
 DisableLinkToHelp=Ukryj link <b>" %s Pomoc online"</b> w lewym menu
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalon
 MassConvert=Przekształć zbiorowo
 String=Ciąg znaków
 TextLong=Długi tekst
+HtmlText=Html text
 Int=Liczba całkowita
 Float=Liczba zmiennoprzecinkowa
 DateAndTime=Data i godzina
@@ -411,14 +412,14 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link do obiektu
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpcheckbox=Lista wartości musi być zapisana w liniach w formacie klucz,wartość (gdzie klucz nie może być '0')<br><br>Na przykład:<br>1,wartosc12,<br>wartosc2<br>3,wartosc3<br>...
+ExtrafieldParamHelpradio=Lista wartości musi być zapisana w liniach w formacie klucz,wartość (gdzie klucz nie może być '0')<br><br>Na przykład:<br>1,wartosc1<br>2,wartosc2<br>3,wartosc3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Biblioteka używana do generowania plików PDF
-WarningUsingFPDF=Uwaga: Twój <b>conf.php</b> zawiera dyrektywę <b>dolibarr_pdf_force_fpdf = 1.</b> Oznacza to, że korzystasz z biblioteki FPDF do generowania plików PDF. Ta biblioteka jest nieaktualna i nie obsługuje wielu funkcji (Unicode, przejrzystości obrazu, cyrylicy, czcionek arabskich oraz azjatyckich ...), więc mogą wystąpić błędy podczas generowania pliku PDF. <br> Aby rozwiązać ten problem i mieć pełne wsparcie przy generowaniu plików PDF, należy pobrać <a href="http://www.tcpdf.org/" target="_blank">bibliotekę TCPDF</a> , następnie linię umieścić wewnątrz komentarza lub usunąć <b>$ dolibarr_pdf_force_fpdf = 1,</b> i dodać zamiast <b>$ dolibarr_lib_TCPDF_PATH = "path_to_TCPDF_dir"</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Wprowadź numer telefonu, aby zobaczyć link do przetestowania url ClickToDial dla <strong>użytkownika% s</strong>
@@ -445,14 +446,15 @@ DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Wyświetl adres firmy i dane menadżerów
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
-ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodePanicum=Zwróć pusty kod księgowy
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
-ClickToShowDescription=Click to show description
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
+ClickToShowDescription=Kliknij aby zobaczyć opis
 DependsOn=This module need the module(s)
-RequiredBy=This module is required by module(s)
+RequiredBy=Ten moduł wymagany jest przez moduł(y)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
 PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Użytkownicy i grupy
 Module0Desc=Zarządzanie Użytkownikami/Pracownikami i Grupami
@@ -571,11 +574,11 @@ Module2000Desc=Pozwól na edycję niektórych pól tekstowych z użyciem zaawans
 Module2200Name=Dynamiczne Ceny
 Module2200Desc=Włącz użycie wyrażeń matematycznych dla cen
 Module2300Name=Zaplanowane zadania
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2300Desc=Zarządzanie zaplanowanymi zadaniami (jak cron lub chrono table)
 Module2400Name=Wydarzenia/Agenda
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2500Name=SZD / ZZE
+Module2500Desc=System Zarządzania Dokumentami / Zarządzanie Zawartością Elektroniczną. Automatyczna organizacja twoich wygenerowanych lub składowanych dokumentów. Udostępniaj je kiedy chcesz.
 Module2600Name=API services (Web services SOAP)
 Module2600Desc=Enable the Dolibarr SOAP server providing API services
 Module2610Name=API services (Web services REST)
@@ -592,7 +595,7 @@ Module3100Desc=Add a Skype button into users / third parties / contacts / member
 Module3200Name=Unalterable Archives
 Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
 Module4000Name=HR
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=Zarządzanie zasobami ludzkimi (zarządzanie departamentami, umowami pracowników,...)
 Module5000Name=Multi-company
 Module5000Desc=Pozwala na zarządzanie wieloma firmami
 Module6000Name=Workflow
@@ -604,11 +607,11 @@ Module20000Desc=Zadeklaruj oraz nadzoruj wnioski pracowników dotyczące wyjść
 Module39000Name=Products lots
 Module39000Desc=Partia lub numer seryjny, zarządzanie według daty ważności lub daty sprzedaży produktów
 Module50000Name=Paybox
-Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50000Desc=Moduł oferujący stronę płatności online akceptujący płatności za pośrednictwem kart debetowych/kredytowych poprzez PayBox. Może zostać użyty do zapewnienia twoim klientom możliwości darmowych płatności za konkretne dokumenty Dolibarr (faktury, zamówienia, ...)
 Module50100Name=Punkt sprzedaży
 Module50100Desc=Punkty sprzedaży (POS)
 Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50200Desc=Moduł oferujący stronę płatności online akceptujący płatności za pośrednictwem PayPal (karty kredytowe lub środki PayPal). Może zostać użyty do zapewnienia twoim klientom możliwości darmowych płatności za konkretne dokumenty Dolibarr (faktury, zamówienia, ...)
 Module50400Name=Rachunkowość (zaawansowane)
 Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
 Module54000Name=PrintIPP
@@ -619,6 +622,8 @@ Module59000Name=Marże
 Module59000Desc=Moduł do zarządzania marżami
 Module60000Name=Prowizje
 Module60000Desc=Moduł do zarządzania prowizjami
+Module62000Name=Międzynarodowe Reguły Handlu
+Module62000Desc=Dodaj funkcje do zarządzania Międzynarodowymi Regułami Handlu
 Module63000Name=Zasoby
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Czytaj faktur klientów
@@ -779,7 +784,7 @@ Permission404=Usuwanie zniżek
 Permission501=Read employee contracts/salaries
 Permission502=Create/modify employee contracts/salaries
 Permission511=Read payment of salaries
-Permission512=Create/modify payment of salaries
+Permission512=Utwórz/Modyfikuj płatność wynagrodzenia
 Permission514=Usuń pensje
 Permission517=Wynagrodzenia eksport
 Permission520=Czytaj Kredyty
@@ -801,7 +806,7 @@ 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
+Permission779=Eksport raportów kosztów
 Permission1001=Zobacz zasoby
 Permission1002=Tworzenie / modyfikacja magazynów
 Permission1003=Usuń magazyny
@@ -833,11 +838,11 @@ Permission1251=Uruchom masowy import danych zewnętrznych do bazy danych (wgrywa
 Permission1321=Eksport faktur klienta, atrybutów oraz płatności
 Permission1322=Reopen a paid bill
 Permission1421=Eksport zamówień oraz atrybutów klienta
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Czytaj Zaplanowane zadania
 Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań
@@ -866,9 +871,9 @@ Permission59001=Czytaj marż handlowych
 Permission59002=Zdefiniuj marż handlowych
 Permission59003=Przeczytaj co margines użytkownika
 Permission63001=Czytaj zasoby
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
+Permission63002=Utwórz/modyfikuj zasoby
+Permission63003=Usuń zasoby
+Permission63004=Dołącz zasoby do zdarzeń w agendzie
 DictionaryCompanyType=Typy kontrahentów
 DictionaryCompanyJuridicalType=Formy prawne kontrahentów
 DictionaryProspectLevel=Potencjalny poziom możliwości
@@ -877,13 +882,14 @@ DictionaryRegion=Regiony
 DictionaryCountry=Kraje
 DictionaryCurrency=Waluty
 DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
+DictionaryActions=Typy zdarzeń w  agendzie
 DictionarySocialContributions=Typy opłat ZUS i podatków
 DictionaryVAT=Stawki VAT lub stawki podatku od sprzedaży
 DictionaryRevenueStamp=Ilość znaczków opłaty skarbowej
 DictionaryPaymentConditions=Warunki płatności
 DictionaryPaymentModes=Tryby płatności
 DictionaryTypeContact=Typy kontaktu/adresu
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Podatku ekologicznego (WEEE)
 DictionaryPaperFormat=Formaty papieru
 DictionaryFormatCards=Cards formats
@@ -895,7 +901,7 @@ DictionaryOrderMethods=Sposoby zamawiania
 DictionarySource=Pochodzenie wniosków / zleceń
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Modele dla planu kont
-DictionaryAccountancyJournal=Dzienniki kont księgowych
+DictionaryAccountancyJournal=Dzienniki księgowe
 DictionaryEMailTemplates=Szablony wiadomości e-mail
 DictionaryUnits=Units
 DictionaryProspectStatus=Status możliwości
@@ -904,15 +910,15 @@ DictionaryOpportunityStatus=Opportunity status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 SetupSaved=Konfiguracja zapisana
-SetupNotSaved=Setup not saved
+SetupNotSaved=Ustawienia nie zapisane
 BackToModuleList=Powrót do listy modułów
 BackToDictionaryList=Powrót do listy słowników
 TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Zarządzanie VAT
 VATIsUsedDesc=Domyślnie kiedy tworzysz perspektywy, faktury, zamówienia itd. stawka VAT pobiera z aktywnej reguły standardowej:<br>Jeżeli sprzedawca nie jest płatnikiem VAT, wówczas stawka VAT domyślnie jest równa 0. Koniec reguły.<br>Jeżeli kraj sprzedaży jest taki sam jak kraj zakupu, wówczas stawka VAT jest równa stawce VAT na produkt w kraju sprzedaży. Koniec reguły.<br>Jeżeli sprzedawca i kupujący należą do Unii Europejskiej i dobra są środkami transportu (samochody, statki, samoloty...), domyślna stawka VAT wynosi 0% (VAT powinien być zapłacony przez kupującego w jego kraju w odpowiednim urzędzie skarbowym). Koniec reguły.<br>Jeżeli sprzedawca i kupujący należą do Unii Europejskiej i kupujący jest osobą prywatną, wówczas stawka VAT jest równa stawce obowiązującej w kraju sprzedaży.Koniec reguły.<br>Jeżeli sprzedawca i kupujący należą do Unii Europejskiej i kupujący jest firmą, wówczas stawka VAT jest równa 0%. Koniec reguły.<br>W każdym innym przypadku domyślna stawka VAT jest równa 0%. Koniec reguły.
 VATIsNotUsedDesc=Domyślnie proponowany VAT wynosi 0. Może być wykorzystany w przypadku takich stowarzyszeń, osób fizycznych lub małych firm.
-VATIsUsedExampleFR=We Francji, oznacza to, że firmy i organizacje wykorzystujące rzeczywisty system fiskalny (uproszczony rzeczywisty lub normalny rzeczywisty). System, w którym VAT jest deklarowany.
-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.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Stawka
 LocalTax1IsNotUsed=Nie należy używać drugiego podatku
@@ -953,7 +959,7 @@ Offset=Offset
 AlwaysActive=Zawsze aktywne
 Upgrade=Uaktualnij
 MenuUpgrade=Uaktualnij / Rozszerz
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+AddExtensionThemeModuleOrOther=Wdróż/zainstaluj dodatkową aplikację/moduł
 WebServer=Serwer sieciowy
 DocumentRootServer=Katalog główny serwera sieciowego
 DataRootServer=Katalogi plików danych
@@ -977,7 +983,7 @@ Host=Serwer
 DriverType=Typ sterownika
 SummarySystem=Podsumowanie informacji systemowych
 SummaryConst=Lista wszystkich parametrów konfiguracji Dolibarr
-MenuCompanySetup=Firma/Organizacja
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Menedżer standardowego menu
 DefaultMenuSmartphoneManager=Menedżer menu Smartphona
 Skin=Skórka
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Stały formularz wyszukiwania w lewym menu
 DefaultLanguage=Domyślny język do użytku (kod języka)
 EnableMultilangInterface=Włącz wielojęzyczny interfejs
 EnableShowLogo=Pokaż logo w menu po lewej stronie
-CompanyInfo=Informacje o firmie/organizacji
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Nazwa firmy
 CompanyAddress=Adres
 CompanyZip=Kod pocztowy
@@ -1026,10 +1032,10 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancja opóźnienia (liczba dni
 Delays_MAIN_DELAY_MEMBERS=Tolerancja opóźnienie (w dniach) przed wpisu na opóźnione składki członkowskiej
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancja opóźnienia (liczba dni) przed wpisu do deponowania czeków do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Opóźnienie tolerancji (w dniach) przed wpisu do zestawienia wydatków do zatwierdzenia
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
+SetupDescription1=Obszar ustawień jest przeznaczony dla ustawienia startowych parametrów zanim zaczniesz używać Dolibarr.
 SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription3=Parametry w menu <a href="%s">%s->%s</a>- są wymagane ponieważ definiują dane używane na ekranach Dolibarr oraz do personalizowana domyślnego środowiska oprogramowania (dla kraju - powiązane funkcje dla przykładu).
+SetupDescription4=Parametry w menu <a href="%s">%s-> %s</a> są wymagane ponieważ Dolibarr jest zbiorem kilku modułów/aplikacji, które są bardziej lub mniej ze sobą powiązane. Nowe funkcjonalności będą dodawane do menu za każdorazową aktywacją kolejnego modułu.
 SetupDescription5=Inne pozycje menu zarządzają opcjonalnymi parametrami.
 LogEvents=Zdarzenia audytu bezpieczeństwa
 Audit=Audyt
@@ -1045,12 +1051,13 @@ BrowserOS=Przeglądarka OS
 ListOfSecurityEvents=Lista zdarzeń bezpieczeństwa Dolibarr
 SecurityEventsPurged=Zdarzenia dotyczące bezpieczeństwa oczyszczone
 LogEventDesc=Można włączyć dziennik Dolibarr bezpieczeństwa imprez tutaj. Administratorzy mogą wtedy zobaczyć jego zawartość za pomocą menu <b>Narzędzia systemowe - Audyt.</b> Ostrzeżenie: Funkcja ta może zużywają duże ilości danych w bazie danych.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+AreaForAdminOnly=Parametry mogą być ustawiane tylko przez <b>użytkowników z prawami administratora</b>.
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
 SystemAreaForAdminOnly=Obszar ten jest dostępny tylko dla użytkowników na prawach administratora. Żadne z uprawnień Dolibarr nie zniesie tego ograniczenia.
 CompanyFundationDesc=Edytuj na tej stronie wszystkie znane Ci informacje na temat firmy lub fundacji (Aby to zrobić, kliknij na przycisk "Modyfikuj" lub "Zapisz" na dole strony)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Tutaj możesz ustawić każdy z parametrów związanych z wyglądem i zachowaniem Dolibarr
-AvailableModules=Available app/modules
+AvailableModules=Dostępne aplikacje / moduły
 ToActivateModule=Aby uaktywnić modules, przejdź na konfigurację Powierzchnia.
 SessionTimeOut=Limit czasu dla sesji
 SessionExplanation=Numer ten gwarantuje, że sesja nigdy nie wygaśnie przed upływem tego opóźnienia. Ale PHP sessoin zarządzania nie zawsze gwarantują, że sesja wygasa po tym terminie: Ten problem występuje, jeśli system do czyszczenia Wikisłowniku sesji jest uruchomiony. <br> Uwaga: nie szczególności systemu wewnętrznej PHP będzie czyste sesji każdy <b>temat %s / %s</b> dostępu, ale tylko podczas dostępu przez innych sesji.
@@ -1062,7 +1069,7 @@ TriggerAlwaysActive=Wyzwalacze w tym pliku są zawsze aktywne, niezależnie są
 TriggerActiveAsModuleActive=Wyzwalacze w tym pliku są aktywne jako <b>modułu %s</b> 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=Wprowadź wszystkie potrzebne dane. Wartości można dodać do ustawień domyślnych.
-ConstDesc=Ta strona pozwoli ci na edycję wszystkich innych parametrów nie dostępnych w poprzednich stronach. Są to głównie parametry zastrzeżone dla programistów lub zaawansowanych użytkowników. Aby uzyskać listę opcji <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">kliknij tutaj</a>.
+ConstDesc=Ta strona pozwoli ci na edycję wszystkich innych parametrów nie dostępnych na poprzednich stronach. Są to głównie parametry zastrzeżone dla programistów lub zaawansowanych użytkowników. Aby uzyskać listę opcji <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">kliknij tutaj</a>.
 MiscellaneousDesc=Inne powiązane parametry bezpieczeństwa są zdefiniowane tutaj
 LimitsSetup=Ograniczenia / Precision konfiguracji
 LimitsDesc=Można określić limity, doprecyzowanie i optymalizacje stosowane przez Dolibarr tutaj
@@ -1087,7 +1094,7 @@ RestoreDesc2=Przywróć pliki archiwalny (np. ZIP) katalogu dokumentów, aby wyo
 RestoreDesc3=Przywróć dane z pliku kopii zapasowej, do bazy danych nowej instalacji Dolibarr lub do bazy danych tej bieżącej instalacji (<b>%s</b>). Uwaga, gdy przywracanie zostanie zakończone, należy użyć loginu i hasła, które istniały, gdy kopia zapasowa została utworzona, aby połączyć się ponownie. Aby przywrócić kopię zapasową bazy danych do bieżącej instalacji, można użyć tego asystenta.
 RestoreMySQL=Import MySQL
 ForcedToByAModule= Ta zasada jest zmuszona <b>do %s</b> przez aktywowany modułu
-PreviousDumpFiles=Wygenerowanie kopii zapasowej
+PreviousDumpFiles=Wygenerowanie kopii zapasowej bazy danych
 WeekStartOnDay=Pierwszy dzień tygodnia
 RunningUpdateProcessMayBeRequired=Uruchomiony proces aktualizacji wydaje się konieczne (programy różni się od wersji %s %s wersja bazy danych)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Należy uruchomić to polecenie z wiersza polecenia po zalogowaniu się do powłoki z <b>%s</b> użytkownika.
@@ -1111,7 +1118,7 @@ MAIN_PROXY_HOST=Imię i nazwisko / adres serwera proxy
 MAIN_PROXY_PORT=Port serwera proxy
 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 atrybuty, nie są już dostępne domyślnie i że chcesz być obsługiwane przez %s.
+DefineHereComplementaryAttributes=Określ tutaj wszystkie atrybuty, niedostępne jako domyślne, które mają być obsługiwane dla  %s.
 ExtraFields=Uzupełniające atrybuty
 ExtraFieldsLines=Atrybuty uzupełniające (linie)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1134,12 +1141,12 @@ PathToDocuments=Ścieżka do dokumentów
 PathDirectory=Katalog
 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=Ustawienia tłumaczenia
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
+TranslationKeySearch=Szukaj klucza lub ciągu tłumaczenia
+TranslationOverwriteKey=Nadpisz tłumaczony ciąg
 TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
-TranslationString=Translation string
+TranslationString=Tłumaczony ciąg
 CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
@@ -1182,8 +1189,8 @@ HRMSetup=Ustawianie modułu HR
 ##### Company setup #####
 CompanySetup=Firmy konfiguracji modułu
 CompanyCodeChecker=Moduł dla stron trzecich i generowania kodu kontroli (klienta lub dostawcy)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
+AccountCodeManager=Moduł do generowania kodów księgowych (klient lub dostawca)
+NotificationsDesc=Powiadomienia email pozwalają na wysyłanie automatycznych wiadomości email w tle dla pewnym zdarzeń w aplikacji Dolibarr. Odbiorca powiadomień może być zdefiniowany:
 NotificationsDescUser=* per users, one user at time.
 NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
@@ -1271,10 +1278,10 @@ LDAPFunctionsNotAvailableOnPHP=LDAP funkcje nie są availbale w PHP
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
 LDAPNamingAttribute=Klucz LDAP
-LDAPSynchronizeUsers=Synchronizacja Dolibarr użytkowników LDAP
-LDAPSynchronizeGroups=Synchronizacja Dolibarr grup LDAP
-LDAPSynchronizeContacts=Synchronizacja kontaktów z Dolibarr LDAP
-LDAPSynchronizeMembers=Synchronizacja członków fundacji Dolibarr modułu z LDAP
+LDAPSynchronizeUsers=Organizacja użytkowników w LDAP
+LDAPSynchronizeGroups=Organizacja grup w LDAP
+LDAPSynchronizeContacts=Organizacja kontaktów w LDAP
+LDAPSynchronizeMembers=Organizacja członków fundacji w LDAP
 LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
 LDAPPrimaryServer=Podstawowy serwer
 LDAPSecondaryServer=Dodatkowy serwer
@@ -1291,7 +1298,7 @@ LDAPUserDn=Użytkowników DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Kompletny DN (dawniej: ou= users, dc= społeczeństwa, dc= com)
 LDAPGroupDn=Grupy DN
 LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=Kompletny DN (dawniej: ou= Grupy, dc= społeczeństwa, dc= com)
-LDAPServerExample=Adres serwera (np. localhost, 192.168.0.2, LDAPS: / / ldap.example.com /)
+LDAPServerExample=Adres serwera (np. localhost, 192.168.0.2, ldaps://ldap.example.com/)
 LDAPServerDnExample=Complete DN (ex: dc=company,dc=Kompletny DN (dawniej: dc= firma, dc= com)
 LDAPDnSynchroActive=Użytkownicy i grupy synchronizacji
 LDAPDnSynchroActiveExample=LDAP do Dolibarr lub Dolibarr do synchronizacji LDAP
@@ -1326,13 +1333,13 @@ LDAPTestSynchroMemberType=Test member type synchronization
 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
+LDAPSynchroKOMayBePermissions=Niepowodzenie testu synchronizacji. Upewnij się, że połączenie z serwerem jest poprawnie skonfigurowane i pozwala na aktualizacje LDAP
 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=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)
-LDAPSetupForVersion3=Skonfigurowane dla serwera LDAP w wersji 3
-LDAPSetupForVersion2=Skonfigurowane dla serwera LDAP w wersji 2
+LDAPSetupForVersion3=Serwer LDAP skonfigurowany dla wersji 3
+LDAPSetupForVersion2=Serwer LDAP skonfigurowany dla wersji 2
 LDAPDolibarrMapping=Dolibarr Mapping
 LDAPLdapMapping=LDAP Mapping
 LDAPFieldLoginUnix=Login (UNIX)
@@ -1414,7 +1421,7 @@ TestNotPossibleWithCurrentBrowsers=Taka automatyczna detekcja nie jest możliwe
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
 DefaultCreateForm=Default values (on forms to create)
 DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
+DefaultSortOrder=Domyślna kolejność sortowania
 DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produkty konfiguracji modułu
@@ -1441,13 +1448,16 @@ 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=System Windows obsługuje tylko LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Darowizna konfiguracji modułu
 DonationsReceiptModel=Szablon otrzymania wpłaty
 ##### Barcode #####
 BarcodeSetup=Barcode konfiguracji
-PaperFormatModule=Format druku modułu
-BarcodeEncodeModule=Barcode typ kodowania
+PaperFormatModule=Moduł formatu wydruku
+BarcodeEncodeModule=Kodowanie kodu kreskowego
 CodeBarGenerator=Generator kodów kreskowych
 ChooseABarCode=Nie określono generatora
 FormatNotSupportedByGenerator=Format nie jest obsługiwany przez ten generator
@@ -1457,8 +1467,8 @@ BarcodeDescUPC=Kod kreskowy typu UPC
 BarcodeDescISBN=Kod kreskowy typu ISBN
 BarcodeDescC39=Kod kreskowy typu C39
 BarcodeDescC128=Kod kreskowy typu C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
+BarcodeDescDATAMATRIX=Kod kreskowy typu Datamatrix
+BarcodeDescQRCODE=Kod kreskowy typu QR
 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". <br> Na przykład: / usr / local / bin / genbarcode
 BarcodeInternalEngine=Silnik wewnętrznego
 BarCodeNumberManager=Manager auto zdefiniować numery kodów kreskowych
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Nie można zainicjowac menu
 ##### Tax #####
 TaxSetup=Podatki, podatki socjalne lub podatkowe i dywidendy konfiguracji moduł
 OptionVatMode=Opcja d'exigibilit de TVA
-OptionVATDefault=Kasowej
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Memoriału
 OptionVatDefaultDesc=VAT jest należny: <br> - W dniu dostawy / płatności za towary <br> - Na opłatę za usługi
 OptionVatDebitOptionDesc=VAT jest należny: <br> - W dniu dostawy / płatności za towary <br> - Na fakturze (obciążenie) na usługi
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Czas VAT exigibility domyślnie wg wybranej opcji:
 OnDelivery=Na dostawy
 OnPayment=W sprawie wypłaty
@@ -1550,15 +1562,15 @@ SupposedToBeInvoiceDate=Data użyta na fakturze
 Buy=Kupić
 Sell=Sprzedać
 InvoiceDateUsed=Data użyta na fakturze
-YourCompanyDoesNotUseVAT=Twoja firma została zdefiniowana jako nie rozliczająca się z podatku VAT (Strona główna - Konfiguracja - Firma / Fundacja), więc nie ma opcji ustawienia podatku VAT do ustawienia.
-AccountancyCode=Accounting Code
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Kod księgowy
 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 -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE=Użyj typów zdarzeń (zarządzanie w menu Konfiguracja -> Słowniki -> Typ zdarzeń w agendzie)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of event into event create form
 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
@@ -1615,9 +1627,9 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Firma Multi-Moduł konfiguracji
 ##### Suppliers #####
 SuppliersSetup=Dostawca konfiguracji modułu
-SuppliersCommandModel=Kompletny szablon zamówienia dostawcy (logo. ..)
-SuppliersInvoiceModel=Kompletny szablon faktury dostawcy (logo. ..)
-SuppliersInvoiceNumberingModel=Modele numeracji faktur dostawca
+SuppliersCommandModel=Kompletny szablon zamówienia dostawcy (logo...)
+SuppliersInvoiceModel=Kompletny szablon faktury dostawcy (logo...)
+SuppliersInvoiceNumberingModel=Modele numeracji faktur dostawcy
 IfSetToYesDontForgetPermission=Jeśli jest ustawiona na yes, nie zapomnij, aby zapewnić uprawnień do grup lub użytkowników dopuszczonych do drugiego zatwierdzenia
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind konfiguracji modułu
@@ -1632,17 +1644,17 @@ ProjectsSetup=Projekt instalacji modułu
 ProjectsModelModule=Wzór dokumentu projektu sprawozdania
 TasksNumberingModules=Zadania numeracji modułu
 TaskModelModule=Zadania raporty modelu dokumentu
-UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient)
+UseSearchToSelectProject=Czekaj na wciśnięcie klawisza przed załadowaniem zawartości listy (To może zwiększyć wydajność jeżeli masz dużą ilość projektów, ale zmniejszy wygodę użytkowania)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
+AccountingPeriods=Okresy rozliczeniowe
+AccountingPeriodCard=Okres rozliczeniowy
 NewFiscalYear=Nowy okres rozliczeniowy
 OpenFiscalYear=Otwórz okres rozliczeniowy
 CloseFiscalYear=Zamknij okres rozliczeniowy
 DeleteFiscalYear=Usuń okres rozliczeniowy
 ConfirmDeleteFiscalYear=Jesteś pewien, że chcesz usunąć ten okres rozliczeniowy?
-ShowFiscalYear=Show accounting period
+ShowFiscalYear=Pokaż okres rozliczeniowy
 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
@@ -1651,11 +1663,11 @@ 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
+SortOrder=Kolejność sortowania
 Format=Format
 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
+ExpenseReportsSetup=Konfiguracja modułu Raporty Kosztów
 TemplatePDFExpenseReports=Szablony dokumentów w celu wygenerowania raportu wydatków dokument
 ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
@@ -1699,7 +1711,7 @@ OpportunityPercent=When you create an opportunity, you will defined an estimated
 TemplateForElement=This template record is dedicated to which element
 TypeOfTemplate=Type of template
 TemplateIsVisibleByOwnerOnly=Template is visible by owner only
-VisibleEverywhere=Visible everywhere
+VisibleEverywhere=Widoczne wszędzie
 VisibleNowhere=Visible nowhere
 FixTZ=Strefa czasowa fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
@@ -1718,14 +1730,15 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Pokaż domyślnie w widoku listy
 YouUseLastStableVersion=Używasz ostatniej stabilnej wersji
 TitleExampleForMajorRelease=Przykład wiadomości można użyć, aby ogłosić to główne wydanie (prosimy używać go na swoich stronach internetowych)
 TitleExampleForMaintenanceRelease=Przykład wiadomości można użyć, aby ogłosić wydanie konserwacji (prosimy używać go na swoich stronach internetowych)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s jest dostępny. Wersja %s  jest głównym wydaniem z dużą ilością nowych funkcji dla użytkowników i deweloperów. Możesz ją pobrać na stronie https://www.dolibarr.org (podkatalog Wersje stabilne). Pełna lista zmian dostępna jest w <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s jest dostępny. Wersja %s jest wydaniem poprawkowym, więc zawiera tylko poprawki naprawiające błędy. Zalecamy wszystkim użycie starszej wersji do aktualizacji do tej wersji. Jak w każdej wersji poprawkowej, nie ma tutaj nowych funkcjonalności, zmian w strukturze danych w porównaniu do aktualnej wersji. Możesz ją pobrać na stronie https://www.dolibarr.org (podkatalog Wersje stabilne). Pełna lista zmian dostępna jest w <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>.
 MultiPriceRuleDesc=Gdy opcja "Kilka poziom cen na produkt / usługę" jest włączone, można zdefiniować różne ceny (jeden na poziomie cen) dla każdego produktu. Aby zaoszczędzić czas, można wprowadzić tutaj rządzić mieć cenę każdego poziomu autocalculated według ceny pierwszym poziomie, więc trzeba będzie wprowadzić tylko cenę za pierwszego poziomu na każdym produkcie. Ta strona jest tutaj, aby zaoszczędzić czas i może być przydatne tylko wtedy, jeśli ceny każdego poziomó są w stosunku do pierwszego poziomu. Można zignorować tę stronę w większości przypadków.
-ModelModulesProduct=Templates for product documents
+ModelModulesProduct=Szablon dokumentu produktu
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1754,7 +1767,7 @@ CommandIsNotInsideAllowedCommands=The command you try to run is not inside list
 LandingPage=Landing page
 SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
 ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permission defined
+UserHasNoPermissions=Ten użytkownik nie ma zdefiniowanych uprawnień
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 15bc6380a5f..604be4379a8 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -12,9 +12,9 @@ Event=Wydarzenie
 Events=Zdarzenia
 EventsNb=Ilość zdarzeń
 ListOfActions=Lista zdarzeń
-EventReports=Event reports
+EventReports=Raport zdarzeń
 Location=Lokalizacja
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Dla każdego użytkownika w grupie
 EventOnFullDay=Wydarzenia całodniowe
 MenuToDoActions=Wszystkie zdarzenia niekompletne
 MenuDoneActions=Wszystkie zdarzenia zakończone
@@ -29,36 +29,38 @@ ViewCal=Pokaż miesiąc
 ViewDay=Pokaż dzień
 ViewWeek=Pokaż tydzień
 ViewPerUser=Za wglądem użytkownika
-ViewPerType=Per type view
+ViewPerType=Wyświetl po typie
 AutoActions= Automatyczne wypełnianie
-AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaAutoActionDesc= Zdefiniuj tutaj zdarzenia, które chcesz aby Dolibarr automatycznie dodawał do agendy. Jeżeli nic nie zaznaczysz, tylko akcje ręcznie dołączone będą zarejestrowane i widoczne w agendzie. Automatyczne śledzenie zdarzeń biznesowych na obiektach (zatwierdzenie, zmiana statusu) nie będą zapisane.
 AgendaSetupOtherDesc= Ta strona zawiera opcje, pozwalające eksportować Twoje zdarzenia Dolibarr'a do zewnętrznego kalendarza (Thunderbird, Google Calendar, ...)
 AgendaExtSitesDesc=Ta strona pozwala zdefiniować zewnętrzne źródła kalendarzy, aby zobaczyć uwzględnić zapisane tam zdarzenia w agendzie Dolibarr'a.
 ActionsEvents=Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
+EventRemindersByEmailNotEnabled=Przypomnienie o zdarzeniach przez wiadomość email jest nie włączone w ustawieniach modułu Agenda
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Kontrahent %s utworzony
-ContractValidatedInDolibarr=Umowa% s potwierdzone
-PropalClosedSignedInDolibarr=Wniosek% s podpisana
-PropalClosedRefusedInDolibarr=Wniosek% s odmówił
+ContractValidatedInDolibarr=Umowa  %s potwierdzona
+PropalClosedSignedInDolibarr=Propozycja %s podpisana
+PropalClosedRefusedInDolibarr=Propozycja %s odrzucona
 PropalValidatedInDolibarr=Zatwierdzenie oferty %s
-PropalClassifiedBilledInDolibarr=Wniosek% s rozliczane niejawnych
+PropalClassifiedBilledInDolibarr=Propozycja %s sklasyfikowana jako rozliczona
 InvoiceValidatedInDolibarr=Zatwierdzenie faktury %s
 InvoiceValidatedInDolibarrFromPos=Faktura %s potwierdzona z POS
 InvoiceBackToDraftInDolibarr=Zmiana statusu faktura %s na szkic
 InvoiceDeleteDolibarr=Usunięcie faktury %s
-InvoicePaidInDolibarr=Faktura% s zmieniła się zwrócić
-InvoiceCanceledInDolibarr=Faktura% s anulowana
-MemberValidatedInDolibarr=% S potwierdzone państwa
+InvoicePaidInDolibarr=Faktura %s sklasyfikowana jako zapłacona
+InvoiceCanceledInDolibarr=Faktura %s anulowana
+MemberValidatedInDolibarr=Członek %s potwierdzony
 MemberModifiedInDolibarr=Użytkownik %s zmodyfikowany
-MemberResiliatedInDolibarr=Member %s terminated
-MemberDeletedInDolibarr=Użytkownik usunął%
-MemberSubscriptionAddedInDolibarr=Zapisy na członka% s dodany
+MemberResiliatedInDolibarr=Członek %s został usunięty
+MemberDeletedInDolibarr=Członek %s usunięty
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Przesyłka %s potwierdzona
-ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
-ShipmentDeletedInDolibarr=Przesyłka% s usunięte
-OrderCreatedInDolibarr=Order %s created
+ShipmentClassifyClosedInDolibarr=Wysyłka %s sklasyfikowana jako rozliczona
+ShipmentUnClassifyCloseddInDolibarr=Wysyłka %s sklasyfikowana jako ponownie otwarta
+ShipmentDeletedInDolibarr=Przesyłka %s usunięta
+OrderCreatedInDolibarr=Zamówienie %s utworzone
 OrderValidatedInDolibarr=Zatwierdzenie zamówienia %s
 OrderDeliveredInDolibarr=Zamówienie %s sklasyfikowanych dostarczonych.
 OrderCanceledInDolibarr=Anulowanie zamówienia %s
@@ -67,7 +69,7 @@ OrderApprovedInDolibarr=Akceptacja zamówienia %s
 OrderRefusedInDolibarr=Zamówienie %s odmówione
 OrderBackToDraftInDolibarr=Zmiana statusu zamówienia %s na draft
 ProposalSentByEMail=Oferta %s wysłana e-mailem
-ContractSentByEMail=Contract %s sent by EMail
+ContractSentByEMail=Kontrakt %s wysłany za pomocą wiadomości email
 OrderSentByEMail=Zamówienie klienta %s wysłane e-mailem
 InvoiceSentByEMail=Faktura %s wysłana e-mailem
 SupplierOrderSentByEMail=Zamówienie dostawcy %s wysłane e-mailem
@@ -81,23 +83,24 @@ InvoiceDeleted=Faktura usunięta
 PRODUCT_CREATEInDolibarr=Produkt %s utworzony
 PRODUCT_MODIFYInDolibarr=Produkt %s zmodyfikowany
 PRODUCT_DELETEInDolibarr=Produkt %s usunięty
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+EXPENSE_REPORT_CREATEInDolibarr=Raport kosztów %s utworzony
+EXPENSE_REPORT_VALIDATEInDolibarr=Raport kosztów %s zatwierdzony
+EXPENSE_REPORT_APPROVEInDolibarr=Raport kosztów %s zaakceptowany
+EXPENSE_REPORT_DELETEInDolibarr=Raport kosztów %s usunięty
+EXPENSE_REPORT_REFUSEDInDolibarr=Raport kosztów %s odrzucony
 PROJECT_CREATEInDolibarr=Projekt %s utworzony
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
+PROJECT_MODIFYInDolibarr=Projekt %s zmodyfikowany
+PROJECT_DELETEInDolibarr=Projekt %s usunięty
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
+AgendaModelModule=Szablon dokumentu dla zdarzenia
 DateActionStart=Data rozpoczęcia
 DateActionEnd=Data zakończenia
 AgendaUrlOptions1=Możesz także dodać następujące parametry do filtr wyjściowy:
 AgendaUrlOptions3=<b>logina =%s</b>, aby ograniczyć wyjścia do działań będących własnością użytkownika <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>projekt=PROJECT_ID</b> by ograniczyć wyjścia do działań związanych z projektem <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Wyświetlaj urodziny kontaktów
 AgendaHideBirthdayEvents=Ukryj urodziny kontaktów
 Busy=Zajęty
@@ -109,7 +112,7 @@ ExportCal=Eksport kalendarza
 ExtSites=Import zewnętrznych kalendarzy
 ExtSitesEnableThisTool=Pokaż zewnętrzne kalendarze (zdefiniowane w globalnej konfiguracji) do agendy Nie ma wpływu na zewnętrzne kalendarze zdefiniowane przez użytkowników.
 ExtSitesNbOfAgenda=Ilość kalendarzy
-AgendaExtNb=Kalendarz nr %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL dostępu do pliku .ical
 ExtSiteNoLabel=Brak opisu
 VisibleTimeRange=Widoczny zakres czasu
@@ -119,7 +122,7 @@ MyAvailability=Moja dostępność
 ActionType=Typ wydarzenia
 DateActionBegin=Data startu wydarzenia
 CloneAction=Zamknij wydarzenie
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+ConfirmCloneEvent=Czy jesteś pewien, że chcesz powielić zdarzenie <b>%s</b>?
 RepeatEvent=Powtórz wydarzenie
 EveryWeek=Każdego tygodnia
 EveryMonth=Każdego miesiąca
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 750cac617f1..03072094e0d 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Spłacona
 DeletePayment=Usuń płatności
 ConfirmDeletePayment=Czy jesteś pewien, że chcesz usunąć tą płatność?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Płatności dostawców
 ReceivedPayments=Otrzymane płatności
 ReceivedCustomersPayments=Zaliczki otrzymane od klientów
@@ -91,7 +92,7 @@ PaymentAmount=Kwota płatności
 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 potrzeba. <br> Wprowadź edycje wpisu lub potwierdź i pomyśl o stworzeniu noty kredytowej dla nadwyżki otrzymanych z nadpłaty faktur.
-HelpPaymentHigherThanReminderToPaySupplier=Uwagi, kwotę płatności z jednego lub większej liczby rachunków jest większa niż reszta zapłacić. <br> Edytuj swoje wejście, w przeciwnym razie potwierdzić.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Klasyfikacja "wpłacono"
 ClassifyPaidPartially=Klasyfikacja "wpłacono częściowo"
 ClassifyCanceled=Klasyfikacja "Porzucono"
@@ -110,6 +111,7 @@ DoPayment=Wprowadź płatność
 DoPaymentBack=Wprowadź zwrot
 ConvertToReduc=Zamień na przyszły rabat
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Wprowadź płatność otrzymaną od klienta
 EnterPaymentDueToCustomer=Dokonaj płatności dla klienta
 DisabledBecauseRemainderToPayIsZero=Nieaktywne, ponieważ upływająca nieopłacona kwota wynosi zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Projekt (musi zostać zatwierdzone)
 BillStatusPaid=Płatność
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Płatność (gotowe do finalnej faktury)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Opuszczony
 BillStatusValidated=Zatwierdzona (trzeba zapłacić)
 BillStatusStarted=Rozpoczęcie
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=W oczekiwaniu
 AmountExpected=Kwota twierdził
 ExcessReceived=Nadmiar otrzymany
+ExcessPaid=Excess paid
 EscompteOffered=Rabat oferowane (płatność przed kadencji)
 EscompteOfferedShort=Rabat
 SendBillRef=Złożenie faktury% s
@@ -283,16 +286,20 @@ Deposit=Zaliczka
 Deposits=Zaliczki
 DiscountFromCreditNote=Rabat od kredytu pamiętać %s
 DiscountFromDeposit=Zaliczki z faktury %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Tego rodzaju kredyt może być użyta na fakturze przed jej zatwierdzeniem
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nowe zniżki
 NewRelativeDiscount=Nowa powiązana zniżka
+DiscountType=Discount type
 NoteReason=Uwaga/Powód
 ReasonDiscount=Powód
 DiscountOfferedBy=Przyznane przez
 DiscountStillRemaining=Dostępne zniżki
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill adres
 HelpEscompte=Ta zniżka zniżki przyznawane klienta, ponieważ jego paiement został złożony przed terminem.
 HelpAbandonBadCustomer=Kwota ta została opuszczonych (klient mówi się, że zły klient) i jest uważany za exceptionnal luźne.
@@ -304,7 +311,7 @@ InvoiceId=ID Faktury
 InvoiceRef=Nr referencyjny faktury
 InvoiceDateCreation=Data utworzenia faktury
 InvoiceStatus=Status faktury
-InvoiceNote=Faktura notatki
+InvoiceNote=Notatka do faktury
 InvoicePaid=Faktura paid
 PaymentNumber=Numer płatności
 RemoveDiscount=Usuń zniżki
@@ -341,17 +348,17 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
+ViewAvailableGlobalDiscounts=Pokaż dostępne zniżki
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -371,7 +378,7 @@ PaymentConditionPT_ORDER=Przy zamówieniu
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50 %% z góry, 50%% przy dostawie
 PaymentConditionShort10D=10 dni
-PaymentCondition10D=1o dni
+PaymentCondition10D=10 dni
 PaymentConditionShort10DENDMONTH=10 days of month-end
 PaymentCondition10DENDMONTH=Within 10 days following the end of the month
 PaymentConditionShort14D=14 dni
@@ -514,10 +521,14 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
+DeleteRepeatableInvoice=Usuń szablon faktury
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
 BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 02a8af39163..03ae564da5a 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -43,7 +43,8 @@ Individual=Osoba prywatna
 ToCreateContactWithSameName=Utworzy automatycznie kontakt/adres z takimi samymi informacjami jak dane kontrahenta. Najczęściej jeżeli twój kontrahent jest osobą fizyczną, wystarczy utworzenie samego kontrahenta.
 ParentCompany=Firma macierzysta
 Subsidiaries=Oddziały
-ReportByCustomers=Raport wg klientów
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Raport wg stawek
 CivilityCode=Zwrot grzecznościowy
 RegisteredOffice=Siedziba
@@ -56,7 +57,7 @@ Address=Adres
 State=Województwo
 StateShort=Województwo
 Region=Region
-Region-State=Region - State
+Region-State=Region - Województwo
 Country=Kraj
 CountryCode=Kod kraju
 CountryId=ID kraju
@@ -75,10 +76,12 @@ Town=Miasto
 Web=Strona www
 Poste= Stanowisko
 DefaultLang=Domyślny język
-VATIsUsed=Jest płatnikiem VAT
-VATIsNotUsed=Nie jest płatnikiem VAT
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Uzupełnij adres danymi kontrahenta
 ThirdpartyNotCustomerNotSupplierSoNoRef=Ani kontrahent, ani klient, ani dostawca, nie ma obiektów odsyłających
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Konto bankowe dla płatności
 OverAllProposals=Propozycje
 OverAllOrders=Zamówienia
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof ID 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=NIP
-VATIntraShort=NIP
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Składnia jest poprawna
+VATReturn=VAT return
 ProspectCustomer=Perspektywa/Klient
 Prospect=Perspektywa
 CustomerCard=Karta Klienta
 Customer=Klient
 CustomerRelativeDiscount=Względny rabat klienta
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Względny rabat
 CustomerAbsoluteDiscountShort=Bezwzględny rabat
 CompanyHasRelativeDiscount=Ten klient ma standardowy rabat <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ten klient domyślnie nie posiada względnego rabatu
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=Ten klient ma dostępny rabat (kredyty lub zaliczki) dla <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Ten klient ma dostępny rabat (komercyjny, zaliczki) dla <b>%s</b>%s
 CompanyHasCreditNote=Ten klient nadal posiada noty kredytowe dla <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Ten klient nie posiada punktów rabatowych
-CustomerAbsoluteDiscountAllUsers=Bezwzględne rabaty (przyznawane przez wszystkich użytkowników)
-CustomerAbsoluteDiscountMy=Bezwzględne rabaty (przyznawane przez siebie)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Żaden
 Supplier=Dostawca
 AddContact=Stwórz konktakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Brak dostępu do Dolibarr
 ExportDataset_company_1=Kontrahenci (Firmy/Fundacje/Osoby fizyczne) i ich ustawienia
 ExportDataset_company_2=Kontakty i właściwości
 ImportDataset_company_1=Kontrahenci (Firmy/Fundacje/Osoby fizyczne) i ich ustawienia
-ImportDataset_company_2=Kontakty/Adresy (Kontrahentów lub nie) i atrybuty
-ImportDataset_company_3=Szczegóły banku
-ImportDataset_company_4=Efektywność sprzedaży przedstawicieli Handlowych ds. Kontrahentów.
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Poziom cen
 DeliveryAddress=Adres dostawy
 AddAddress=Dodaj adres
@@ -406,15 +419,16 @@ ProductsIntoElements=Lista produktów/usług w %s
 CurrentOutstandingBill=Biężący, niezapłacony rachunek
 OutstandingBill=Maksymalna kwota niezapłaconego rachunku
 OutstandingBillReached=Maksymalna kwota dla niespłaconych rachunków osiągnięta
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Wróć NUMERO z formatu %syymm-nnnn klienta i kod %syymm-nnnn dla dostawcy kod yy gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0.\nZwraca numer w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie yy to rok, mm to miesiąc i nnnn jest sekwencją bez przerwy, bez powrotu do 0.
 LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie.
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
 MergeOriginThirdparty=Duplikuj kontrahenta (kontrahenta, którego chcesz usunąć)
 MergeThirdparties=Scal kontrahentów
 ConfirmMergeThirdparties=Jesteś pewien, że chcesz połączyć tego kontrahenta z obecny? Wszystkie połączone dokumenty (faktury, zamówienia, ...) zostaną przeniesione do obecnego kontrahenta, a wtedy ten kontrahent zostanie usunety.
-ThirdpartiesMergeSuccess=Kontrahenci zostali scaleni
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login przedstawiciela handlowego
 SaleRepresentativeFirstname=Imię przedstawiciela handlowego
 SaleRepresentativeLastname=Nazwisko przedstawiciela handlowego
-ErrorThirdpartiesMerge=Wystąpił błąd podczas usuwania kontrahenta. Sprawdź logi. Zmiany zostały cofnięte.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Kod dla nowego klienta lub dostawcy zasugerowany dla zduplikowanego kodu
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 0708dd13998..55cb8da5453 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -31,7 +31,7 @@ Credit=Kredyt
 Piece=Rachunkowość Doc.
 AmountHTVATRealReceived=HT zebrane
 AmountHTVATRealPaid=HT paid
-VATToPay=VAT do zapłaty
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=Płatności IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Zwrot
 SocialContributionsPayments=Płatności za ZUS/podatki
 ShowVatPayment=Pokaż płatności za podatek VAT
@@ -157,30 +158,34 @@ RulesResultDue=- Obejmuje zaległe faktury, koszty, podatek VAT, darowizny nieza
 RulesResultInOut=- Obejmuje rzeczywiste płatności dokonywane za faktury, koszty, podatek VAT oraz wynagrodzenia. <br> Opiera się na  datach płatności faktur, wygenerowania kosztów, podatku VAT oraz wynagrodzeń. Dla darowizn brana jest pod uwagę data przekazania darowizny.
 RulesCADue=- Zawiera numery faktur klienta, niezależnie czy są płacone, czy też nie. <br> - Jest oparte na podstawie daty zatwierdzenia tych faktur. <br>
 RulesCAIn=- Obejmuje wszystkie skuteczne płatności faktur otrzymanych od klientów. <br> - Jest on oparty na dacie płatności tych faktur <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Raport osób trzecich IRPF
-LT1ReportByCustomersInInputOutputModeES=Sprawozdanie trzecim RE partii
-VATReport=Raport VAT
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Sprawozdanie trzecim RE partii
+LT2ReportByCustomersES=Raport osób trzecich IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Sprawozdanie stopy RE
+LT2ReportByQuartersES=Sprawozdanie IRPF stopy
 SeeVATReportInInputOutputMode=Zobacz raport <b>%sVAT encasement%s</b> na standardowe obliczenia
 SeeVATReportInDueDebtMode=<b>%sVAT</b> sprawozdanie Zobacz <b>na flow%s</b> do obliczenia z opcją na przepływ
 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.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 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.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Uwaga: W przypadku dóbr materialnych, należy użyć daty dostawy do bardziej sprawiedliwego.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/faktury
 NotUsedForGoods=Nie używany od towarów
 ProposalStats=Statystyki na temat propozycji
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=W zależności od dostawcy, wybierz odpowiednią met
 TurnoverPerProductInCommitmentAccountingNotRelevant=Raport obroty na produkcie, w przypadku korzystania z trybu <b>rachunkowości gotówki,</b> nie ma znaczenia. Raport ten jest dostępny tylko w przypadku korzystania z trybu <b>zaangażowanie rachunkowości</b> (patrz konfiguracja modułu księgowego).
 CalculationMode=Tryb Obliczanie
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -233,6 +238,7 @@ LinkedFichinter=Link to an intervention
 ImportDataset_tax_contrib=ZUS/podatek
 ImportDataset_tax_vat=Płatności VAT
 ErrorBankAccountNotFound=Błąd: Konto bankowe nie znalezione
-FiscalPeriod=Accounting period
+FiscalPeriod=Okres rozliczeniowy
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index a475e7c94ce..745767075eb 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Brak zarejestrowanych zadań
 CronPriority=Priorytet
 CronLabel=Etykieta
 CronNbRun=Ilość uruchomień
-CronMaxRun=Maksymalna liczba uruchomień
+CronMaxRun=Max number launch
 CronEach=Każdy
 JobFinished=Zadania uruchomione i zakończone
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Z
 CronType=Typ zadania
 CronType_method=Call method of a PHP Class
 CronType_command=Polecenie powłoki
-CronCannotLoadClass=Nie można załadować klasy s% lub obiektu %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Idź do "Strona główna - Narzędzia administracyjne - Zaplanowane zadania" aby zobaczyć i zmieniać zaplanowane zadania
 JobDisabled=Zadanie wyłączone
 MakeLocalDatabaseDumpShort=Backup lokalnej bazy danych
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 62ebe49f726..c85f437535f 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -73,7 +73,7 @@ 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=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Nie udało się usunąć rekordu, ponieważ ma on pewne potomstwo.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Nie można usunąc wpisu. Jest on już używany lub dołączony do innego obiektu.
@@ -88,7 +88,7 @@ ErrorFileIsInfectedWithAVirus=Program antywirusowy nie był w stanie potwierdzi
 ErrorSpecialCharNotAllowedForField=Znaki specjalne nie są dozwolone dla pola "%s"
 ErrorNumRefModel=Odniesienia nie istnieje w bazie danych (%s) i nie jest zgodna z tą zasadą numeracji. Zmiana nazwy lub usuwanie zapisu w odniesieniu do aktywacji tego modułu.
 ErrorQtyTooLowForThisSupplier=Zbyt mała ilość tego dostawcy lub ceny nie określono tego produktu dla tego dostawca
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Ustawienia modułu wyglądają na niekompletne. Idź do Strona główna - Konfiguracja - Moduły aby ukończyć.
 ErrorBadMask=Błąd w masce wprowadzania
 ErrorBadMaskFailedToLocatePosOfSequence=Błąd, maska ​​bez kolejnego numeru
 ErrorBadMaskBadRazMonth=Błąd, zła wartość zresetowane
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Nie udało się dodać% s do% s listy Mailman lub
 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=Połączenie z bazą danych nie powiodło się. Sprawdź czy serwer MySQL jest uruchomiony (w większości przypadków, można go uruchomić z linii poleceń komendą "sudo /etc/init.d/mysql start").
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Nie udało się dodać kontaktu
 ErrorDateMustBeBeforeToday=Data nie może być nowsza od dzisiejszej
 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Twój login został zmodyfikowany. Z powodów bezpieczeństwa musisz zalogować się z użyciem nowego loginy przed kolejną czynnością.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/pl_PL/loan.lang b/htdocs/langs/pl_PL/loan.lang
index 817fbdd1590..f7277feb703 100644
--- a/htdocs/langs/pl_PL/loan.lang
+++ b/htdocs/langs/pl_PL/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Konfiguracja modułu kredytu
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Domyśly kapitał konta rachunkowego
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Domyślnie odsetki od rachunku księgowego
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Domyślnie ubezpieczenie rachunku księgowego
-CreateCalcSchedule=Utwórz / zmodyfikuj harmonogram kredytu
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 2f8963d1c29..9714e10deff 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -74,10 +74,11 @@ AllRecipientSelected=The recipients of the %s record selected (if their email is
 GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
-ResultOfMailSending=Wynik masowego wysyłania EMail
+ResultOfMailSending=Wynik masowego wysyłania wiadomości email
 NbSelected=Wybrane nb
 NbIgnored=Nb ignorowane
 NbSent=Nb wysłany
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Aktualna liczba ukierunkowanych maili kontaktowych
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 5e132c414d8..afe179b35d4 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Połączenia z bazą danych
-NoTemplateDefined=No template available for this email type
+NoTemplateDefined=Szablon niedostępny dla tego typu wiadomości email
 AvailableVariables=Dostępne zmienne substytucji
 NoTranslation=Brak tłumaczenia
 Translation=Tłumaczenie
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametr %s nie został zdefiniowany
 ErrorUnknown=Nieznany błąd
 ErrorSQL=Błąd SQL
 ErrorLogoFileNotFound=Logo pliku ' %s' nie zostało odnalezione
-ErrorGoToGlobalSetup=Przejdź do ustawień 'Firma/Organizacja' aby to naprawić
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Przejdź do modułu konfiguracji aby naprawić
 ErrorFailedToSendMail=Próba wysłania maila nie udana (nadawca=%s, odbiorca=%s)
 ErrorFileNotUploaded=Plik nie został załadowany. Sprawdź, czy rozmiar nie przekracza maksymalnej dopuszczalnej wagi, lub czy wolne miejsce jest dostępne na dysku. Sprawdz czy nie ma już pliku o takiej samej nazwie w tym katalogu.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraj
 ErrorNoSocialContributionForSellerCountry=Błąd, brak określonej stopy podatkowej dla kraju '%s'.
 ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Nie masz autoryzacji aby to zrobić
 SetDate=Ustaw datę
 SelectDate=Wybierz datę
 SeeAlso=Zobacz także %s
 SeeHere=Zobacz tutaj
+ClickHere=Kliknij tutaj
+Here=Here
 Apply=Zastosuj
 BackgroundColorByDefault=domyślny kolor tła
 FileRenamed=Nazwa pliku została pomyślnie zmieniona
@@ -77,7 +79,7 @@ FileGenerated=Plik został wygenerowany pomyślnie
 FileSaved=Plik został zapisany pomyślnie
 FileUploaded=Plik został pomyślnie przesłany
 FileTransferComplete=Plik(i) załadowane pomyślnie
-FilesDeleted=Plik (i) usunięte pomyślnie
+FilesDeleted=Plik(i) usunięte pomyślnie
 FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym celu wybierz opcję "dołącz plik".
 NbOfEntries=Liczba wejść
 GoToWikiHelpPage=Przeczytaj pomoc online (wymaga połączenia z internetem)
@@ -185,6 +187,7 @@ ToLink=Łącze
 Select=Wybierz
 Choose=Wybrać
 Resize=Zmiana rozmiaru
+ResizeOrCrop=Resize or Crop
 Recenter=Wyśrodkuj
 Author=Autor
 User=Użytkownik
@@ -201,7 +204,7 @@ Parameter=Parametr
 Parameters=Parametry
 Value=Wartość
 PersonalValue=Osobiste wartości
-NewObject=Nowe %s
+NewObject=Nowy %s
 NewValue=Nowa wartość
 CurrentValue=Aktualna wartość
 Code=Kod
@@ -263,9 +266,9 @@ DateBuild=Raport stworzenia daty
 DatePayment=Data płatności
 DateApprove=Data zatwierdzania
 DateApprove2=Termin zatwierdzania (drugie zatwierdzenie)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
+RegistrationDate=Data rejestracji
+UserCreation=Tworzenie użytkownika
+UserModification=Modyfikacja użytkownika
 UserValidation=Validation user
 UserCreationShort=Utwórz użytkownika
 UserModificationShort=Zmień użytkownika
@@ -311,8 +314,8 @@ KiloBytes=Kilobajtów
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=Terabajtów
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Utworzył
+UserModif=Ostatnio modyfikował
 b=b.
 Kb=Kb
 Mb=Mb
@@ -325,8 +328,10 @@ Default=Domyślny
 DefaultValue=Wartość domyślna
 DefaultValues=Domyślne wartości
 Price=Cena
+PriceCurrency=Price (currency)
 UnitPrice=Cena jednostkowa
 UnitPriceHT=Cena jednostkowa (netto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Cena jednostkowa
 PriceU=cen/szt.
 PriceUHT=cen/szt (netto)
@@ -334,6 +339,7 @@ PriceUHTCurrency=cen/szt (w walucie)
 PriceUTTC=Podatek należny/naliczony
 Amount=Ilość
 AmountInvoice=Kwota faktury
+AmountInvoiced=Amount invoiced
 AmountPayment=Kwota płatności
 AmountHTShort=Kwota (netto)
 AmountTTCShort=Kwota (zawierająca VAT)
@@ -353,6 +359,7 @@ AmountLT2ES=Kwota IRPF
 AmountTotal=Całkowita kwota
 AmountAverage=Średnia kwota
 PriceQtyMinHT=Cena ilości min. (netto)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Procentowo
 Total=Razem
 SubTotal=Po podliczeniu
@@ -374,7 +381,7 @@ TotalLT1IN=Total CGST
 TotalLT2IN=Total SGST
 HT=Bez VAT
 TTC= z VAT
-INCVATONLY=Inc. VAT
+INCVATONLY=Zawiera VAT
 INCT=Zawiera wszystkie podatki
 VAT=Stawka VAT
 VATIN=IGST
@@ -389,7 +396,9 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Stawka VAT
-DefaultTaxRate=Default tax rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Domyślna stawka podatku
 Average=Średni
 Sum=Suma
 Delta=Delta
@@ -419,7 +428,8 @@ ActionRunningShort=W trakcie
 ActionDoneShort=Zakończone
 ActionUncomplete=Niekompletne
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Firma/Organizacja
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kontakty dla tego zamówienia
 ContactsAddressesForCompany=Kontakt/adres dla tej części/zamówienia/
 AddressesForCompany=Adressy dla części trzeciej
@@ -427,6 +437,9 @@ ActionsOnCompany=Działania na temat tego zamówienia
 ActionsOnMember=Informacje o wydarzeniach dla tego uzytkownika
 ActionsOnProduct=Events about this product
 NActionsLate=%s późno
+ToDo=Do zrobienia
+Completed=Completed
+Running=W trakcie
 RequestAlreadyDone=Żądanie już wysłane
 Filter=Filtr
 FilterOnInto=Kryteria poszukiwania <strong>'% s'</strong> w polach% s
@@ -475,7 +488,7 @@ Discount=Rabat
 Unknown=Nieznany
 General=Ogólne
 Size=Rozmiar
-OriginalSize=Original size
+OriginalSize=Oryginalny rozmiar
 Received=Przyjęto
 Paid=Zapłacone
 Topic=Temat
@@ -498,8 +511,8 @@ AddPhoto=Dodaj obraz
 DeletePicture=Obraz usunięty
 ConfirmDeletePicture=Potwierdzić usunięcie obrazka?
 Login=Login
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginEmail=Login (e-mail)
+LoginOrEmail=Login lub email
 CurrentLogin=Aktualny login
 EnterLoginDetail=Wprowadź dane logowania
 January=Styczeń
@@ -563,7 +576,7 @@ MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Dołączone pliki i dokumenty
-JoinMainDoc=Join main document
+JoinMainDoc=Dołącz główny dokument
 DateFormatYYYYMM=RRRR-MM
 DateFormatYYYYMMDD=RRRR-MM-DD
 DateFormatYYYYMMDDHHMM=RRRR-MM-DD GG: SS
@@ -616,7 +629,7 @@ Undo=Cofnij
 Redo=Powtórz
 ExpandAll=Rozwiń wszystkie
 UndoExpandAll=Zwiń
-SeeAll=See all
+SeeAll=Zobacz wszystko
 Reason=Powód
 FeatureNotYetSupported=Funkcja nie jest jeszcze obsługiwana
 CloseWindow=Zamknij okno
@@ -626,7 +639,7 @@ SendByMail=Wyślij przez email
 MailSentBy=E-mail został wysłany przez
 TextUsedInTheMessageBody=Zawartość emaila 
 SendAcknowledgementByMail=Wyślij email potwierdzający
-SendMail=Wyślij mail
+SendMail=Wyślij wiadomość email
 EMail=E-mail
 NoEMail=Brak e-mail
 Email=Adres e-mail
@@ -640,7 +653,7 @@ CanBeModifiedIfOk=Mogą być zmienione  jeśli ważne
 CanBeModifiedIfKo=Mogą być zmienione, jeśli nie ważne
 ValueIsValid=Wartość jest poprawna
 ValueIsNotValid=Wartość jest niepoprawna
-RecordCreatedSuccessfully=Zapis utworzony pomyślnie
+RecordCreatedSuccessfully=Wpis utworzony pomyślnie
 RecordModifiedSuccessfully=Zapis zmodyfikowany pomyślnie
 RecordsModified=%s zapis zmieniony
 RecordsDeleted=%s rekord usunięty
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Uwaga, jesteś w trybie konserwacji, więc tylko
 CoreErrorTitle=Błąd systemu
 CoreErrorMessage=Przepraszamy, napotkano błąd. Skontaktuj się z administratorem w celu sprawdzenia logów lub wyłącz $dolibarr_main_prod=1 aby uzyskać więcej informacji.
 CreditCard=Karta kredytowa
+ValidatePayment=Weryfikacja płatności
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Pola <b>%s</b>  są obowiązkowe
 FieldsWithIsForPublic=Pola <b>%s</b> są wyświetlane na publiczną listę członków. Jeśli nie chcesz, odznacz opcję "publiczny".
 AccordingToGeoIPDatabase=(Zgodnie z konwersji GeoIP)
@@ -741,8 +756,8 @@ CreateDraft=Utwórz Szic
 SetToDraft=Wróć do szkicu
 ClickToEdit=Kliknij by edytować
 EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
+EditWithTextEditor=Edytuj w edytorze tekstowym
+EditHTMLSource=Edytuj źródło HTML
 ObjectDeleted=%s obiekt usunięty
 ByCountry=Według kraju
 ByTown=Według miasta
@@ -773,10 +788,10 @@ SaveUploadedFileWithMask=Zapisz plik na serwerze z nazwą "<strong>%s</strong>"
 OriginFileName=Oryginalna nazwa pliku
 SetDemandReason=Wybierz źródło
 SetBankAccount=Przypisz konto bankowe
-AccountCurrency=Account currency
+AccountCurrency=Waluta konta
 ViewPrivateNote=Wyświetl notatki
 XMoreLines=%s lini(e) ukryte
-ShowMoreLines=Show more/less lines
+ShowMoreLines=Pokaż więcej / mniej linii
 PublicUrl=Publiczny URL
 AddBox=Dodaj skrzynke
 SelectElementAndClick=Wybierz element i kliknij %s
@@ -801,28 +816,28 @@ DeleteLine=Usuń linię
 ConfirmDeleteLine=Czy jesteś pewien, że chcesz usunąć tą linię?
 NoPDFAvailableForDocGenAmongChecked=Na potrzeby generowania dokumentów nie było dostępnych plików PDF
 TooManyRecordForMassAction=Zbyt wiele rekordów wybranych do masowej akcji. Czynność jest ograniczona do listy %s rekordów
-NoRecordSelected=No record selected
+NoRecordSelected=Nie wybrano wpisu
 MassFilesArea=Obszar plików zbudowanych masowo
 ShowTempMassFilesArea=Wyświetl obszar plików zbudowanych masowo
 ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Powiązane obiekty
 ClassifyBilled=Oznacz jako zafakturowana
+ClassifyUnbilled=Classify unbilled
 Progress=Postęp
-ClickHere=Kliknij tutaj
 FrontOffice=Front office
 BackOffice=Powrót do biura
 View=Widok
 Export=Eksport
 Exports=Eksporty
-ExportFilteredList=Export filtered list
+ExportFilteredList=Eksportuj przefiltrowaną listę
 ExportList=Eksportuj listę
 ExportOptions=Opcje eksportu
 Miscellaneous=Różne
 Calendar=Kalendarz
 GroupBy=Grupuj według
 ViewFlatList=View flat list
-RemoveString=Remove string '%s'
+RemoveString=Usuń ciąg '%s'
 SomeTranslationAreUncomplete=Co poniektóre języki mogą być częściowo przetłumaczone bądź mogą zawierać błędy. Jeśli zauważysz błędy w tłumaczeniu, możesz je naprawić rejestrując się na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link (public/external)
 DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
@@ -841,7 +856,7 @@ ExpenseReport=Raport kosztów
 ExpenseReports=Raporty kosztów
 HR=Dział personalny
 HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatycznie wykalkulowane
+AutomaticallyCalculated=Automatycznie przeliczone
 TitleSetToDraft=Powróć do wersji roboczej
 ConfirmSetToDraft=Jesteś pewien, że chcesz powrócić do wersji roboczej?
 ImportId=Import id
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekt
 Projects=Projekty
 Rights=Uprawnienia
+LineNb=Line no.
+IncotermLabel=Formuły handlowe
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
@@ -880,7 +897,7 @@ ShortThursday=Cz
 ShortFriday=Pi
 ShortSaturday=So
 ShortSunday=Ni
-SelectMailModel=Select an email template
+SelectMailModel=Wybierz szablon wiadomości email
 SetRef=Ustaw referencję
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Nie znaleziono wyników
@@ -909,10 +926,18 @@ SearchIntoCustomerShipments=Wysyłki klienta
 SearchIntoExpenseReports=Zestawienia wydatków
 SearchIntoLeaves=Urlopy
 CommentLink=Komentarze
-NbComments=Number of comments
+NbComments=Ilość komentarzy
 CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
+CommentAdded=Komentarz dodany
+CommentDeleted=Komentarz usunięty
 Everybody=Wszyscy
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Przypisany do
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index 64b350fbcdf..f730fc714b6 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Stawka musi być wartością liczbową
 markRateShouldBeLesserThan100=Stopa znak powinien być niższy niż 100
 ShowMarginInfos=Pokaż informacje o marżę
 CheckMargins=Szczegóły marż
-MarginPerSaleRepresentativeWarning=Raport marży na użytkownika wykorzystuje powiązanie między kontrahentami a przedstawicielami handlowymi w celu obliczenia marży każdego przedstawiciela handlowego. Ze względu na to, że niektórzy kontrahenci mogą nie posiadać przedstawiciela handlowego, a niektórzy mogą być powiązani z kilkoma, niektóre kwoty mogą nie zostać uwzględnione w tym raporcie (jeśli nie ma przedstawiciela sprzedaży), a niektóre mogą pojawić się w różnych wierszach (dla każdego przedstawiciela sprzedaży).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index bdcdb2130c8..6b450d90e5a 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Wykaz zatwierdzonych publicznej użytkowników
 ErrorThisMemberIsNotPublic=Ten członek nie jest publiczny
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Inny członek <b>(nazwa: %s,</b> zaloguj <b>się: %s)</b> jest już związany z osobą <b>trzecią %s.</b> Usunięcie tego linku pierwsze, ponieważ jedna trzecia strona nie może być powiązana tylko z członkiem (i odwrotnie).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Ze względów bezpieczeństwa, musisz być przyznane uprawnienia do edycji wszystkich użytkowników, aby można było powiązać członka do użytkownika, który nie jest twoje.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Treść Twojej karty członka
 SetLinkToUser=Link do użytkownika Dolibarr
 SetLinkToThirdParty=Link do Dolibarr trzeciej
 MembersCards=Członkowie wydruku karty
@@ -108,17 +106,33 @@ PublicMemberCard=Państwa publiczne karty
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Tworzenie subskrypcji
 ShowSubscription=Pokaż sybskrypcje
-SendAnEMailToMember=Wyślij e-mail informacji na członka
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Treść Twojej karty członka
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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
-DescADHERENT_MAIL_VALID=EMail dla członka walidacji
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail temat subskrypcji
-DescADHERENT_MAIL_COTIS=EMail subskrypcji
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail temat członka resiliation
-DescADHERENT_MAIL_RESIL=EMail dla członka resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Nadawca wiadomości e-mail do automatycznych wiadomości e-mail
 DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie
 DescADHERENT_ETIQUETTE_TEXT=Tekst drukowany na arkuszach adresowych członkiem
@@ -177,3 +191,8 @@ NoVatOnSubscription=Nie TVA subskrypcji
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt stosowany do linii subskrypcji do faktury:% s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index 30949fa9d53..23c69169c30 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index c8156f3466b..ba496722260 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -5,7 +5,7 @@ Tools=Narzędzia
 TMenuTools=Narzędzia
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br><br>All the tools can be reached in the left menu.
 Birthday=Urodziny
-BirthdayDate=Birthday date
+BirthdayDate=Data urodzin
 DateToBirth=Data urodzenia
 BirthdayAlertOn=urodziny wpisu aktywnych
 BirthdayAlertOff=urodziny wpisu nieaktywne
@@ -18,53 +18,55 @@ NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
+JumpToLogin=Rozłączono. Idź do strony logowania...
 MessageForm=Message on online payment form
 MessageOK=Wiadomość dla zatwierdzonych stron. Powrót do płatności
 MessageKO=Wiadomość dla odwołanych stron. Powrót do płatności
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
 NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
+DateNextInvoiceBeforeGen=Data kolejnej faktury (przed wygenerowaniem)
+DateNextInvoiceAfterGen=Data następnej faktury (po wygenerowaniu)
 
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_VALIDATE=Validate interwencji
-Notify_FICHINTER_SENTBYMAIL=Interwencja wysyłane pocztą
-Notify_ORDER_VALIDATE=Zamówienie Klienta potwierdzone
-Notify_ORDER_SENTBYMAIL=Zamówienie klienta wysyłane pocztą
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Aby dostawca wysłane pocztą
-Notify_ORDER_SUPPLIER_VALIDATE=Kolejność Dostawca rejestrowane
-Notify_ORDER_SUPPLIER_APPROVE=Dostawca celu zatwierdzone
-Notify_ORDER_SUPPLIER_REFUSE=Dostawca odmówił celu
+Notify_FICHINTER_VALIDATE=Interwencja zatwierdzona
+Notify_FICHINTER_SENTBYMAIL=Interwencja wysłana za pośrednictwem wiadomości email
+Notify_ORDER_VALIDATE=Zamówienie klienta potwierdzone
+Notify_ORDER_SENTBYMAIL=Zamówienie klienta wysyłane za pośrednictwem wiadomości email
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Zamówienie dostawcy wysłane za pośrednictwem wiadomości email
+Notify_ORDER_SUPPLIER_VALIDATE=Zamówienie dostawcy zarejestrowane
+Notify_ORDER_SUPPLIER_APPROVE=Zamówienie dostawcy zaakceptowane
+Notify_ORDER_SUPPLIER_REFUSE=Zamówienie dostawcy odrzucone
 Notify_PROPAL_VALIDATE=Oferta klienta potwierdzona
 Notify_PROPAL_CLOSE_SIGNED=Zamknięte podpisane PROPAL klienta
 Notify_PROPAL_CLOSE_REFUSED=PROPAL klienta zamknięte odmówił
-Notify_PROPAL_SENTBYMAIL=Gospodarczy wniosek przesłany pocztą
+Notify_PROPAL_SENTBYMAIL=Propozycja handlowa wysłana za pośrednictwem wiadomości email
 Notify_WITHDRAW_TRANSMIT=Wycofanie transmisji
 Notify_WITHDRAW_CREDIT=Wycofanie kredyt
 Notify_WITHDRAW_EMIT=Wycofanie Isue
-Notify_COMPANY_CREATE=Trzeciej stworzone
+Notify_COMPANY_CREATE=Kontrahent utworzony
 Notify_COMPANY_SENTBYMAIL=Maile wysyłane z karty przez osoby trzecie
-Notify_BILL_VALIDATE=Sprawdź rachunki
+Notify_BILL_VALIDATE=Faktura klienta zatwierdzona
 Notify_BILL_UNVALIDATE=Faktura klienta nie- zwalidowane
-Notify_BILL_PAYED=Klient zapłaci faktury
-Notify_BILL_CANCEL=Faktury klienta odwołany
-Notify_BILL_SENTBYMAIL=Faktury klienta wysył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_PAYED=Faktura klienta zapłacona
+Notify_BILL_CANCEL=Faktura klienta anulowana
+Notify_BILL_SENTBYMAIL=Faktura klienta wysyłana za pośrednictwem wiadomości email
+Notify_BILL_SUPPLIER_VALIDATE=Faktura dostawcy zatwierdzona
+Notify_BILL_SUPPLIER_PAYED=Faktura dostawcy zapłacona
+Notify_BILL_SUPPLIER_SENTBYMAIL=Faktura dostawcy wysłana za pośrednictwem wiadomości email
 Notify_BILL_SUPPLIER_CANCELED=Dostawca anulowania faktury
 Notify_CONTRACT_VALIDATE=Umowa zatwierdzona
-Notify_FICHEINTER_VALIDATE=Interwencja zatwierdzone
-Notify_SHIPPING_VALIDATE=Wysyłka zatwierdzone
+Notify_FICHEINTER_VALIDATE=Interwencja zatwierdzona
+Notify_SHIPPING_VALIDATE=Wysyłka zatwierdzona
 Notify_SHIPPING_SENTBYMAIL=Wysyłka wysłane pocztą
-Notify_MEMBER_VALIDATE=Członek zatwierdzone
+Notify_MEMBER_VALIDATE=Członek zatwierdzony
 Notify_MEMBER_MODIFY=Użytkownik zmodyfikowany
 Notify_MEMBER_SUBSCRIPTION=Członek subskrybowanych
-Notify_MEMBER_RESILIATE=Member terminated
-Notify_MEMBER_DELETE=Członek usunięte
+Notify_MEMBER_RESILIATE=Członek usunięty
+Notify_MEMBER_DELETE=Członek usunięty
 Notify_PROJECT_CREATE=Stworzenie projektu
 Notify_TASK_CREATE=Zadanie utworzone
 Notify_TASK_MODIFY=Zadanie zmodyfikowane
@@ -78,8 +80,8 @@ LinkedObject=Związany obiektu
 NbOfActiveNotifications=Liczba zgłoszeń (nb e-maili odbiorców)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -90,32 +92,32 @@ PredefinedMailContentSendFichInter=__(Hello)__\n\nYou will find here the interve
 PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfil=Wybierz profil demo najlepiej odzwierciedlający twoje potrzeby...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Zarządzanie członkami fundacji
 DemoFundation2=Zarządzanie członkami i kontami bankowymi fundacji
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=Firma lub freelancer sprzedający tylko swoje usługi
 DemoCompanyShopWithCashDesk=Zarządzanie sklepem z kasy
-DemoCompanyProductAndStocks=Company selling products with a shop
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Firma sprzedająca produkty w sklepie
+DemoCompanyAll=Firma z kilkoma aktywnościami (wszystkie główne moduły)
 CreatedBy=Utworzone przez %s
 ModifiedBy=Zmodyfikowane przez %s
 ValidatedBy=Zatwierdzone przez %s
 ClosedBy=Zamknięte przez %s
 CreatedById=ID użytkownika który stworzył
-ModifiedById=User id who made latest change
+ModifiedById=ID użytkownika, który dokonał ostatnich zmian
 ValidatedById=ID użytkownika który zatwierdzał
 CanceledById=ID użytkownika który anulował
 ClosedById=ID użytkownika który zamknął
 CreatedByLogin=Nazwa użytkownika który stworzył
-ModifiedByLogin=User login who made latest change
+ModifiedByLogin=Login użytkownika, który dokonał ostatnich zmian
 ValidatedByLogin=Nazwa użytkownika który zatwierdził
 CanceledByLogin=Nazwa użytkownika który anulował
 ClosedByLogin=Nazwa użytkownika który zamknął
 FileWasRemoved=Plik %s został usunięty
 DirWasRemoved=Katalog %s został usunięty
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
+FeatureNotYetAvailable=Funkcjonalność jeszcze niedostępna w aktualnej wersji
+FeaturesSupported=Wspierane funkcjonalności
 Width=Szerokość
 Height=Wysokość
 Depth=Głębokość
@@ -168,22 +170,22 @@ AuthenticationDoesNotAllowSendNewPassword=Uwierzytelnianie w <b>trybie %s.</b> <
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof ID %s</b> jest informacji w zależności od trzeciej kraju. <br> Na przykład, dla <b>kraju, %s,</b> jest to <b>kod %s.</b>
 DolibarrDemo=Demo Dolibarr ERP/CRM
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+StatsByNumberOfUnits=Statystyki dla sum ilości produktów / usług
+StatsByNumberOfEntities=Statystyki w ilość powiązanych wpisów (ilość faktur, zamówień...)
 NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of customer orders
-NumberOfCustomerInvoices=Number of customer invoices
+NumberOfCustomerOrders=Ilość zamówień klientów
+NumberOfCustomerInvoices=Ilość faktur klientów
 NumberOfSupplierProposals=Number of supplier proposals
-NumberOfSupplierOrders=Number of supplier orders
-NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfSupplierOrders=Ilość zamówień dostawców
+NumberOfSupplierInvoices=Ilość faktur dostawców
 NumberOfUnitsProposals=Number of units on proposals
 NumberOfUnitsCustomerOrders=Number of units on customer orders
 NumberOfUnitsCustomerInvoices=Number of units on customer invoices
 NumberOfUnitsSupplierProposals=Number of units on supplier proposals
 NumberOfUnitsSupplierOrders=Number of units on supplier orders
 NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
-EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
-EMailTextInterventionValidated=Interwencja %s zatwierdzone
+EMailTextInterventionAddedContact=Nowa interwencja %s została przypisana do ciebie.
+EMailTextInterventionValidated=Interwencja %s zatwierdzona
 EMailTextInvoiceValidated=Faktura %s została zatwierdzona
 EMailTextProposalValidated=Forslaget %s har blitt validert.
 EMailTextProposalClosedSigned=The proposal %s has been closed signed.
@@ -214,7 +216,8 @@ StartUpload=Rozpocznij przesyłanie
 CancelUpload=Anuluj przesyłanie
 FileIsTooBig=Plik jest za duży
 PleaseBePatient=Proszę o cierpliwość...
-ResetPassword=Reset password
+NewPassword=New password
+ResetPassword=Resetuj hasło
 RequestToResetPasswordReceived=Wniosek o zmianę hasła Dolibarr został odebrany
 NewKeyIs=To są twoje nowe klucze do logowania
 NewKeyWillBe=Twój nowy klucz, aby zalogować się do programu będzie
@@ -224,17 +227,17 @@ ForgetIfNothing=Jeśli nie zwrócić tę zmianę, po prostu zapomnieć ten e-mai
 IfAmountHigherThan=Jeśli kwota wyższa niż <strong>%s</strong>
 SourcesRepository=Źródła dla repozytorium
 Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
+PassEncoding=Kodowanie hasła
+PermissionsAdd=Uprawnienia dodane
+PermissionsDelete=Uprawnienia usunięte
+YourPasswordMustHaveAtLeastXChars=Twoje hasło musi składać się z <strong>%s</strong> znaków
+YourPasswordHasBeenReset=Twoje hasło zostało zresetowane pomyślnie
 ApplicantIpAddress=IP address of applicant
 ##### Export #####
 ExportsArea=Wywóz obszarze
 AvailableFormats=Dostępne formaty
 LibraryUsed=Użyte biblioteki
-LibraryVersion=Library version
+LibraryVersion=Wersja biblioteki
 ExportableDatas=Eksport danych
 NoExportableData=Nr eksport danych (bez modułów z eksportowane dane załadowane lub brakujące uprawnienia)
 ##### External sites #####
@@ -242,4 +245,5 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=Link strony
 WEBSITE_TITLE=Tytuł
 WEBSITE_DESCRIPTION=Opis
-WEBSITE_KEYWORDS=Keywords
+WEBSITE_KEYWORDS=Słowa kluczowe
+LinesToImport=Lines to import
diff --git a/htdocs/langs/pl_PL/paypal.lang b/htdocs/langs/pl_PL/paypal.lang
index b67f82f69d7..15dad691e4f 100644
--- a/htdocs/langs/pl_PL/paypal.lang
+++ b/htdocs/langs/pl_PL/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Tylko PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Jest to id transakcji: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Dodaj link do płatności PayPal podczas wysyłania dokumentów za pośrednictwem email
-PredefinedMailContentLink=Możesz kliknąć na bezpieczny link poniżej aby dokonać płatności (PayPal), jeśli nie jest jeszcze wykonana.\n\n%s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Kod błędu
 ErrorSeverityCode=Kod ważności błędu
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 130ec3d6a02..d3a4b1e36d9 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -17,27 +17,28 @@ Reference=Nr referencyjny
 NewProduct=Nowy produkt
 NewService=Nowa usługa
 ProductVatMassChange=Masowa zmiana 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.
+ProductVatMassChangeDesc=Strona ta może być wykorzystana do modyfikacji zdefiniowanej stawki VAT na produkty i usługi z jednej wartości na inną. Uwaga, zmiana ta jest wykonywana na całej bazy danych.
 MassBarcodeInit=Masowa inicjalizacja kodów kreskowych
-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=Accounting code (purchase)
-ProductAccountancySellCode=Accounting code (sale)
+MassBarcodeInitDesc=Strona ta może być używana do wygenerowania kodu kreskowego dla obiektów nie posiadających zdefiniowanego kodu. Sprawdź wcześniej, czy ustawienia modułu kodu kreskowego jest kompletna.
+ProductAccountancyBuyCode=Kod księgowy (zakup)
+ProductAccountancySellCode=Kod księgowy (sprzedaż)
 ProductAccountancySellIntraCode=Accounting code (sale intra-community)
 ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Produkt lub usługa
 ProductsAndServices=Produkty i usługi
 ProductsOrServices=Produkty lub Usługi
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Produkty tylko na sprzedaż
-ProductsOnPurchaseOnly=Produkty tylko na zakup
-ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnPurchaseOnly=Produkty tylko do zakupu
+ProductsNotOnSell=Produkty nie na sprzedaż i nie do zakupu
 ProductsOnSellAndOnBuy=Produkty na sprzedaż i do zakupu
 ServicesOnSaleOnly=Usługi tylko na sprzedaż
-ServicesOnPurchaseOnly=Usługi tylko na zakup
-ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnPurchaseOnly=Usługi tylko do zakupu
+ServicesNotOnSell=Usługi nie na sprzedaż i nie do zakupu
 ServicesOnSellAndOnBuy=Usługi na sprzedaż i do zakupu
 LastModifiedProductsAndServices=Ostatnich %s modyfikowanych produktów/usług
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+LastRecordedProducts=Ostatnie %s zarejestrowanych produktów
+LastRecordedServices=Ostatnie %s zarejestrowanych usług
 CardProduct0=Karta produku
 CardProduct1=Karta usługi
 Stock=Zapas
@@ -57,8 +58,8 @@ ProductStatusNotOnBuy=Nie do kupienia
 ProductStatusOnBuyShort=Do zakupu
 ProductStatusNotOnBuyShort=Nie do zakupu
 UpdateVAT=Uaktualnij VAT
-UpdateDefaultPrice=Uaktualnij domyślne ceny
-UpdateLevelPrices=Uaktualnij cyny dla każdego poziomu
+UpdateDefaultPrice=Uaktualnij domyślną cenę
+UpdateLevelPrices=Uaktualnij ceny dla każdego poziomu
 AppliedPricesFrom=Stosowane ceny od
 SellingPrice=Cena sprzedaży
 SellingPriceHT=Cena sprzedaży (bez podatku)
@@ -95,7 +96,7 @@ NoteNotVisibleOnBill=Notatka (nie widoczna na fakturach, ofertach...)
 ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwania:
 MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
 MultiPricesNumPrices=Ilość cen
-AssociatedProductsAbility=Activate the feature to manage virtual products
+AssociatedProductsAbility=Aktywuj wirtualne cechy produktów
 AssociatedProducts=Produkt wirtualny
 AssociatedProductsNumber=Liczba produktów tworzących ten produkt wirtualny
 ParentProductsNumber=Liczba dominującej opakowaniu produktu
@@ -106,7 +107,7 @@ KeywordFilter=Filtr słów kluczowych
 CategoryFilter=Filtr kategorii
 ProductToAddSearch=Szukaj produktu do dodania
 NoMatchFound=Nie znaleziono odpowiednika
-ListOfProductsServices=List of products/services
+ListOfProductsServices=Lista produktów/usług
 ProductAssociationList=Lista produktów/usług, które są częścią wirtualnego produktu/pakietu
 ProductParentList=Lista wirtualnych produktów/usług z tym produktem jako komponentem
 ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bieżącego
@@ -122,16 +123,17 @@ ConfirmDeleteProductLine=Czy na pewno chcesz usunąć tę linię produktu?
 ProductSpecial=Specjalne
 QtyMin=Ilość minimalna
 PriceQtyMin=Cena tej min. Ilości (bez rabatu)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Stawka VAT (dla tego dostawcy/produktu)
 DiscountQtyMin=Domyślny rabat dla ilości
 NoPriceDefinedForThisSupplier=Brak określonej ceny/ilości dla tego dostawcy/produktu
 NoSupplierPriceDefinedForThisProduct=Nie jest określona cena / ilość dostawcy dla tego produktu
-PredefinedProductsToSell=Predefiniowane sprzedawać produkty
-PredefinedServicesToSell=Predefiniowane sprzedawać usługi
+PredefinedProductsToSell=Predefiniowane produkty do sprzedaży
+PredefinedServicesToSell=Predefiniowane usługi do sprzedaży
 PredefinedProductsAndServicesToSell=Predefiniowane produkty / usługi do sprzedaży
-PredefinedProductsToPurchase=Predefiniowane produkt do zakupu
+PredefinedProductsToPurchase=Predefiniowane produkty do zakupu
 PredefinedServicesToPurchase=Predefiniowane usługi do zakupu
-PredefinedProductsAndServicesToPurchase=Predefiniowane produkty / usługi do puchase
+PredefinedProductsAndServicesToPurchase=Predefiniowane produkty / usługi do zakupu
 NotPredefinedProducts=Not predefined products/services
 GenerateThumb=Wygeneruj miniaturkę
 ServiceNb=Usługa #%s
@@ -141,11 +143,11 @@ ListServiceByPopularity=Wykaz usług ze względu na popularność
 Finished=Produkty wytwarzane
 RowMaterial=Surowiec
 CloneProduct=Duplikuj produkt lub usługę
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+ConfirmCloneProduct=Czy na pewno chcesz powielić produkt lub usługę <b>%s</b>?
 CloneContentProduct=Powiel wszystkie główne informacje produkcie/usłudze
-ClonePricesProduct=Clone prices
+ClonePricesProduct=Powiel ceny
 CloneCompositionProduct=Powiel pakiet pruduktu/usługi
-CloneCombinationsProduct=Clone product variants
+CloneCombinationsProduct=Powiel warianty produktu
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Referencja nowego produktu/usługi
 SellingPrices=Cena sprzedaży
@@ -180,16 +182,16 @@ liter=litr
 l=l
 unitP=Sztuka
 unitSET=Set
-unitS=Sekund
+unitS=Sekunda
 unitH=Godzina
 unitD=Dzień
 unitKG=Kilogram
 unitG=Gram
 unitM=Metr
-unitLM=Linear meter
+unitLM=Metr bieżący
 unitM2=Metr kwadratowy
 unitM3=Metr sześcienny
-unitL=Liter
+unitL=Litr
 ProductCodeModel=Szablon numeru referencyjnego dla produktu
 ServiceCodeModel=Szablon numeru referencyjnego dla usługi
 CurrentProductPrice=Aktualna cena
@@ -228,9 +230,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar c
 BarCodeDataForProduct=Informacje o kodzie kreskowym produktu %s:
 BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
+PriceByCustomer=Różne ceny dla każdego klienta
 PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
+PricingRule=Zasady dla cen sprzedaży
 AddCustomerPrice=Dodaj cenę dla klienta
 ForceUpdateChildPriceSoc=Ustaw sama cena na zależnych klientów
 PriceByCustomerLog=Stwórz log z wcześniejszymi cenami dla klienta
@@ -245,30 +247,30 @@ PriceExpressionEditorHelp4=W produkcie / cena usługi tylko: <b># supplier_min_p
 PriceExpressionEditorHelp5=Dostępne wartości globalne:
 PriceMode=Tryb Cena
 PriceNumeric=Liczba
-DefaultPrice=Cena Domyślnie
+DefaultPrice=Domyśla cena
 ComposedProductIncDecStock=Wzrost / spadek akcji na zmiany dominującej
 ComposedProduct=Pod-Produkt
-MinSupplierPrice=Cena minimalna dostawca
+MinSupplierPrice=Minimalna cena dostawcy
 MinCustomerPrice=Cena minimalna klienta
-DynamicPriceConfiguration=Dynamiczna konfiguracja cena
+DynamicPriceConfiguration=Konfiguracja dynamicznych cen
 DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
 AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Zmienne globalne
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Globalne zmienne updaters
-GlobalVariableUpdaterType0=Danych JSON
+GlobalVariableUpdaterType0=Dane JSON
 GlobalVariableUpdaterHelp0=Analizuje dane JSON z określonego adresu URL, wartość określa położenie odpowiedniej wartości,
 GlobalVariableUpdaterHelpFormat0=Format żądania {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=Dane WebService
 GlobalVariableUpdaterHelp1=Przetwarza dane WebService z określonego adresu URL, NS określa przestrzeń nazw, wartość określa położenie odpowiedniej wartości, dane powinny zawierać dane do wysyłania i metoda jest wywołanie metody WS
 GlobalVariableUpdaterHelpFormat1=Formatem żądania jest {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=Aktualizacja co (min)
-LastUpdated=Latest update
+LastUpdated=Ostatnia aktualizacja
 CorrectlyUpdated=Poprawnie zaktualizowane
 PropalMergePdfProductActualFile=Pliki użyć, aby dodać do PDF Azur są / jest
 PropalMergePdfProductChooseFile=Wybież plik PDF
-IncludingProductWithTag=Włączająć produkt/usługę z tagiem
+IncludingProductWithTag=Dołącz produkt / usługę z tagiem
 DefaultPriceRealPriceMayDependOnCustomer=Domyślna cena, realna cena może zależeć od klienta
 WarningSelectOneDocument=Proszę zaznaczyć co najmniej jeden dokument
 DefaultUnitToShow=Jednostka
@@ -278,24 +280,24 @@ ProductsOrServicesTranslations=Products or services translation
 TranslatedLabel=Translated label
 TranslatedDescription=Translated description
 TranslatedNote=Translated notes
-ProductWeight=Waga 1 produktu
-ProductVolume=Objętość 1 produku
+ProductWeight=Waga dla 1 produktu
+ProductVolume=Objętość 1 produktu
 WeightUnits=Jednostka wagi
 VolumeUnits=Jednostka objętości
 SizeUnits=Jednostka rozmiaru
 DeleteProductBuyPrice=Usuń cenę zakupu
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 SubProduct=Sub product
-ProductSheet=Karta produktu
-ServiceSheet=Service sheet
+ProductSheet=Arkusz produktu
+ServiceSheet=Arkusz usługi
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
+VariantAttributes=Atrybuty wariantu
+ProductAttributes=Atrybuty wariantu dla produktów
+ProductAttributeName=Atrybut wariantu %s
+ProductAttribute=Atrybut wariantu
 ProductAttributeDeleteDialog=Czy jesteś pewien, że chcesz usunąć ten atrybut? Wszystkie wartości zostaną usunięte
 ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Czy jesteś pewien, że chcesz usunąć wariant produktu "<strong>%s</strong>"?
@@ -305,16 +307,16 @@ PropagateVariant=Propagate variants
 HideProductCombinations=Hide products variant in the products selector
 ProductCombination=Wariant
 NewProductCombination=Nowy wariant
-EditProductCombination=Editing variant
-NewProductCombinations=New variants
+EditProductCombination=Edycja wariantu
+NewProductCombinations=Nowe warianty
 EditProductCombinations=Editing variants
 SelectCombination=Select combination
-ProductCombinationGenerator=Variants generator
+ProductCombinationGenerator=Generator wariantów
 Features=Features
 PriceImpact=Price impact
 WeightImpact=Weight impact
 NewProductAttribute=Nowy atrybut
-NewProductAttributeValue=New attribute value
+NewProductAttributeValue=Nowa wartość atrybutu
 ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
 ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
 TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
@@ -330,4 +332,4 @@ ConfirmCloneProductCombinations=Would you like to copy all the product variants
 CloneDestinationReference=Destination product reference
 ErrorCopyProductCombinations=There was an error while copying the product variants
 ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
+ErrorProductCombinationNotFound=Wariant produktu nie znaleziony
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index a8355c6572e..813eeb8415e 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Kontakty projektu
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Wszystkie projekty
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Ten widok przedstawia wszystkie projekty i zadania, które są dozwolone do czytania.
 ProjectsDesc=Ten widok przedstawia wszystkie projekty (twoje uprawnienia użytkownika pozwalają wyświetlać wszystko).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Tylko otwarte projekty są widoczne (szkice projektów lub zamknięte projekty są niewidoczne)
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Ten widok przedstawia wszystkie projekty i zadania, które możesz przeczytać.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Zadania w otwartych projektach
 WorkloadNotDefined=Czas pracy nie zdefiniowany
 NewTimeSpent=Czas spędzony
 MyTimeSpent=Mój czas spędzony
+BillTime=Bill the time spent
 Tasks=Zadania
 Task=Zadanie
 TaskDateStart=Data rozpoczęcia zadania
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Lista dotacji związanych z projektem
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Wykaz działań związanych z projektem
 ListTaskTimeUserProject=Lista czasu poświęconego na zadania w projekcie
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Dzisiejsza aktywnośc w projekcie
 ActivityOnProjectYesterday=Wczorajsza aktywność w projekcie
 ActivityOnProjectThisWeek=Aktywność w projekcie w tym tygodniu
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktywność na projekcie w tym miesiącu
 ActivityOnProjectThisYear=Aktywność na projekcie w tym roku
 ChildOfProjectTask=Dziecko projektu / zadania
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Brak właściciela tego prywatnego projektu
 AffectedTo=Przypisane do
 CantRemoveProject=Ten projekt nie może zostać usunięty dopóki inne obiekty się odwołują (faktury, zamówienia lub innych). Zobacz odsyłających tab.
@@ -137,7 +140,8 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Niemożliwe do przesunięcia daty zadania według nowej daty rozpoczęcia projektu
 ProjectsAndTasksLines=Projekty i zadania
 ProjectCreatedInDolibarr=Projekt %s utworzony
-ProjectModifiedInDolibarr=Project %s modified
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Projekt %s zmodyfikowany
 TaskCreatedInDolibarr=Zadanie %s utworzono
 TaskModifiedInDolibarr=Zadań %s zmodyfikowano
 TaskDeletedInDolibarr=Zadań %s usunięto
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index 4dd74e785cb..6c1c31f559a 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Podpisano (do rachunku)
 PropalStatusNotSigned=Nie podpisały (zamknięte)
 PropalStatusBilled=zapowiadane
 PropalStatusDraftShort=Szkic
+PropalStatusValidatedShort=Zatwierdzony
 PropalStatusClosedShort=Zamknięte
 PropalStatusSignedShort=Podpisany
 PropalStatusNotSignedShort=Niepodpisany
diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
index 34bc5c53cb6..c802f3e9d27 100644
--- a/htdocs/langs/pl_PL/salaries.lang
+++ b/htdocs/langs/pl_PL/salaries.lang
@@ -8,10 +8,11 @@ NewSalaryPayment=Nowa wypłata
 SalaryPayment=Wypłata wynagrodzenia
 SalariesPayments=Wypłaty wynagordzeń
 ShowSalaryPayment=Pokaż wypłaty wynagrodzeń
-THM=Average hourly rate
-TJM=Average daily rate
+THM=Średnia stawka godzinowa
+TJM=Średnia stawka dzienna
 CurrentSalary=Aktualne wynagrodzenie
 THMDescription=Ta wartość może być użyta do obliczenia kosztów poniesionych przy projekcie do którego przystąpili użytkownicy jeżeli moduł projektów jest używany
 TJMDescription=Ta wartość jest aktualnie jedynie informacją i nie jest wykorzystywana do jakichkolwiek obliczeń
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Ostatnie %s płatności wynagrodzeń
+AllSalaries=Wszystkie płatności wynagrodzeń
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index f83e18218ec..32d2364844e 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modyfikacja magazynu
 MenuNewWarehouse=Nowy magazyn
 WarehouseSource=Magazyn źródłowy
 WarehouseSourceNotDefined=Nie zdefiniowano magazynu,
+AddWarehouse=Create warehouse
 AddOne=Dodaj jedną
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Docelowy magazynie
 ValidateSending=Usuń wysyłanie
 CancelSending=Anuluj wysyłanie
@@ -16,27 +18,28 @@ DeleteSending=Usuń wysyłanie
 Stock=Stan
 Stocks=Stany
 StocksByLotSerial=Zapasy według lotu/nr seryjnego
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+LotSerial=Partie/Serie
+LotSerialList=Lista partii/serii
 Movements=Ruchy
 ErrorWarehouseRefRequired=Nazwa referencyjna magazynu wymagana
 ListOfWarehouses=Lista magazynów
 ListOfStockMovements=Wykaz stanu magazynowego
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
+ListOfInventories=List of inventories
+MovementId=ID przesunięcia
+StockMovementForId=ID przesunięcia %d
+ListMouvementStockProject=Lista przesunięć zapasu skojarzona z projektem
 StocksArea=Powierzchnia magazynów
 Location=Lokacja
 LocationSummary=Nazwa skrócona lokalizacji
 NumberOfDifferentProducts=Wiele różnych środków
 NumberOfProducts=Łączna liczba produktów
-LastMovement=Ostatnie ruchy
+LastMovement=Ostatni ruch
 LastMovements=Ostatnie ruchy
 Units=Jednostki
 Unit=Jednostka
-StockCorrection=Stock correction
+StockCorrection=Korekta zapasu
 CorrectStock=Korekta zapasu
-StockTransfer=Transfer Zdjęcie
+StockTransfer=Transfer zapasu
 TransferStock=Przesuń zapas
 MassStockTransferShort=Masowe przesuniecie zapasu
 StockMovement=Przeniesienie zapasu
@@ -45,12 +48,12 @@ LabelMovement=Etykieta przesunięcia
 NumberOfUnit=Liczba jednostek
 UnitPurchaseValue=Jednostkowa cena nabycia
 StockTooLow=Zbyt niski zapas
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=Zapas niższy niż limit dla alarmu (%s)
 EnhancedValue=Wartość
-PMPValue=Wartość
+PMPValue=Średnia ważona ceny
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Magazyny wartości
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+UserWarehouseAutoCreate=Utwórz użytkownika dla magazynu kiedy tworzysz użytkownika
 AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
 IndependantSubProductStock=Produkt akcji i subproduct akcji są niezależne
 QtyDispatched=Wysłana ilość
@@ -62,7 +65,7 @@ RuleForStockManagementIncrease=Zasady dla automatycznego zarządzania zwiększan
 DeStockOnBill=Zmniejsz realne zapasy magazynu po potwierdzeniu faktur / not kredytowych
 DeStockOnValidateOrder=Zmniejsz realne zapasy magazynu po potwierdzeniu zamówień klientów
 DeStockOnShipment=Zmniejsz realne zapasy magazynu po potwierdzeniu wysyłki
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
+DeStockOnShipmentOnClosing=Zmniejsz realny zapas przy sklasyfikowaniu wysyłki jako ukończonej
 ReStockOnBill=Zwiększ realne zapasy magazynu po potwierdzeniu faktur / not kredytowych
 ReStockOnValidateOrder=Zwiększ realne zapasy magazynu po potwierdzeniu zamówień dostawców
 ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
@@ -84,8 +87,8 @@ DescWareHouse=Opis magazynu
 LieuWareHouse=Lokalizacja magazynu
 WarehousesAndProducts=Magazyny i produkty
 WarehousesAndProductsBatchDetail=Magazyny i produkty (z detalami na lot / serial)
-AverageUnitPricePMPShort=Średnia cena wejścia
-AverageUnitPricePMP=Średnia cena wejścia
+AverageUnitPricePMPShort=Średnia ważona ceny wejściowej
+AverageUnitPricePMP=Średnia ważona ceny wejściowej
 SellPriceMin=Cena sprzedaży jednostki
 EstimatedStockValueSellShort=Wartość sprzedaży
 EstimatedStockValueSell=Wartość sprzedaży
@@ -125,17 +128,17 @@ MassMovement=Masowe przesunię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=Record transfer
 ReceivingForSameOrder=Wpływy do tego celu
-StockMovementRecorded=Zbiory zapisane ruchy
+StockMovementRecorded=Przesunięcia zapasu zarejestrowane
 RuleForStockAvailability=Zasady dotyczące dostępności zapasu
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Poziom zapasu musi być wystarczający aby dodać produkt/usługę do faktury (sprawdzenie odbywa się na aktualnym realnym zapasie przy dodawaniu pozycji do faktury niezależnie od reguły automatycznej zmiany zapasu)
+StockMustBeEnoughForOrder=Poziom zapasu musi być wystarczający aby dodać produkt/usługę do zamówienia (sprawdzenie odbywa się na aktualnym realnym zapasie przy dodawaniu pozycji do zamówienia niezależnie od reguły automatycznej zmiany zapasu)
+StockMustBeEnoughForShipment= Poziom zapasu musi być wystarczający aby dodać produkt/usługę do wysyłki (sprawdzenie odbywa się na aktualnym realnym zapasie przy dodawaniu pozycji do wysyłki niezależnie od reguły automatycznej zmiany zapasu)
 MovementLabel=Etykieta ruchu
-DateMovement=Date of movement
+DateMovement=Data przesunięcia
 InventoryCode=Ruch lub kod inwentaryzacji
 IsInPackage=Zawarte w pakiecie
 WarehouseAllowNegativeTransfer=Zapas może być ujemny
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferIsNotEnough=Nie masz wystarczającego zapasu w magazynie źródłowym i twoje ustawienie nie pozwala na zapas ujemny.
 ShowWarehouse=Pokaż magazyn
 MovementCorrectStock=Korekta zapasu dla artykułu %s
 MovementTransferStock=Transferuj zapas artykułu %s do innego magazynu
@@ -146,41 +149,41 @@ OpenAll=Otwórz dla wszystkich działań
 OpenInternal=Otwórz tylko dla wewnętrznych działań
 UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+ProductStockWarehouseCreated=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo utworzony
+ProductStockWarehouseUpdated=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo zaktualizowany
+ProductStockWarehouseDeleted=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo usunięty
+AddNewProductStockWarehouse=Ustaw nowy limit dla ostrzeżenia i pożądany optymalny zapas
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
+InventoryDate=Data inwentaryzacji
+NewInventory=Nowa inwentaryzacja
+inventorySetup = Ustawienia inwentaryzacji
+inventoryCreatePermission=Utwórz nową inwentaryzację
+inventoryReadPermission=Pokaż inwentaryzacje
+inventoryWritePermission=Aktualizuj inwentaryzacje
 inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+inventoryTitle=Inwentaryzacja
+inventoryListTitle=Inwentaryzacje
+inventoryListEmpty=Brak inwentaryzacji w toku
+inventoryCreateDelete=Utwórz/Usuń inwentaryzację
+inventoryCreate=Utwórz nowy
 inventoryEdit=Edytuj
 inventoryValidate=Zatwierdzony
 inventoryDraft=Działa
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Magazyn zmieniony
 inventoryConfirmCreate=Utwórz
-inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryOfWarehouse=Inwentaryzacja dla magazynu: %s
 inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryMvtStock=Według inwentaryzacji
+inventoryWarningProductAlreadyExists=Te produkt jest już na liście
 SelectCategory=Filtr kategorii
 SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
+inventoryOnDate=Inwentaryzacja
 INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
+OnlyProdsInStock=Nie dodawaj produktu bez zapasu
 TheoricalQty=Theorique qty
 TheoricalValue=Theorique qty
 LastPA=Last BP
@@ -188,13 +191,13 @@ CurrentPA=Curent BP
 RealQty=Real Qty
 RealValue=Real Value
 RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+AddInventoryProduct=Dodaj produkt do inwentaryzacji
 AddProduct=Dodaj
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ConfirmFlushInventory=Czy potwierdzasz tą czynność?
+InventoryFlushed=Inwentaryzacja zakończona
+ExitEditMode=Opuść edycję
 inventoryDeleteLine=Usuń linię
 RegulateStock=Regulate Stock
 ListInventory=Lista
diff --git a/htdocs/langs/pl_PL/stripe.lang b/htdocs/langs/pl_PL/stripe.lang
index 34460791ce6..571aae3f971 100644
--- a/htdocs/langs/pl_PL/stripe.lang
+++ b/htdocs/langs/pl_PL/stripe.lang
@@ -3,13 +3,13 @@ StripeSetup=Konfiguracja modułu Stripe
 StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Zapłać przy użyciu karty lub Stripe 
 FollowingUrlAreAvailableToMakePayments=Nastepujące adresy są dostępne dla klienta, by mógł dokonać płatności za faktury zamówienia
-PaymentForm=Forma płatności
+PaymentForm=Formularz płatności
 WelcomeOnPaymentPage=Witamy w naszej usłudze płatności online
 ThisScreenAllowsYouToPay=Ten ekran pozwala na dokonanie płatności on-line do %s.
 ThisIsInformationOnPayment=To jest informacja o płatności do zrobienia
 ToComplete=Aby zakończyć
-YourEMail=E-mail by otrzymać potwierdzenie zapłaty
-STRIPE_PAYONLINE_SENDEMAIL=Napisz e-mail, aby poinformować po płatności (sukces lub nie)
+YourEMail=Adres email do wysłania potwierdzenia płatności
+STRIPE_PAYONLINE_SENDEMAIL=Adres email do wysłania informacji o płatności (powodzenie lub nie)
 Creditor=Wierzyciel
 PaymentCode=Kod płatności
 StripeDoPayment=Pay with Credit or Debit Card (Stripe)
@@ -26,15 +26,40 @@ SetupStripeToHavePaymentCreatedAutomatically=Skonfiguruj swój Stripe z linkiem
 YourPaymentHasBeenRecorded=Ta strona potwierdza, że ​​płatność została wprowadzona. Dziękuję.
 YourPaymentHasNotBeenRecorded=Twoja płatność nie została wprowadzona i transakcja została anulowana. Dziękuję.
 AccountParameter=Parametry konta
-UsageParameter=Parametry serwera
+UsageParameter=Parametry użytkownika
 InformationToFindParameters=Pomóż znaleźć %s informacje o koncie
 STRIPE_CGI_URL_V2=Link do modułu płatności Stripe CGI
 VendorName=Nazwa dostawcy
-CSSUrlForPaymentForm=Styl CSS arkuszy dla form płatności
+CSSUrlForPaymentForm=Arkusz styli CSS dla formularza płatności
 NewStripePaymentReceived=Nowa płatność Stripe otrzymana
 NewStripePaymentFailed=Próbowano wykonać płatność Stripe, ale nie powiodła się
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 307f12a9850..09dde31eb7f 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Pokaż raport kosztowy
 NewTrip=Nowy raport kosztów
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Kwota lub kilometry
 DeleteTrip=Usuń raport kosztów
 ConfirmDeleteTrip=Czy usunąć ten raport kosztów?
@@ -21,17 +21,17 @@ ListToApprove=Czeka na zaakceptowanie
 ExpensesArea=Obszar raportów kosztowych
 ClassifyRefunded=Zakfalifikowano do refundacji.
 ExpenseReportWaitingForApproval=Nowy raport kosztów został wysłany do zakaceptowania
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=ID raportu kosztowego
 AnyOtherInThisListCanValidate=Osoba do informowania o jej potwierdzenie.
 TripSociete=Informacje o firmie
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Masz oświadczył kolejny raport wydatków do podobnego zakresu dat.
 AucuneLigne=Nie ma jeszcze raportu wydatki deklarowane
 
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index bfb91dd5df2..9e6d92625c1 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -6,13 +6,13 @@ Permission=Uprawnienie
 Permissions=Uprawnienia
 EditPassword=Edytuj hasło
 SendNewPassword=Wyślij nowe hasło
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Wyślij link ro zresetowania hasła
 ReinitPassword=Wygeneruj nowe hasło
 PasswordChangedTo=Hasło zmieniono na: %s
-SubjectNewPassword=Your new password for %s
+SubjectNewPassword=Twoje nowe hasło dla %s
 GroupRights=Uprawnienia grupy
 UserRights=Uprawnienia użytkownika
-UserGUISetup=Użytkownik Display Setup
+UserGUISetup=Ustawienia wyświetlania dla użytkownika
 DisableUser=Wyłączone
 DisableAUser=Wyłącz użytkownika
 DeleteUser=Usuń
@@ -20,12 +20,12 @@ DeleteAUser=Usuń użytkownika
 EnableAUser=Włącz użytkownika
 DeleteGroup=Usuń
 DeleteAGroup=Usuń grupę
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+ConfirmDisableUser=Jesteś pewien, że chcesz wyłączyć użytkownika <b>%s</b>?
+ConfirmDeleteUser=Jesteś pewien, że chcesz usunąć użytkownika <b>%s</b>?
+ConfirmDeleteGroup=Jesteś pewien, że chcesz usunąć grupę <b>%s</b>?
+ConfirmEnableUser=Jesteś pewien, że chcesz włączyć użytkownika <b>%s</b>?
+ConfirmReinitPassword=Jesteś pewien, że chcesz wygenerować nowe hasło dla użytkownika <b>%s</b>?
+ConfirmSendNewPassword=Jesteś pewien, że chcesz wygenerować i wysłać nowe hasło dla użytkownika <b>%s</b>?
 NewUser=Nowy użytkownik
 CreateUser=Utwórz użytkownika
 LoginNotDefined=Login niezdefiniowany.
@@ -35,7 +35,7 @@ SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Administrator ze wszystkich praw
 AdministratorDesc=Administrator
 DefaultRights=Domyślne uprawnienia
-DefaultRightsDesc=Określ tutaj domyślne uprawnienia, które są przyznawane automatycznie utworzony nowy użytkownik.
+DefaultRightsDesc=Określ tutaj <u>domyślne</u> uprawnienia, które są przyznawane automatycznie <u>nowo utworzonym</u> użytkownikom (Idź do karty użytkownika aby zmienić uprawnienia dla już istniejących użytkowników).
 DolibarrUsers=Użytkownicy Dolibarr
 LastName=Nazwisko
 FirstName=Imię
@@ -44,17 +44,17 @@ NewGroup=Nowa grupa
 CreateGroup=Tworzenie grupy
 RemoveFromGroup=Usuń z grupy
 PasswordChangedAndSentTo=Hasło zmienione i wysyłane do <b>%s.</b>
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=Zgłoszenie zmiany hasła dla <b>%s</b>
 PasswordChangeRequestSent=Wniosek o zmianę hasła dla <b>%s</b> wysłany do <b>%s</b>.
-ConfirmPasswordReset=Confirm password reset
+ConfirmPasswordReset=Potwierdź zresetowanie hasła
 MenuUsersAndGroups=Użytkownicy i grupy
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Ostatnie %s utworzonych grup
+LastUsersCreated=Ostatnie %s utworzonych użytkowników
 ShowGroup=Pokaż grupę
 ShowUser=Pokaż użytkownika
 NonAffectedUsers=Brak przypisanych użytkowników
 UserModified=Użytkownik zmodyfikowany pomyślnie
-PhotoFile=Plików ze zdjęciami
+PhotoFile=Plik ze zdjęciem
 ListOfUsersInGroup=Lista użytkowników w tej grupie
 ListOfGroupsForUser=Lista grup dla tego użytkownika
 LinkToCompanyContact=Link do kontahenta/kontaktu
@@ -66,44 +66,45 @@ CreateDolibarrThirdParty=Utwórz kontrahenta
 LoginAccountDisableInDolibarr=Konto wyłączone w Dolibarr.
 UsePersonalValue=Użyj wartości osobowych
 InternalUser=Wewnętrzny użytkownik
-ExportDataset_user_1=Dolibarr Użytkownicy i właściwości
+ExportDataset_user_1=Użytkownicy Dolibarr i ustawienia
 DomainUser=Domena użytkownika %s
 Reactivate=Przywraca
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Zezwolenie udzielone ponieważ odziedziczył od jednego z użytkowników grupy.
 Inherited=Odziedziczone
 UserWillBeInternalUser=Utworzony użytkownik będzie wewnętrzny użytkownik (ponieważ nie związane z konkretnym trzeciej)
 UserWillBeExternalUser=Utworzony użytkownik będzie zewnętrzny użytkownik (ponieważ związana z konkretnym trzeciej)
-IdPhoneCaller=ID dzwoniącego telefonu
-NewUserCreated=Użytkownik %s tworzone
+IdPhoneCaller=ID dzwoniącego
+NewUserCreated=Użytkownik %s utworzony
 NewUserPassword=Zmiana hasła dla %s
 EventUserModified=Użytkownik %s zmodyfikowany
 UserDisabled=Użytkownik %s wyłączony
 UserEnabled=Użytkownik %s aktywowany
 UserDeleted=Użytkownik %s usunięty
 NewGroupCreated=Grupa %s utworzona
-GroupModified=Grupa% s zmodyfikowano
+GroupModified=Grupa %s zmodyfikowana
 GroupDeleted=Grupa %s usunięta
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
-LoginToCreate=Zaloguj się, aby utworzyć
+ConfirmCreateContact=Czy jesteś pewien, że chcesz utworzyć konto Dolibarr dla tego kontaktu?
+ConfirmCreateLogin=Czy jesteś pewien, że chcesz utworzyć konto Dolibarr dla tego członka?
+ConfirmCreateThirdParty=Czy jesteś pewien, że chcesz utworzyć kontrahenta dla tego członka?
+LoginToCreate=Login do utworzenia
 NameToCreate=Nazwa kontrahenta do utworzenia
 YourRole=Twoje role
 YourQuotaOfUsersIsReached=Limitu aktywnych użytkowników został osiągnięty!
 NbOfUsers=Ilośc użytkowników
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Tylko superadmin niższej wersji superadmin
 HierarchicalResponsible=Kierownik
 HierarchicView=Widok hierarchiczny
 UseTypeFieldToChange=Użyj pola do zmiany Rodzaj
 OpenIDURL=Adres URL OpenID
 LoginUsingOpenID=Użyj do logowania OpenID
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+WeeklyHours=Przepracowane godziny (w tygodniu)
+ExpectedWorkedHours=Oczekiwana ilość godzin przepracowanych w tygodniu
 ColorUser=Kolor użytkownika
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accounting code
-UserLogoff=User logout
-UserLogged=User logged
-DateEmployment=Date of Employment
+DisabledInMonoUserMode=Wyłączone w trybie konserwacji
+UserAccountancyCode=Kod księgowy użytkownika
+UserLogoff=Użytkownik wylogowany
+UserLogged=Użytkownik zalogowany
+DateEmployment=Data zatrudnienia
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index e47b9d00f02..b0f6347c139 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Stwórz tyle stron ile potrzebujesz. Następnie przejść do me
 DeleteWebsite=Skasuj stronę
 ConfirmDeleteWebsite=Jesteś pewny że chcesz skasować stronę? Całą jej zawartość zostanie usunięta.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Nazwa strony
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL zewnętrznego pliku CSS
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Zobacz stronę w nowej zakładce
 SetAsHomePage=Ustaw jako stronę domową
 RealURL=Prawdziwy link
 ViewWebsiteInProduction=Zobacz stronę używając linków ze strony głównej
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Czytać
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=Brak stron
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Duplikuj stronę
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 5a7f5928f03..a07e2f068e4 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Do procesu
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Kod banku kontrahenta
-NoInvoiceCouldBeWithdrawed=Nr faktury withdrawed sukces. Sprawdź, czy faktura jest na spółki z ważnych BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Klasyfikacja zapisane
 ClassCreditedConfirm=Czy na pewno chcesz to wycofanie otrzymania sklasyfikowania jako wpłacone na konto bankowe?
 TransData=Data Transmission
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statystyki według stanu linii
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -92,12 +92,16 @@ SEPAFillForm=(B) Please complete all the fields marked *
 SEPAFormYourName=Twoje imię
 SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
+SEPAFrstOrRecur=Rodzaj płatności
+ModeRECUR=Powtarzająca się płatność
 ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
+PleaseCheckOne=Proszę wybierz tylko jedną
 DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+AmountRequested=Żądana kwota
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index ad4c29a5c0f..c2ccee48ee2 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -123,14 +123,12 @@ DelYear=Ano a ser deletado
 DelJournal=Resumo a ser deletado
 ConfirmDeleteMvt=Isso eliminará todas as linhas do Razão por ano e / ou de um período específico. Pelo menos um critério é necessário.
 ConfirmDeleteMvtPartial=Isso eliminará a transação do Livro de Registro (todas as linhas relacionadas à mesma transação serão excluídas)
-DelBookKeeping=Excluir os registros do razão
 DescJournalOnlyBindedVisible=Esta é uma visão de registro que é vinculada a uma conta contábil e pode ser gravada no Livro de Registro.
 VATAccountNotDefined=Conta para ICMS não definida
 ThirdpartyAccountNotDefined=Conta para terceiro não definida
 ProductAccountNotDefined=Conta para produto não definida
 FeeAccountNotDefined=Conta por taxa não definida
 BankAccountNotDefined=Conta para o banco não definida
-ThirdPartyAccount=Conta de terceiro
 ListeMvts=Lista de movimentações
 ErrorDebitCredit=Débito e Crédito não pode ter valor preenchido ao mesmo tempo
 AddCompteFromBK=Adicionar contas contábeis ao grupo
@@ -160,17 +158,17 @@ AutomaticBindingDone=Vinculação automática realizada
 ErrorAccountancyCodeIsAlreadyUse=Erro, você não pode excluir esta conta contábil, pois ela esta em uso
 MvtNotCorrectlyBalanced=Existem diferenças nos movimentos . Crédito = %s. Débito = %s
 GeneralLedgerIsWritten=As transações estão escritas no Razão
-GeneralLedgerSomeRecordWasNotRecorded=Algumas das transações não podem ser enviadas. Se não houver outra mensagem de erro, isso provavelmente é porque eles já foram despachados.
 NoNewRecordSaved=Não há mais registro para lançar
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta da Contabilidade
 ChangeBinding=Alterar a vinculação
+Accounted=Contas no livro de contas
+NotYetAccounted=Ainda não contabilizado no Livro de Registro
 AddAccountFromBookKeepingWithNoCategories=Contagem disponível ainda não em um grupo personalizado
 CategoryDeleted=A categoria para a conta contábil foi removida
 AccountingJournals=Relatórios da contabilidade
 AccountingJournal=Livro de Registro de contabilidade
 NewAccountingJournal=Novo Livro de Registro contábil
 ShowAccoutingJournal=Mostrar contabilidade
-AccountingJournalType1=Operação diversa
 AccountingJournalType9=Novo
 ErrorAccountingJournalIsAlreadyUse=Esta Livro de Registro já está sendo usado
 ExportDraftJournal=Livro de Registro de rascunho de exportação
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index c88cca519b6..e4533bbbd8d 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -228,6 +228,7 @@ MAIN_MAIL_EMAIL_FROM=E-mail de envio para os e-mails automáticos (Como padrão
 MAIN_MAIL_ERRORS_TO=Email usado como 'Erros-Para' campo em e-mails enviados
 MAIN_MAIL_AUTOCOPY_TO=Enviar sistematicamente uma cópia carbono oculta de todos os e-mails enviados para
 MAIN_DISABLE_ALL_MAILS=Desabilitar todos os envios de e-mail (com o objetivo de teste ou demonstração)
+MAIN_MAIL_FORCE_SENDTO=Envie todos os e-mails para (em vez de destinatários reais, para fins de teste)
 MAIN_MAIL_SENDMODE=Método usado para o envio de E-Mails
 MAIN_MAIL_SMTPS_ID=ID SMTP se a autentificação é exigida
 MAIN_MAIL_SMTPS_PW=Senha SMTP se a autenticação é exigida
@@ -288,7 +289,6 @@ ErrorCantUseRazIfNoYearInMask=Erro, não pode utilizar o @ para resetar o contad
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode utilizar a opção @ se a não ouver {yy} ou {yyyy} na mascara.
 UMask=Parâmetros da UMask para novos arquivos nos sistemas de arquivos Unix/Linux/BSD/Mac.
 UMaskExplanation=Esses parâmetros permitem você definir permissões por default nos arquivos criado pelo Dolibarr no servidor (Ex: durante upload).<br>Deve ser em formato octal (Ex: 06666 significa que tem permissão de leitura e escrita para todo mundo).<br> Esse parâmetro é inutil para servidores windows.
-SeeWikiForAllTeam=Veja a página da wiki para ver a lista de todos os autores e essa organização
 UseACacheDelay=Atraso para exportação de cache em segundos (0 ou vazio para sem cache)
 DisableLinkToHelpCenter=Esconder link "<b>Precisa de ajuda ou suporte</b>" na página de login
 DisableLinkToHelp=Ocultar link para ajuda online "<b>%s</b>"
@@ -381,7 +381,6 @@ ModuleCompanyCodePanicum=Retornar um código contábil vazio
 ModuleCompanyCodeDigitaria=O código contábil depende de um código de terceiros. O código é composto pelo caractere "C" na primeira posição seguido pelos primeiros 5 caracteres do código de terceiros.
 Use3StepsApproval=Por padrão, os Pedidos de Compra necessitam ser criados e aprovados por 2 usuários diferentes (uma etapa para a criação e a outra etapa para a aprovação. Note que se o usuário possui ambas permissões para criar e aprovar, uma única etapa por usuário será suficiente). Você pode pedir, com esta opção, para introduzir uma terceira etapa para aprovação por outro usuário, se o montante for superior a um determinado valor (assim 3 etapas serão necessárias : 1=validação, 2=primeira aprovação e 3=segunda aprovação se o montante for suficiente). <br>Defina como vazio se uma aprovação (2 etapas) é suficiente, defina com um valor muito baixo (0.1) se uma segunda aprovação (3 etapas) é sempre exigida.
 UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
-WarningPHPMail=ALERTA: Alguns provedores de e-mail (como o Yahoo) não permite que você envie um e-mail de um outro servidor que não seja o servidor do Yahoo, se o endereço de e-mail usado como remetente é o seu e-mail do Yahoo (como myemail@yahoo.com, myemail@yahoo.fr, ...). A sua configuração atual usa o servidor do aplicativo para enviar e-mails, assim alguns destinatários (os que forem compatíveis com o protocolo restritivo DMARC), perguntarão ao Yahoo se eles podem aceitar o seu e-mail e o Yahoo responderá "não", pois o servidor não é um servidor de propriedade do Yahoo, assim alguns dos seus E-mails enviados poderão não ser aceitos.<br>Se o seu provedor de E-mail (como o Yahoo) possui esta restrição, você deve mudar a configuração do E-mail para escolher o outro método "Servidor SMTP" e inserir o servidor SMTP e as credenciais fornecidas pelo seu provedor de E-mail (peça ao seu provedor de EMail para obter as credenciais SMTP para a sua conta).
 ClickToShowDescription=Clique para exibir a descrição
 DependsOn=Este módulo precisa de módulo(s)
 RequiredBy=Este módulo é exigido por módulo(s)
@@ -474,7 +473,6 @@ Module1520Desc=Geração de documentos via e-mail em massa
 Module1780Name=Categorias
 Module1780Desc=Gestor de Categorias (produtos, fornecedores e clientes)
 Module2000Desc=Permitir editar alguma área do texto usando um editor avançado (Baseado no CKEditor)
-Module2200Name=Preços dinâmicos
 Module2200Desc=Habilitar o uso de expressões matemáticas para os preços
 Module2300Desc=Gerenciamento dos trabalhos agendados (alias cron ou tabela chrono)
 Module2400Name=Eventos / Agenda
@@ -489,7 +487,6 @@ Module2660Desc=Habilitar o webservices do Dolibarr (pode ser usado para empurrar
 Module2700Desc=Usar serviço online do Gravatar (www.gravatar.com) para mostrar foto de usuários/membros (achado pelos emails deles). Precisa de acesso a internet
 Module2900Desc=Capacidade de conversão com o GeoIP Maxmind
 Module3100Desc=Adicionar um botão Skype nos cartões dos usuários / terceiros / contatos membros
-Module3200Name=Arquivos inalteráveis
 Module3200Desc=Ative gerador de log de alguns eventos comerciais em um registro inalterável. Os eventos são arquivados em tempo real. O gerador de log é uma tabela de eventos encadeados que podem ser lidos e exportados somente. Este módulo pode ser obrigatório para alguns países.
 Module4000Name=RH
 Module4000Desc=Gerenciamento de recursos humanos (gerenciamento do departamento, contratos dos funcionários e benefícios)
@@ -512,6 +509,7 @@ Module55000Name=Pesquisa Aberta
 Module55000Desc=Módulo que integra pesquisa (tipo: Doodle, Studs, Rdvz, ...)
 Module59000Desc=Módulo para gerenciar margens
 Module60000Desc=Módulo para gerenciar comissão
+Module62000Desc=Adicionar recursos para gerenciar Incoterm
 Module63000Desc=Gerenciar recursos (impressoras, carros, salas, etc.) que você pode compartilhar em eventos.
 Permission11=Ler Faturas de Clientes
 Permission12=Criar/Modificar Faturas de Clientes
@@ -722,11 +720,7 @@ Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco
 Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos
 Permission1322=Reabrir uma nota paga
 Permission1421=Exportar Pedidos de Clientes e Atributos
-Permission20001=Ler as solicitações de licença (suas e de seus subordinados)
-Permission20002=Criar / alterar os seus pedidos de licença
 Permission20003=Excluir pedidos de licença
-Permission20004=Ler todas as solicitações de licença (mesmo de usuários não subordinados)
-Permission20005=Criar / modificar pedidos de licença para todos
 Permission20006=Pedidos de licença administrativas (configuração e atualização de balanço)
 Permission23001=Ler Tarefas Agendadas
 Permission23002=Criar/Atualizar Tarefas Agendadas
@@ -788,8 +782,6 @@ TypeOfRevenueStamp=Tipo de selo de receita
 VATManagement=Gestor de ICMS
 VATIsUsedDesc=Como padrão, quando da criação de orçamentos, faturas, pedidos, etc. a taxa do ICMS acompanha a regra padrão ativa:<br>se o vendedor não estiver sujeito ao ICMS, então o padrão do ICMS é 0. Fim da regra.<br>Se o (país da venda= país da compra), então o ICMS por padrão é igual ao ICMS do produto no país da venda. Fim da regra. <br>Se o vendedor e o comprador estão na Comunidade Europeia e os produtos são meios de transporte (carro, navio, avião), o VAT padrão é 0 (O VAT deverá ser pago pelo comprador à receita federal do seu país e não ao vendedor). Fim da regra.<br>Se o vendedor e o comprador estão na Comunidade Europeia e o comprador não é uma pessoa jurídica, então o VAT por padrão é o VAT do produto vendido. Fim da regra.<br>Se o vendedor e o comprador estão na Comunidade Europeia e o comprador é uma pessoa jurídica, então o VAT é 0 por padrão . Fim da regra.<br>Em qualquer outro caso o padrão proposto é ICMS=0. Fim da regra.
 VATIsNotUsedDesc=Por padrão o ICMS sugerido é 0, o que pode ser usado em casos tipo associações, pessoas ou pequenas empresas.
-VATIsUsedExampleFR=Na França, as empresas ou organizações tem um sistema fiscal real (simplificado real ou normal real). Um sistema no qual o ICMS(vat) é declarado.
-VATIsNotUsedExampleFR=Na França, as associações que não declaram ICMS(vat) ou empresas, organizações ou profissionais liberais que tem escolhidos o sistema fiscal de micro empresas (VAT em franquia) e pago uma franquia VAT sem qualquer declaração de ICMS(vat). Está escolha será mostrado com uma refêrencia "Não Aplicado ICMS(vat) - art-293B de CGI" nas faturas.
 LTRate=Rata
 LocalTax1IsNotUsed=Não utilizar segundo imposto
 LocalTax1IsUsedDesc=Utilizar um segundo tipo de imposto (outro que não seja ICMS)
@@ -849,8 +841,6 @@ PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo
 DefaultLanguage=Idioma padrão a ser usado (código do idioma)
 EnableMultilangInterface=Habilitar interface multi-idioma
 EnableShowLogo=Exibir logo no menu esquerdo
-CompanyInfo=Informações da Empresa/Organização
-CompanyIds=Identificações da Empresa/Organização
 CompanyName=Nome
 CompanyAddress=Endereço
 CompanyZip=CEP
@@ -1276,7 +1266,6 @@ ConfirmDeleteMenu=Você tem certeza que deseja excluir a entrada no menu <b>%s</
 FailedToInitializeMenu=Falha na inicialização do menu
 TaxSetup=Configurações do módulo taxas, contribuição social e dividendos
 OptionVatMode=Imposto ICMS
-OptionVATDefault=Base em Dinheiro
 OptionVATDebitOption=Base em Acréscimo
 OptionVatDefaultDesc=ICMS é um imposto:<br>- Nas entregas dos bens (Nós usamos a data da fatura)<br>- Nos pagamentos dos serviços
 OptionVatDebitOptionDesc=ICMS é um imposto:<br>- Nas entregas dos bens (Nós usamos a data da fatura)<br>- Na emissão da fatura do serviço
@@ -1286,7 +1275,6 @@ SupposedToBeInvoiceDate=Data usada na fatura
 Buy=Compra
 Sell=Venda
 InvoiceDateUsed=Data usada na fatura
-YourCompanyDoesNotUseVAT=A sua companhia foi definida para não usar o VAT (Início - Configuração - Companhia/Organização), por isso não existem opções do VAT para configuração.
 AccountancyCode=Código na Contabilidade
 AccountancyCodeSell=Código de contas de vendas
 AccountancyCodeBuy=Código de contas de compras
@@ -1466,5 +1454,3 @@ MAIN_PDF_MARGIN_RIGHT=Margem direita no PDF
 MAIN_PDF_MARGIN_TOP=Margem superior no PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior no PDF
 UseSearchToSelectResource=Usa um formulário de busca para a escolha de um recurso (em vez de uma lista suspensa)
-DisabledResourceLinkUser=Recurso de conectar ao usuário desabilitado
-DisabledResourceLinkContact=Recurso de conectar ao contato desabilitado
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index f0aa2affb35..3c19a695735 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -36,7 +36,6 @@ InvoiceCanceledInDolibarr=Fatura %s cancelada
 MemberValidatedInDolibarr=Membro %s validado
 MemberResiliatedInDolibarr=Membro %s finalizado
 MemberDeletedInDolibarr=Membro %s cancelado
-MemberSubscriptionAddedInDolibarr=Inscrição do membo %s adicionada
 ShipmentValidatedInDolibarr=Envio %s validado
 ShipmentClassifyClosedInDolibarr=Expedição%s classificado(s) e faturado(s)
 ShipmentUnClassifyCloseddInDolibarr=Expedição%s classificado(s) reaberto(s)
@@ -77,14 +76,14 @@ AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros nos filt
 AgendaUrlOptions3=<b>logina=%s</b> para restringir a saída para ações criada pelo usuário <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> para restringir a saída das ações não pertencentes ao usuário<b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> para restringir a saída às ações atribuídas ao usuário <b>%s</b> (proprietário e outros).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir a saida de açoes associadas ao projeto <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>projeto=__PROJECT_ID__</b> para restringir a saída para ações ligadas ao  <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> para exclusão automática do evento
 AgendaShowBirthdayEvents=Mostrar datas de nascimento dos contatos
 AgendaHideBirthdayEvents=Ocultar datas de nascimento dos contatos
 ExportDataset_event1=Lista dos eventos da agenda
 DefaultWorkingDays=Padrão dias úteis por semana (Exemplo: 1-5, 1-6)
 DefaultWorkingHours=Padrão horas de trabalho em dia (Exemplo: 9-18)
 ExtSitesEnableThisTool=Mostrar calendários externos na agenda
-AgendaExtNb=Calendário núm %s
 ExtSiteUrlAgenda=URL para acessar arquivos .ical
 ExtSiteNoLabel=Sem descrição
 VisibleDaysRange=Intervalo de dias visíveis
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index f8532a3fd3b..7d7386131af 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -40,9 +40,6 @@ NoReplacableInvoice=Nenhuma fatura substituida
 NoInvoiceToCorrect=Nenhuma fatura para corrigir
 InvoiceHasAvoir=Foi fonte de uma ou várias notas de crédito
 CardBill=Ficha da fatura
-PredefinedInvoices=Faturas predefinidas
-Invoice=Fatura
-InvoiceLine=Linha da fatura
 InvoiceCustomer=Fatura de cliente
 CustomerInvoice=Fatura de cliente
 CustomersInvoices=Faturas de clientes
@@ -78,19 +75,16 @@ PaymentConditionsShort=Prazo de pagamento
 PaymentAmount=Valor a ser pago
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a ser pago
 HelpPaymentHigherThanReminderToPay=Atenção, o valor do pagamento de uma ou mais fatura é superior ao valor restante a ser pago. <br> Edite sua entrada, caso contrário confirme e pense sobre em criar nota de crédito do valor excedido para cada fatura que foi paga a mais.
-HelpPaymentHigherThanReminderToPaySupplier=Atenção, o valor do pagamento de uma ou mais contas é maior do que o resto a pagar. <br> Edite sua entrada, caso contrário, confirmar.
 ClassifyPaid=Classificar 'pago'
 ClassifyPaidPartially=Classificar 'parcialmente pago'
 ClassifyCanceled=Classificar 'Abandonado'
 ClassifyClosed=Classificar 'fechado'
 ClassifyUnBilled=Classificar "à faturar"
-CreateBill=Criar fatura
 AddBill=Adicionar fatura ou nota de crédito
 AddToDraftInvoices=Adicionar para rascunho de fatura
 DeleteBill=Deletar fatura
 SearchACustomerInvoice=Procurar fatura de cliente
 SearchASupplierInvoice=Procurar fatura de fornecedor
-CancelBill=Cancelar uma fatura
 SendRemindByMail=Enviar Lembrete por e-mail
 DoPayment=Digite o pagamento
 DoPaymentBack=Insira o reembolso
@@ -105,11 +99,10 @@ StatusOfGeneratedInvoices=Situação das faturas geradas
 BillStatusDraft=Rascunho (precisa ser validada)
 BillStatusPaid=Pago
 BillStatusPaidBackOrConverted=Reembolso de nota de crédito ou convertido em desconto
-BillStatusConverted=Pago (pronto para fatura final)
+BillStatusConverted=Pago (Pronto para consumo na fatura final)
 BillStatusValidated=Validado (precisa ser pago)
 BillStatusStarted=Iniciado
 BillStatusNotPaid=Não pago
-BillStatusNotRefunded=Não reembolsado
 BillStatusClosedUnpaid=Fechado (não pago)
 BillStatusClosedPaidPartially=Pago (parcialmente)
 BillShortStatusPaid=Pago
@@ -118,7 +111,6 @@ BillShortStatusCanceled=Abandonado
 BillShortStatusValidated=Validado
 BillShortStatusStarted=Iniciado
 BillShortStatusNotPaid=Não pago
-BillShortStatusNotRefunded=Não reembolsado
 BillShortStatusClosedUnpaid=Fechado
 BillShortStatusClosedPaidPartially=Pago (parcialmente)
 PaymentStatusToValidShort=Para validar
@@ -139,7 +131,6 @@ RecurringInvoiceTemplate=Modelo / nota fiscal recorrente
 NoQualifiedRecurringInvoiceTemplateFound=Nenhum tema de fatura recorrente qualificado para a geração
 FoundXQualifiedRecurringInvoiceTemplate=Encontrado(s) %s tema(s) de fatura(s) recorrente(s) qualificado(s) para a geração.
 NotARecurringInvoiceTemplate=Não é um tema de fatura recorrente
-NewBill=Nova fatura
 LastBills=Últimas notas %s
 LatestTemplateInvoices=Últimas faturas do modelo %s
 LatestCustomerTemplateInvoices=Últimas faturas do modelo de cliente %s
@@ -208,22 +199,18 @@ NoOtherDraftBills=Nenhum outro rascunho de faturas
 NoDraftInvoices=Nenhum rascunho de faturas
 RefBill=Ref. de fatura
 ToBill=Faturar
-RemainderToBill=Restante a faturar
 SendBillByMail=Enviar a fatura por e-mail
 SendReminderBillByMail=Enviar o restante por e-mail
 RelatedCommercialProposals=Orçamentos relacionados
 RelatedRecurringCustomerInvoices=Faturas recorrentes relacionadas ao cliente
 MenuToValid=Validar
 DateMaxPayment=Pagamento devido em
-DateInvoice=Data da fatura
 DatePointOfTax=Ponto de imposto
-NoInvoice=Nenhuma fatura
 ClassifyBill=Classificar fatura
 SupplierBillsToPay=Faturas de fornecedores não pagos
 CustomerBillsUnpaid=Faturas de clientes não pagos
 SetConditions=Definir condições de pagamento
 SetRevenuStamp=Definir o selo da receita
-Billed=Faturado
 RecurringInvoices=Faturas recorrentes
 RepeatableInvoice=Fatura pré-definida
 RepeatableInvoices=Faturas pré-definidas
@@ -252,7 +239,6 @@ Deposit=Depósito
 Deposits=Depósitos
 DiscountFromCreditNote=Desconto de nota de crédito %s
 DiscountFromDeposit=Pagamentos a partir de depósito na fatura %s
-DiscountFromExcessReceived=Pagamentos do excesso recebido da fatura %s
 AbsoluteDiscountUse=Esse tipo de crédito pode ser usado na fatura antes da validação
 CreditNoteDepositUse=A fatura deve ser validada para utilizar este tipo de crédito
 NewGlobalDiscount=Novo desconto fixo
@@ -271,13 +257,9 @@ InvoiceRef=Ref. fatura
 InvoiceDateCreation=Data da criação da fatura
 InvoiceStatus=Status da fatura
 InvoiceNote=Nota de fatura
-InvoicePaid=Fatura paga
 RemoveDiscount=Remover desconto
 WatermarkOnDraftBill=Marca d'água nos rascunhos de faturas (nada se vazio)
-InvoiceNotChecked=Nenhuma fatura selecionada
-CloneInvoice=Clonar fatura
 ConfirmCloneInvoice=Você tem certeza que deseja clonar esta fatura <b>%s</b>?
-DisabledBecauseReplacedInvoice=Ação desativada porque a fatura foi substituída
 DescTaxAndDividendsArea=Esta área apresenta um resumo de todos os pagamentos feitos como despesas especiais. Somente os registros com pagamento durante o ano fixo são incluídos aqui.
 NbOfPayments=Núm de pagamentos
 SplitDiscount=Dividir desconto em dois
@@ -285,7 +267,6 @@ ConfirmSplitDiscount=Você tem certeza que deseja dividir este desconto de <b>%s
 TypeAmountOfEachNewDiscount=Quantia entrada para cada de duas partes:
 TotalOfTwoDiscountMustEqualsOriginal=Total dos dois descontos deve ser igual ao desconto original.
 ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto?
-RelatedBill=Fatura relacionada
 RelatedCustomerInvoices=Faturas de clientes relacionadas
 RelatedSupplierInvoices=Faturas de fornecedores relacionados
 LatestRelatedBill=Últimas fatura correspondente
@@ -305,10 +286,6 @@ NextDateToExecution=Data para a próxima geração de fatura
 NextDateToExecutionShort=Data da próxima geração.
 DateLastGeneration=Data da última geração
 DateLastGenerationShort=Data da última geração.
-MaxPeriodNumber=Nº máximo de geração de faturas
-NbOfGenerationDone=Nº de geração de fatura já alcançado
-NbOfGenerationDoneShort=Numero de geração feito
-MaxGenerationReached=Nº máximo de gerações alcançado
 InvoiceAutoValidate=Validar as faturas automaticamente
 GeneratedFromRecurringInvoice=Gerar a partir do tem de fatura recorrente %s
 DateIsNotEnough=Data ainda não alcançada
@@ -393,7 +370,6 @@ ShowUnpaidAll=Mostras todas as faturas não pagas
 ShowUnpaidLateOnly=Mostrar todas as faturas atrasadas não pagas
 PaymentInvoiceRef=Pagamento de fatura %s
 ValidateInvoice=validar fatura
-ValidateInvoices=Validar faturas
 Cash=DinheiroCash
 DisabledBecausePayments=Não é possivel devido alguns pagamentos
 CantRemovePaymentWithOneInvoicePaid=Não posso remover pagamento ao menos que o última fatura sejá classificada como pago
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 04a9a5b6fb2..a28c52e063e 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -34,7 +34,6 @@ Individual=Pessoa física
 ToCreateContactWithSameName=Um contato/endereço será criado automaticamente com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
 ParentCompany=Matriz
 Subsidiaries=Filiais
-ReportByCustomers=Relatório pelos clientes
 ReportByQuarter=Relatório pela taxa
 CivilityCode=Forma de tratamento
 RegisteredOffice=Escritório registrado
@@ -44,6 +43,8 @@ PostOrFunction=Cargo
 Address=Endereço
 State=Estado/Província
 StateShort=Status do Cadastro
+Region=Região
+Region-State=Região - Estado
 CountryCode=Código do país
 CountryId=ID do país
 Call=Chamar
@@ -55,8 +56,6 @@ Zip=CEP
 Town=Município
 Web=Website
 DefaultLang=Idioma ordinário
-VATIsUsed=Sujeito a ICMS
-VATIsNotUsed=Não sujeito a ICMS
 CopyAddressFromSoc=Preencher o endereço com os dados do terceiro
 ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiro sem ser cliente ou fornecedor, nenhum objeto de referência disponível
 PaymentBankAccount=Pagamento conta bancária
@@ -112,11 +111,8 @@ ProfId1TN=RC
 ProfId2TN=Matrícula Fiscal
 ProfId3TN=Código na Alfandega
 ProfId4TN=CCC
-ProfId1US=ID do Prof.
 ProfId3DZ=Numero de Contribuinte
 ProfId4DZ=Numero de Identificação Social
-VATIntra=Número ICMS
-VATIntraShort=Núm ICMS
 VATIntraSyntaxIsValid=Sintaxe é válida
 ProspectCustomer=Possível cliente / Cliente
 Prospect=Prospecto de cliente
@@ -129,8 +125,6 @@ CompanyHasAbsoluteDiscount=Este cliente possui desconto disponível (notas de cr
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente possui desconto disponível (comercial, adiantamentos) para <b> %s </b> %s
 CompanyHasCreditNote=Esse cliente ainda tem notas de crédito por <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=Esse cliente não tem desconto de crédito disponível
-CustomerAbsoluteDiscountAllUsers=Desconto fixo (concedido para todos usuários)
-CustomerAbsoluteDiscountMy=Desconto fixo (concedido para seu usuário)
 DiscountNone=Nenhum
 AddContact=Adicionar contato
 AddContactAddress=Adicionar contato/endereço
@@ -200,8 +194,6 @@ TE_SMALL=Empresa de pequeno porte
 TE_RETAIL=Revendedor/Varejista
 TE_WHOLE=Atacadista
 TE_PRIVATE=Autônomo
-StatusProspect-1=Não contactar
-StatusProspect0=Nunca contactado
 StatusProspect1=A contactar
 StatusProspect2=Contato em andamento
 StatusProspect3=Contato feito
@@ -216,9 +208,6 @@ NoDolibarrAccess=Sem acesso ao Dolibarr
 ExportDataset_company_1=Terceiros (Empresas / Fundações / Pessoas físicas) e propriedades
 ExportDataset_company_2=Contatos e propriedades
 ImportDataset_company_1=Terceiros (Empresas / Fundações / Pessoas físicas) e propriedades.
-ImportDataset_company_2=Contatos/Endereços (terceiros ou não) e atributos
-ImportDataset_company_3=Detalhes bancários
-ImportDataset_company_4=Terceiros/Representantes (Afeta os usuários representantes comerciais da empresa)
 PriceLevel=Faixa de preço
 DeliveryAddress=Endereço de entrega
 AddAddress=Adicionar endereço
@@ -235,7 +224,6 @@ ListProspectsShort=Lista de prospectos de cliente
 ThirdPartiesArea=Área de terceiros
 LastModifiedThirdParties=Últimos %s terceiros modificados
 UniqueThirdParties=Total de terceiros
-InActivity=Aberto
 ActivityCeased=Inativo
 ThirdPartyIsClosed=O terceiro está fechado
 ProductsIntoElements=Lista de produtos/serviços em %s
@@ -248,8 +236,6 @@ ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
 MergeOriginThirdparty=Duplicar terceiros (terceiros que deseja excluir)
 MergeThirdparties=Mesclar terceiros
 ConfirmMergeThirdparties=Tem certeza de que deseja juntar esse terceiro no atual? Todos os objetos vinculados (faturas, pedidos, ...) serão movidos para o terceiro atual, então a terceira parte será excluída.
-ThirdpartiesMergeSuccess=Terceiros foram mesclados
 SaleRepresentativeLogin=Login para o representante de vendas
 SaleRepresentativeLastname=Sobrenome do representante de vendas
-ErrorThirdpartiesMerge=Houve um erro ao excluir os terceiros. Por favor, verifique o log. As alterações foram revertidas.
 NewCustomerSupplierCodeProposed=Código sugerido para o novo cliente ou fornecedor está duplicado
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 794c3e64a9a..4bf63e5466b 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -24,7 +24,6 @@ AccountingResult=Resultado contábil
 BalanceBefore=Balanço (antes)
 Piece=Doc. contábil
 AmountHTVATRealPaid=líquido pago
-VATToPay=ICMS a pagar
 VATReceived=Imposto recebido
 VATToCollect=Compras fiscais
 VATSummary=balanço de impostos
@@ -66,7 +65,6 @@ NewSocialContribution=Nova contribuição fiscal/social
 AddSocialContribution=Adicionar imposto social / fiscal
 ContributionsToPay=Encargos sociais / fiscais para pagar
 PaymentCustomerInvoice=Pagamento de fatura de cliente
-PaymentSupplierInvoice=Pagamento de fatura de fornecedor
 PaymentSocialContribution=Pagamento de imposto social / fiscal
 PaymentVat=Pagamento de ICMS
 DateStartPeriod=Período de início e data
@@ -100,13 +98,13 @@ SalesTurnover=Faturamento de vendas
 SalesTurnoverMinimum=Volume de negócios mínimo de vendas
 ByExpenseIncome=Por despesas & receitas
 ByThirdParties=Por Fornecedor
-ByUserAuthorOfInvoice=Por autor da fatura
 CheckReceipt=Depósito de cheque
 CheckReceiptShort=Depósito de cheque
 LastCheckReceiptShort=Últimos %s recibos de cheque
 NewCheckReceipt=Novo desconto
 NewCheckDeposit=Novo depósito de cheque
 NoWaitingChecks=Sem cheques a depositar.
+DateChequeReceived=Data introdução de dados de recepção cheque
 NbOfCheques=Nº de cheques
 PaySocialContribution=Quitar um encargo fiscal/social
 ConfirmPaySocialContribution=Quer mesmo categorizar esta contribuição fiscal/social como paga?
@@ -140,24 +138,15 @@ RulesResultBookkeepingPredefined=Inclui registro em seu Ledger com contas contá
 RulesResultBookkeepingPersonalized=Mostra registro em seu Livro de Registro com contas contábeis <b> agrupadas por grupos personalizados </ b>
 SeePageForSetup=Consulte o menu <a href="%s"> %s </a> para configurar
 DepositsAreNotIncluded=- As faturas de adiantamento nem estão incluídas
-LT2ReportByCustomersInInputOutputModeES=Relatório de fornecedores do  IRPF
-LT1ReportByCustomersInInputOutputModeES=Relatorio por terceiro RE
-VATReport=Relatório de ICMS
+LT1ReportByCustomersES=Relatorio por terceiro RE
+LT2ReportByCustomersES=Relatório de fornecedores do  IRPF
 VATReportByCustomersInInputOutputMode=Relatório do IVA cliente recolhido e pago
-VATReportByCustomersInDueDebtMode=Relatório do IVA cliente recolhido e pago
-VATReportByQuartersInInputOutputMode=Relatório da taxa do IVA cobrado e pago
-LT1ReportByQuartersInInputOutputMode=Relatorio por rata RE
-LT2ReportByQuartersInInputOutputMode=Relatoriopor rata IRPF
-VATReportByQuartersInDueDebtMode=Relatório da taxa do IVA cobrado e pago
-LT1ReportByQuartersInDueDebtMode=Relatorio por rata RE
-LT2ReportByQuartersInDueDebtMode=Relatorio por rata IRPF
+LT1ReportByQuartersES=Relatorio por rata RE
+LT2ReportByQuartersES=Relatorio por rata IRPF
 SeeVATReportInDueDebtMode=Ver o Relatório <b>%sIVA a dever%s</b> para um modo de cálculo com a opção sobre a divida
 RulesVATInServices=- No caso dos serviços, o relatório inclui os regulamentos IVA efetivamente recebidas ou emitidas com base na data de pagamento.
-RulesVATInProducts=- Para os bens materiais, que inclui as notas fiscais de IVA com base na data da fatura.
 RulesVATDueServices=- No caso dos serviços, o relatório inclui faturas de IVA devido, remunerado ou não, com base na data da fatura.
-RulesVATDueProducts=- Para os bens materiais, que inclui as notas fiscais de IVA, com base na data da fatura.
 OptionVatInfoModuleComptabilite=Nota: Para os bens materiais, sería necessário utilizar a data de entregas para para ser mais justo.
-PercentOfInvoice=%%/fatura
 NotUsedForGoods=Bens não utilizados
 ProposalStats=As estatísticas sobre as propostas
 OrderStats=Estatísticas de comandos
@@ -180,8 +169,6 @@ CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequ
 TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de <b>contabilidade de caixa</b> não é relevante. Este relatório está disponível somente quando utilizar o modo de <b>contabilidade engajamento</b> (ver configuração do módulo de contabilidade).
 CalculationMode=Forma de cálculo
 AccountancyJournal=código do Livro de Registro contábil
-ACCOUNTING_VAT_SOLD_ACCOUNT=Conta contabilística por padrão para cobrança de IVA - IVA sobre vendas (usado se não definido na configuração do dicionário de IVA)
-ACCOUNTING_VAT_BUY_ACCOUNT=Conta contabilística por padrão para IVA recuperado - IVA sobre compras (usado se não definido na configuração do Dicionário de IVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Conta da contabilidade padrão para o pagamento de ICMS
 ACCOUNTING_ACCOUNT_CUSTOMER=Conta contábil usada para terceiros de clientes
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=A conta contábil dedicada definida no cartão de terceiros será usada somente para o uso exclusivo do Sub Livro de Registro. Este será usado para o Razão Geral e como valor padrão da contabilidade do Sub Livro de Registro se a conta de acesso ao cliente dedicada em terceiros não estiver definida.
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index ff7e7caf1c0..a038e71268d 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -30,7 +30,6 @@ CronDtLastLaunch=Data de início da última execução
 CronDtLastResult=Data final da última execução
 CronNoJobs=Nenhuma tarefa registrada
 CronNbRun=Nr. execuçao
-CronMaxRun=Max nr. execução
 CronEach=Cada
 JobFinished=Trabalho iniciado e terminado
 CronAdd=Adicionar tarefa
@@ -40,8 +39,6 @@ CronSaveSucess=Salvo com sucesso
 CronFieldMandatory=O campo %s é obrigatório
 CronErrEndDateStartDt=A data final não pode ser anterior a data de início
 StatusAtInstall=Status na instalação do módulo
-CronStatusActiveBtn=Ativar
-CronStatusInactiveBtn=Desativar
 CronTaskInactive=Está tarefa está desativada
 CronClassFile=Nome de arquivo com classe
 CronModuleHelp=Nome do diretório do módulo Dolibarr (também funciona com o módulo externo Dolibarr). <BR> Por exemplo, chamar o método de busca do objeto de produto Dolibarr /htdocs/<u>product</u>/class/product.class.php, o valor para o módulo é <br> <i> produto </i>
@@ -54,9 +51,7 @@ CronCreateJob=Criar uma nova Tarefa agendada
 CronType=Tipo de tarefa
 CronType_method=Chamar método de uma Classe PHP
 CronType_command=Comando Shell
-CronCannotLoadClass=Nao e possivel carregar a classe %s ou o objeto %s
 UseMenuModuleToolsToAddCronJobs=Vá até o menu "Home >> Ferramentas administrativas >> Tarefas agendadas" para visualizar e editar as tarefas agendadas.
 JobDisabled=Tarefa desativada
 MakeLocalDatabaseDumpShort=Backup do banco de dados local
-MakeLocalDatabaseDump=Crie um despejo de banco de dados local. Os parâmetros são: compressão ('gz' ou 'bz' ou 'none'), tipo de backup ('mysql' ou 'pgsql'), 1, 'auto' ou nome do arquivo para construir, nb de arquivos de backup para manter
 WarningCronDelayed=Atenção, para fins de desempenho, seja qual for a próxima data de execução de tarefas habilitadas, suas tarefas podem ser atrasadas em até um máximo de %s horas, antes de serem executadas.
diff --git a/htdocs/langs/pt_BR/dict.lang b/htdocs/langs/pt_BR/dict.lang
index bbd41bf0266..a5d5e5873e6 100644
--- a/htdocs/langs/pt_BR/dict.lang
+++ b/htdocs/langs/pt_BR/dict.lang
@@ -50,7 +50,6 @@ CountryBL=São Bartolomeu
 CountryMF=São Martinho
 CivilityMLE=Srta.
 CivilityMTRE=Me.
-CivilityDR=Dr.
 CurrencyAUD=Dólares australianos
 CurrencySingAUD=Dólar australiano
 CurrencyCAD=Dólares canadenses
diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
index 639052d56e5..b6ffd6a8653 100644
--- a/htdocs/langs/pt_BR/donations.lang
+++ b/htdocs/langs/pt_BR/donations.lang
@@ -10,7 +10,6 @@ ShowDonation=Mostrar doação
 PublicDonation=Doação pública
 DonationsArea=Área de doações
 DonationStatusPromiseNotValidated=Promessa não validada
-DonationStatusPromiseValidated=Promessa validada
 DonationStatusPaid=Doação recebida
 DonationStatusPromiseNotValidatedShort=Não validada
 DonationStatusPromiseValidatedShort=Validada
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 0ddf2fecb8b..1e40071d95c 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -4,7 +4,6 @@ ErrorButCommitIsDone=Erros foram encontrados mas, apesar disso, validamos
 ErrorBadEMail=O e-mail %s está errado
 ErrorBadUrl=O URL %s está errado
 ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro por falta, possivelmente, de tradução.
-ErrorLoginAlreadyExists=O login %s já existe.
 ErrorRecordNotFound=Registro não encontrado.
 ErrorFailToCopyFile=Houve uma falha ao copiar o arquivo '<b>%s</b>' para '<b>%s</b>'.
 ErrorFailToRenameFile=Houve uma falha ao renomear o arquivo '<b>%s</b>' para '<b>%s</b>'.
@@ -108,7 +107,6 @@ ErrorFailedToAddToMailmanList=Falha ao adicionar registro% s para% s Mailman lis
 ErrorFailedToRemoveToMailmanList=Falha ao remover registro% s para% s Mailman lista ou base SPIP
 ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao anterior
 ErrorFailedToValidatePasswordReset=Falha ao reinicializar senha. Pode ser o reinit já foi feito (este link pode ser usado apenas uma vez). Se não, tente reiniciar o processo reinit.
-ErrorToConnectToMysqlCheckInstance=A conexão ao banco de dados falhou. Verifique se o servidor MySQL está em execução (na maioria dos casos, você pode iniciá-lo a partir da linha de comandos com 'sudo /etc/init.d/mysql start').
 ErrorFailedToAddContact=Houve uma falha ao adicionar o contato
 ErrorDateMustBeBeforeToday=A data não pode ser posterior ao dia de hoje
 ErrorPaymentModeDefinedToWithoutSetup=A modalidade de pagamento foi definido para tipo% s mas a configuração do módulo de fatura não foi concluída para definir as informações para mostrar para esta modalidade de pagamento.
diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang
index a597c318f7c..dafe7ffb001 100644
--- a/htdocs/langs/pt_BR/interventions.lang
+++ b/htdocs/langs/pt_BR/interventions.lang
@@ -2,10 +2,8 @@
 InterventionCard=Ficha de Intervenção
 AddIntervention=Criar Intervenção
 ActionsOnFicheInter=Açoes na intervençao
-LastInterventions=Últimas %s intervenções
 InterventionContact=Contato Intervenção
 ModifyIntervention=Modificar intervençao
-CloneIntervention=Clonar intervenção
 ConfirmDeleteIntervention=Você tem certeza que deseja excluir esta intervenção?
 ConfirmValidateIntervention=Você tem certeza que deseja validar esta intervenção sob o nome <b>%s</b>?
 ConfirmModifyIntervention=Você tem certeza que deseja modificar esta intervenção?
@@ -17,14 +15,12 @@ InterventionClassifyDone=Classificar "Feito"
 StatusInterInvoiced=Faturado
 SendInterventionRef=Apresentação de intervenção %s
 SendInterventionByMail=Enviar por E-mail intervenção
-InterventionCreatedInDolibarr=Intervenção %s criada
 InterventionModifiedInDolibarr=Intervenção %s alterada
 InterventionClassifiedBilledInDolibarr=Intervenção %s classificada como Faturada
 InterventionClassifiedUnbilledInDolibarr=Intervenção %s definida como à faturar
 InterventionDeletedInDolibarr=Intervenção %s excluída
 InterventionsArea=Área intervenções
 DraftFichinter=Rascunho de intervenções
-LastModifiedInterventions=Últimas %s intervenções modificadas
 FichinterToProcess=Intermediações para processar
 TypeContact_fichinter_external_CUSTOMER=Contato do cliente do seguimento da intervenção
 PrintProductsOnFichinter=Imprima também linhas do tipo "produto" (e não apenas serviços) na ficha de intervenção
@@ -41,7 +37,6 @@ InterRef=Intervenção ref.
 InterDateCreation=Intervenção data de criação
 InterDuration=Duração intervenção
 InterStatus=Status de intervenção
-InterNote=Nota da intervenção
 InterLineId=Linha id de intervenção
 InterLineDate=Linha da data de intervenção
 InterLineDuration=Linha de duração de intervenção
diff --git a/htdocs/langs/pt_BR/loan.lang b/htdocs/langs/pt_BR/loan.lang
index 5e4f157c4ac..9b0697f018f 100644
--- a/htdocs/langs/pt_BR/loan.lang
+++ b/htdocs/langs/pt_BR/loan.lang
@@ -40,4 +40,3 @@ AddLoan=Criar empréstimo
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Capital contabilístico por padrão
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Interesse contabilístico por padrão
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Seguro contabilístico por padrão
-CreateCalcSchedule=Criar / alterar horário de empréstimo
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index a3bf223bf12..9432eec082b 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -9,9 +9,6 @@ MailCC=Copiar para
 MailFile=Arquivos anexados
 ResetMailing=Limpar Mailing
 TestMailing=Testar email
-MailingStatusSentPartialy=Enviado parcialmente
-MailingStatusSentCompletely=Enviado completamente
-MailingStatusNotSent=Não enviado
 MailingSuccessfullyValidated=Emailins validado com sucesso
 MailUnsubcribe=Desenscrever
 MailingStatusNotContact=Nao contactar mais
@@ -66,7 +63,6 @@ MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administr
 MailSendSetupIs3=Se tiver perguntas sobre como configurar o seu servidor SMTP voçê pode perguntar %s.
 YouCanAlsoUseSupervisorKeyword=Você também pode adicionar a palavra-chave <strong>__SUPERVISOREMAIL__</strong> ter e-mail que está sendo enviado ao supervisor do usuário (só funciona se um email é definido para este supervisor)
 NbOfTargetedContacts=Número atual de e-mails de contatos direcionados
-AdvTgtTitle=Preencher os campos de entrada para pré-selecionar os terceiros ou contatos/endereços como destino
 AdvTgtSearchTextHelp=Use %% como caracteres mágicos. Por exemplo, para encontrar todos os itens como <b>jean, joe, jim</b>, você pode inserir <b>j%%</b>, você também pode usar ; como separador para valores, e usar ! para excluir este valor. Por exemplo <b>jean;joe;jim%%;!jimo;!jima%</b> colocarão todos os jean, joe, como destino, iniciar com jim, mas sem jimo e nem tudo que começa com jima
 AdvTgtSearchIntHelp=Use o intervalo para selecionar o valor int ou flutuante
 AdvTgtSearchDtHelp=Use o intervalo para selecionar o valor da data
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 3dd6489c0db..dc6fd38c407 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -30,6 +30,7 @@ ErrorFailedToOpenFile=Houve uma falha ao abrir o arquivo %s
 ErrorCanNotCreateDir=Não é possível criar  a pasta %s
 ErrorCanNotReadDir=Não é possível ler a pasta %s
 ErrorLogoFileNotFound=O arquivo logo '%s' não se encontra
+ErrorGoToGlobalSetup=Vai ao 'Empresa/Oragnisacao' configuracao para resolver isto
 ErrorFailedToSendMail=Erro ao envio do e-mail (emissor
 ErrorFileNotUploaded=O arquivo não foi possível transferir
 ErrorYourCountryIsNotDefined=O seu país não está definido. corrija indo a Configuração-Geral-Editar
@@ -47,6 +48,7 @@ NotAuthorized=Você não está autorizado a fazer isso.
 SelectDate=Selecionar uma data
 SeeAlso=Ver tambem %s
 SeeHere=veja aqui
+ClickHere=Clickque aqui
 BackgroundColorByDefault=Cor do fundo padrão
 FileRenamed=O arquivo foi renomeado com sucesso
 FileGenerated=O arquivo foi gerado com sucesso
@@ -60,6 +62,7 @@ LevelOfFeature=Nível de funções
 DolibarrInHttpAuthenticationSoPasswordUseless=Modo de autenticação do Dolibarr está definido como <b>%s</b> no arquivo de configuração<b>conf.php</b>.<br>Isso significa que o banco de dados das senhas é externo ao Dolibarr, assim mudar este campo, pode não ter efeito.
 PasswordForgotten=Esqueceu a senha?
 SeeAbove=Mencionar anteriormente
+LastConnexion=Ultima conexao
 PreviousConnexion=último login
 ConnectedOnMultiCompany=Conectado no ambiente
 AuthenticationMode=Modo de Autenticação
@@ -113,6 +116,7 @@ PersonalValue=Valor Personalizado
 CurrentValue=Valor atual
 MultiLanguage=Multi Idioma
 RefOrLabel=Ref. da etiqueta
+Model=Template doc
 Action=Ação
 About=Acerca de
 NumberByMonth=Numero por mes
@@ -137,8 +141,10 @@ DateRequest=Data Consulta
 DateProcess=Data Processo
 UserCreation=Criado por
 UserModification=Alterado por
+UserValidation=Usuario validado
 UserCreationShort=Criado por
 UserModificationShort=Modif. por
+UserValidationShort=Usuarios validados
 DurationDay=Día
 Day=Día
 days=Dias
@@ -158,6 +164,7 @@ PriceUHTCurrency=U.P (moeda)
 PriceUTTC=U.P. (inc. Impostos)
 Amount=Valor
 AmountInvoice=Valor Fatura
+AmountInvoiced=Valor faturado
 AmountPayment=Valor Pagamento
 AmountHTShort=Valor (neto)
 AmountTTCShort=Valor (incl. taxas)
@@ -179,14 +186,19 @@ TotalTTCShort=Total (incl. taxas)
 TotalHT=Valor
 TotalHTforthispage=Total (sem impostos) desta pagina
 TotalTTC=Total
+TotalTTCToYourCredit=Total a crédito
 TotalVAT=Total do ICMS
 TotalLT1=Total taxa 2
 TotalLT2=Total taxa 3
 HT=Sem ICMS
 TTC=ICMS Incluido
+INCVATONLY=Com ICMS
 VAT=ICMS
 VATs=Impostos sobre vendas
 VATRate=Taxa ICMS
+VATCode=Codigo do ICMS
+VATNPR=Valor taxa NPR
+Module=Modulo/Aplicacao
 OtherStatistics=Outras estatisticas
 Favorite=Favorito
 RefSupplier=Ref. Fornecedor
@@ -202,6 +214,8 @@ ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor
 AddressesForCompany=Endereços para este terceiro
 ActionsOnCompany=Ações nesta sociedade
 ActionsOnMember=Eventos deste membro
+ActionsOnProduct=Eventos deste produto
+ToDo=Para fazer
 RequestAlreadyDone=Pedido ja registrado
 FilterOnInto=Critério da pesquisa  '<strong>%s</strong>' nos campos %s
 RemoveFilter=Eliminar filtro
@@ -217,6 +231,8 @@ ByUsers=Por usuário
 LateDesc=O atraso na definição se o registro é tardio ou não, depende da sua configuração. Peça ao seu Administrador para alterar o atraso no menu Início - Configuração - Alertas.
 DeletePicture=Apagar foto
 ConfirmDeletePicture=Confirmar eliminação de fotografias
+LoginEmail=Usuario (email)
+LoginOrEmail=Usuraio ou Email
 CurrentLogin=Login atual
 FebruaryMin=Fev
 AprilMin=Abr
@@ -248,11 +264,13 @@ CustomerPreview=Historico Cliente
 SupplierPreview=Historico Fornecedor
 ShowCustomerPreview=Ver Historico Cliente
 ShowSupplierPreview=Ver Historico Fornecedor
+SeeAll=Ver tudo
 SendByMail=Enviado por e-mail
+MailSentBy=Mail enviado por
 Email=E-mail
 NoMobilePhone=Sem celular
-Owner=Proprietário
 Refresh=Atualizar
+BackToList=Mostar Lista
 CanBeModifiedIfOk=Pode modificarse se é valido
 CanBeModifiedIfKo=Pode modificarse senão é valido
 ValueIsValid=Valor é válido
@@ -263,6 +281,7 @@ RecordsDeleted=%s registro excluido
 FeatureDisabled=Função Desativada
 MoveBox=Widget de movimento
 NotEnoughPermissions=Não tem permissões para esta ação
+Receive=Recepção
 CompleteOrNoMoreReceptionExpected=Completo nada mais a fazer
 YouCanSetDefaultValueInModuleSetup=Você pode definir o valor padrão usado quando da criação de um novo registro na configuração do módulo
 UploadDisabled=Carregamento Desativada
@@ -280,6 +299,7 @@ PrintContentArea=Mostrar pagina a se imprimir na area principal
 MenuManager=Administração do menu
 WarningYouAreInMaintenanceMode=Atenção, voce esta no modo de manutenção, somente o login <b>%s</b> tem permissões para uso da aplicação no momento.
 CreditCard=Cartão de credito
+CreditOrDebitCard=Cartao de credito ou debito
 FieldsWithAreMandatory=Campos com <b>%s</b> são obrigatorios
 FieldsWithIsForPublic=Campos com <b>%s</b> são mostrados na lista publica de membros. Se não deseja isto, deselecione a caixa "publico".
 AccordingToGeoIPDatabase=(conforme a convenção GeoIP)
@@ -305,6 +325,7 @@ LinkToContract=Link para o Contrato
 LinkToIntervention=Link para a Intervensão
 SetToDraft=Voltar para modo rascunho
 ObjectDeleted=Objeto %s apagado
+ByTown=Por cidade
 ByMonthYear=Por mes/ano
 ByYear=Por ano
 ByMonth=Por mes
@@ -339,9 +360,11 @@ DeleteLine=Apagar linha
 ConfirmDeleteLine=Você tem certeza que deseja excluir esta linha?
 MassFilesArea=Área para os arquivos gerados pelas ações em massa
 ShowTempMassFilesArea=Exibir área dos arquivos gerados pelas ações em massa
+ConfirmMassDeletion=Confirmar deleite em massa
+ConfirmMassDeletionQuestion=Voce tem certeza que quer apagar o %s registro selecionado ?
 RelatedObjects=Objetos Relacionados
 ClassifyBilled=Classificar Faturado
-ClickHere=Clickque aqui
+ClassifyUnbilled=Classificar nao faturado
 FrontOffice=Frente do escritório
 BackOffice=Fundo do escritório
 View=Visão
@@ -350,8 +373,11 @@ Miscellaneous=Variados
 Calendar=Calendário
 GroupBy=Agrupar por
 ViewFlatList=Visão da lista resumida
+DownloadDocument=Descarregar documento
 Fiscalyear=Ano fiscal
 WebSite=Web Site
+WebSites=Sites web
+WebSiteAccounts=Contas do site
 EMailTemplates=Modelos de E-mails
 Saturday=Sabado
 SaturdayMin=Sab
@@ -371,4 +397,6 @@ SearchIntoSupplierProposals=Propostas a fornecedor
 SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Remessas do cliente
 CommentLink=Comentarios
+CommentPage=Espaço para comentarios
 Everybody=A todos
+PayedBy=Pago de
diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
index 216c573e0f9..dccb194f19a 100644
--- a/htdocs/langs/pt_BR/margins.lang
+++ b/htdocs/langs/pt_BR/margins.lang
@@ -26,4 +26,3 @@ rateMustBeNumeric=Rata deve ser um valor numerico
 markRateShouldBeLesserThan100=Rata marcada teria que ser menor do que 100
 ShowMarginInfos=Mostrar informações sobre margens
 CheckMargins=Detalhes das margens
-MarginPerSaleRepresentativeWarning=O relatório de margem por usuário usa o link entre terceiros e representantes de vendas para calcular a margem de cada venda representativa. Por causa que alguns terceiros não terem um representante de vendas dedicado e alguns terceiros podem estar ligados a vários, alguns montantes podem não ser incluídos neste relatório (se não houver representante de venda) e alguns podem aparecer em diferentes linhas (para cada representante de venda).
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index 8d541fe0e14..d5e28dffb28 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -10,7 +10,6 @@ MembersTickets=Etiquetas de associado
 FundationMembers=Membros da fundação
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro  já está vinculado a um terceiro. Remover este link em primeiro lugar porque um terceiro não pode ser ligado a apenas um membro (e vice-versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você deve ter permissões para editar todos os usuários sejam capazes de ligar um membro a um usuário que não é seu.
-CardContent=Conteúdo da sua ficha de membro
 SetLinkToThirdParty=Link para um fornecedor Dolibarr
 MembersCards=Cartões de Membros
 MembersListUpToDate=Lista dos Membros válidos ao día de adesão
@@ -60,6 +59,7 @@ LastSubscriptionsModified=Últimas %s subscrições modificadas
 PublicMemberCard=Ficha pública membro
 SubscriptionNotRecorded=Subscrição não registrada
 AddSubscription=Criar subscripção
+CardContent=Conteúdo da sua ficha de membro
 DescADHERENT_ETIQUETTE_TEXT=Texto impresso em folhas de endereço de membros
 DescADHERENT_CARD_TYPE=Formato da página fichas
 DescADHERENT_CARD_HEADER_TEXT=Texto a imprimir na parte superior do cartão de membro
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 8c32323ced4..4f897c6aec2 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -25,12 +25,8 @@ OrdersToBill=Pedidos dos clientes entregue
 OrdersInProcess=Pedidos de cliente em processo
 OrdersToProcess=Pedidos de cliente a processar
 SuppliersOrdersToProcess=Pedidos a fornecedor a processar
-StatusOrderSentShort=Em processo
 StatusOrderSent=Entrega encaminhada
 StatusOrderOnProcessShort=Pedido
-StatusOrderDelivered=Entregue
-StatusOrderDeliveredShort=Entregue
-StatusOrderToBillShort=Entregue
 StatusOrderToProcessShort=A processar
 StatusOrderOnProcess=Pedido - Aguardando Recebimento
 StatusOrderOnProcessWithValidation=Ordenada - recepção Standby ou validação
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 77fac7d7bf8..a06dc426a08 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -77,6 +77,7 @@ VolumeUnitgallon=gallão
 SizeUnitfoot=pe
 BugTracker=Incidências
 BackToLoginPage=Voltar e a página de login
+AuthenticationDoesNotAllowSendNewPassword=o modo de autentificação de Dolibarr está configurado como "<b>%s</b>".<br>neste modo Dolibarr não pode conhecer nem modificar a sua senha<br>Contacte com a sua administrador para conhecer as modalidades de alterar.
 EnableGDLibraryDesc=Instale ou ative a biblioteca GD da sua instalação PHP para usar esta opção.
 ProfIdShortDesc=<b>Prof Id %s</b> é uma informação dePendente do país do Fornecedor.<br>Por Exemplo, para o país  <b>%s</b>, é o código <b>%s</b>.
 StatsByNumberOfUnits=Estatisticas para soma das quantidades nos produtos/servicos
@@ -93,7 +94,6 @@ NumberOfUnitsSupplierOrders=Numero de unidades nos pedidos dos fornecedores
 NumberOfUnitsSupplierInvoices=Numero de unidades nas faturas dos fornecedores
 EMailTextInterventionAddedContact=Uma nova intervenção %s foi atribuída a você.
 EMailTextInterventionValidated=A intervenção %s foi validada
-EMailTextInvoiceValidated=A fatura %s foi validada.
 EMailTextProposalValidated=A proposta %s foi validada.
 EMailTextOrderValidated=O pedido %s foi validado.
 EMailTextOrderValidatedBy=A ordem %s foi gravada por %s.
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index 2bb52ffeea0..9656f370eb8 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -18,4 +18,3 @@ ProductDoesNotUseBatchSerial=Este produto não utiliza Lote / número de série
 ProductLotSetup=Configuração do módulo lote/nº de série
 ShowCurrentStockOfLot=Exibir o estoque atual para o produto/lote
 ShowLogOfMovementIfLot=Exibir o registro de movimentações para o produto/lote
-StockDetailPerBatch=Detalhes do estoque por lote
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 2a5669886cc..6d3c9f15095 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -27,9 +27,7 @@ ProductStatusOnSell=Vende-se
 ProductStatusNotOnSell=Não se vende
 ProductStatusOnSellShort=Vende-se
 ProductStatusNotOnSellShort=Não se vende
-ProductStatusOnBuy=Para compra
 ProductStatusNotOnBuy=Não para-se comprar
-ProductStatusOnBuyShort=Para compra
 ProductStatusNotOnBuyShort=Não para-se comprar
 UpdateVAT=Atualização IVA
 UpdateDefaultPrice=Atualização de preço padrão
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index be171a68ad9..35c4b80b39f 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -29,7 +29,6 @@ ShowTask=Mostrar tarefa
 NoProject=Nenhum Projeto Definido
 NbOfProjects=Nº de projetos
 TimeSpent=Dispêndio de tempo
-TimeSpentByYou=Tempo gasto por você
 TimeSpentByUser=Tempo gasto por usuário
 TimesSpent=Dispêndio de tempo
 RefTask=Ref. da tarefa
@@ -63,7 +62,6 @@ ActivityOnProjectThisYear=Atividade ao Projeto este Ano
 ChildOfProjectTask=Link do projeto/tarefa
 NotOwnerOfProject=Não é responsável deste projeto privado
 CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por muito objetos (facturas, pedidos e outros). ver a lista no separador referencias.
-ValidateProject=Validar projeto
 ConfirmValidateProject=Você tem certeza que deseja validar este projeto?
 CloseAProject=Finalizar projeto
 ConfirmCloseAProject=Você tem certeza que deseja fechar este projeto?
@@ -92,7 +90,6 @@ ProjectModifiedInDolibarr=Projeto %s modificado
 TaskCreatedInDolibarr=Tarefa %s criada
 TaskModifiedInDolibarr=Tarefa %s alterada
 TaskDeletedInDolibarr=Tarefa %s excluída
-OpportunityStatus=Estado da oportunidade
 OpportunityStatusShort=Est. da oprtnd.
 OpportunityProbability=Probabilidade da oportunidade
 OpportunityProbabilityShort=Prob. oport.
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 82ffe0d9f4d..db402e157d5 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -1,6 +1,8 @@
 # Dolibarr language file - Source file is en_US - propal
+ProposalShort=Proposta
 ProposalsOpened=Propostas comerciais abertas
 ProposalCard=Cartao de proposta
+ValidateProp=Confirmar Orçamento
 AddProp=Criar proposta
 ConfirmDeleteProp=Tem certeza que quer apagar esta proposta comercial?
 ConfirmValidateProp=Tem certeza que quer validar esta proposta comercial sob o nome <b>%s</b>?
@@ -9,12 +11,12 @@ LastModifiedProposals=Últimas %s propostas modificadas
 NoProposal=Sem propostas
 AmountOfProposalsByMonthHT=Valor por Mês (sem ICMS)
 PropalsOpened=Aberto
+PropalStatusDraft=Rascunho (a Confirmar)
 PropalStatusValidated=Validado (a proposta esta em aberto)
 PropalStatusSigned=Assinado (A Faturar)
 PropalStatusNotSigned=Sem Assinar (Encerrado)
-PropalStatusBilled=Faturado
 PropalStatusClosedShort=Encerrado
-PropalStatusBilledShort=Faturado
+PropalStatusNotSignedShort=Sem Assinar
 PropalsToClose=Orçamentos a Fechar
 PropalsToBill=Orçamentos Assinados a Faturar
 ActionsOnPropal=Ações sobre o Orçamento
@@ -35,6 +37,7 @@ ProposalLine=Linha da Proposta
 AvailabilityPeriod=Prazo de entrega
 SetAvailability=Atraso de entrega
 AfterOrder=Apos o pedido
+OtherProposals=Outros Orçamentos
 AvailabilityTypeAV_1M=1 mes
 TypeContact_propal_internal_SALESREPFOLL=Representante seguindo a proposta
 TypeContact_propal_external_BILLING=Contato da fatura cliente
diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang
index 74ecebc9e39..5c56a77c661 100644
--- a/htdocs/langs/pt_BR/salaries.lang
+++ b/htdocs/langs/pt_BR/salaries.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta da Contabilidade padrão para despesas pessoais
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta da Contabilidade padrão para pagamentos de salário
 NewSalaryPayment=Novo pagamento de salário
 SalaryPayment=Pagamento de salário
 SalariesPayments=Pagamentos de salários
diff --git a/htdocs/langs/pt_BR/stripe.lang b/htdocs/langs/pt_BR/stripe.lang
index 9beabe9d2f2..604796779a4 100644
--- a/htdocs/langs/pt_BR/stripe.lang
+++ b/htdocs/langs/pt_BR/stripe.lang
@@ -1,2 +1,18 @@
 # Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Configuração do módulo de boleto
+StripeDesc=Módulo para oferecer uma página de pagamento on-line aceitando pagamentos com cartão de crédito / débito via <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Isso pode ser usado para permitir que seus clientes façam pagamentos gratuitos ou para um pagamento em um determinado objeto Dolibarr (fatura, pedido, ...)
+StripeOrCBDoPayment=Pagar com cartão de crédito ou boleto
 STRIPE_PAYONLINE_SENDEMAIL=Endereço e-mail para aviso apos o pagamento (positivo ou nao)
+StripeDoPayment=Pagar com cartão de crédito ou débito (boleto)
+YouWillBeRedirectedOnStripe=Você será redirecionado na página de boleto protegida para inserir as informações do cartão de crédito
+SetupStripeToHavePaymentCreatedAutomatically=Configure seu boleto com url <b> %s </b> para que o pagamento seja criado automaticamente quando validado por boleto
+STRIPE_CGI_URL_V2=Url de boleto CGI módulo para pagamento
+NewStripePaymentReceived=Pagamento de novo boleto recebido
+NewStripePaymentFailed=O pagamento do novo boleto tentou, mas falhou
+STRIPE_TEST_SECRET_KEY=Senha
+STRIPE_TEST_PUBLISHABLE_KEY=Senha editável
+STRIPE_LIVE_SECRET_KEY=Chave ao vivo secreta
+STRIPE_LIVE_PUBLISHABLE_KEY=Chave editável
+StripeLiveEnabled=Boleto ativado (caso contrário teste / modo cx)
+StripeImportPayment=Importação de pagamentos de franquia
+ExampleOfTestCreditCard=Exemplo de cartão de crédito para teste: %s (válido), %s (erro CVC), %s (expirou), %s (falha na carga)
diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang
index e237907482d..85bc9ffd643 100644
--- a/htdocs/langs/pt_BR/trips.lang
+++ b/htdocs/langs/pt_BR/trips.lang
@@ -7,6 +7,9 @@ TripCard=Despesa de cartão de relatório
 AddTrip=Criar relatório de despesas
 TypeFees=Tipos de benefício
 ShowTrip=Mostrar relatório de despesas
+LastExpenseReports=Últimos relatórios de despesas %s
+AllExpenseReports=Todos os relatórios de despesas
+CompanyVisited=Empresa / Organização visitada
 FeesKilometersOrAmout=Quantidade de quilômetros
 DeleteTrip=Excluir relatório de despesas
 ConfirmDeleteTrip=Você tem certeza que deseja excluir este relatório de despesas?
@@ -14,6 +17,11 @@ ListToApprove=Esperando aprovação
 ExpensesArea=Área de relatórios de despesas
 ClassifyRefunded=Classificar 'Rembolsado'
 ExpenseReportWaitingForApproval=Um novo relatório de despesas foi apresentada para aprovação
+ExpenseReportWaitingForReApproval=Um relatório de despesas foi submetido para re-aprovação
+ExpenseReportApproved=Foi aprovado um relatório de despesas
+ExpenseReportRefused=Um relatório de despesas foi recusado
+ExpenseReportCanceled=Um relatório de despesas foi cancelado
+ExpenseReportPaid=Um relatório de despesas foi pago
 TripId=Id relatório de despesas
 TripSociete=Informações da empresa
 TripNDF=Informações relatório de despesas
@@ -23,7 +31,30 @@ TF_TRIP=Transporte
 TF_TRAIN=Trem
 TF_BUS=Ônibus
 TF_PEAGE=Pedágio
+EX_KME=Custos de quilometragem
+EX_FUE=CV de combustível
+EX_PAR=CV de estacionamento
+EX_TOL=Pedágio CV
+EX_TAX=Vários impostos
+EX_IND=Subscrição de transporte de indenização
+EX_SUM=Suprimento de manutenção
+EX_SUO=Material de escritório
+EX_CAR=Aluguel de carros
+EX_DOC=Documentação
+EX_CUR=Clientes que recebem
+EX_OTR=Outro recebimento
+EX_POS=Postagem
+EX_CAM=Manutenção e reparo do CV
+EX_EMM=Refeição dos funcionários
+EX_GUM=Refeição dos convidados
+EX_BRE=Café da manhã
+EX_FUE_VP=Combustível PV
+EX_TOL_VP=Pedágio PV
+EX_PAR_VP=Estacionamento PV
+EX_CAM_VP=Manutenção e reparo de PV
+DefaultCategoryCar=Modo de transporte padrão
 DefaultRangeNumber=Número da faixa padrão
+Error_EXPENSEREPORT_ADDON_NotDefined=Erro, a regra para a referência de numeração de relatório de despesas não foi definida na configuração do módulo 'Relatório de Despesas'
 ErrorDoubleDeclaration=Você declarou outro relatório de despesas em um intervalo de datas semelhante.
 AucuneLigne=Não há relatório de despesas declaradas ainda
 ModePaiement=Forma de pagamento
@@ -37,6 +68,7 @@ MOTIF_CANCEL=Razão
 DATE_REFUS=Negar data
 DATE_SAVE=Data de validação
 DATE_CANCEL=Data de cancelamento
+ExpenseReportRef=Ref. relatório de despesas
 ValidateAndSubmit=Validar e submeter à aprovação
 ValidatedWaitingApproval=Validado (aguardando aprovação)
 NOT_AUTHOR=Você não é o autor deste relatório de despesas. Operação cancelada.
@@ -51,5 +83,42 @@ NoTripsToExportCSV=Nenhum relatório de despesas para exportar para este períod
 ExpenseReportPayment=Despesa de pagamento de relatório
 ExpenseReportsToApprove=Relatórios de despesas a confirmar
 ExpenseReportsToPay=Relatórios de despesas a pagar
+CloneExpenseReport=Relatório de clonagem de despesas
+ConfirmCloneExpenseReport=Tem certeza de que deseja clonar este relatório de despesas?
+ExpenseReportsIk=Relatório de despesas índice quilômetros
+ExpenseReportsRules=Regras do relatório de despesas
+ExpenseReportIkDesc=Você pode modificar o cálculo da despesa de quilômetros por categoria e alcance de quem eles foram previamente definidos. <b> d </b> é a distância em quilômetros
+ExpenseReportRulesDesc=Você pode criar ou atualizar quaisquer regras de cálculo. Esta parte será usada quando o usuário criará um novo relatório de despesas
 expenseReportOffset=Compensar
+expenseReportCoef=Coeficiente
+expenseReportTotalForFive=Exemplo com <u> d </ u> = 5
+expenseReportRangeFromTo=de %d para %d
+expenseReportRangeMoreThan=mais do que %d
+expenseReportCoefUndefined=(valor não definido)
+expenseReportCatDisabled=Categoria desativada - veja o dicionário c_exp_tax_cat
+expenseReportRangeDisabled=Faixa desativada - veja a c_exp_tax_range dictionay
+expenseReportPrintExample=Compensar + (d x coef) = %s
+ExpenseReportApplyTo=Aplicar para
+ExpenseReportDomain=Domínio a ser aplicado
+ExpenseReportLimitOn=Limite de
 ExpenseReportDateStart=Data Inicio
+ExpenseReportLimitAmount=Montante limite
+ExpenseReportRestrictive=Restrito
+AllExpenseReport=Todo tipo de relatório de despesas
+OnExpense=Linha de despesas
+ExpenseReportRuleSave=Regra do relatório de despesas salvo
+ExpenseReportRuleErrorOnSave=Erro: %s
+RangeNum=Alcance %d
+ExpenseReportConstraintViolationError=ID de violação de restrição [%s]: %s é superior a %s %s
+byEX_DAY=por dia (limitação para %s)
+byEX_MON=por mês (limitação para %s)
+byEX_YEA=por ano (limitação para %s)
+byEX_EXP=por linha (limitação a %s)
+ExpenseReportConstraintViolationWarning=ID de violação de restrição [%s]: %s é superior a %s %s
+nolimitbyEX_DAY=por dia (sem limitação)
+nolimitbyEX_MON=por mês (sem limitação)
+nolimitbyEX_YEA=por ano (sem limitação)
+nolimitbyEX_EXP=por linha (sem limitação)
+CarCategory=Categoria de carro
+ExpenseRangeOffset=Quantidade de deslocamento: %s
+RangeIk=Alcance de quilometragem
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 7632d926967..a13ec59c2d3 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -4,6 +4,7 @@ UserCard=Ficha de usuário
 GroupCard=Ficha de grupo
 EditPassword=Alterar senha
 SendNewPassword=Enviar nova senha
+SendNewPasswordLink=Enviar link para redefinir senha
 ReinitPassword=Gerar nova senha
 PasswordChangedTo=Senha alterada em: %s
 SubjectNewPassword=Sua nova senha para %s
@@ -37,9 +38,10 @@ FirstName=Primeiro nome
 ListOfGroups=Lista de grupos
 NewGroup=Novo grupo
 CreateGroup=Criar grupo
-RemoveFromGroup=Remover do grupo
 PasswordChangedAndSentTo=Senha alterada e enviada a <b>%s</b>.
+PasswordChangeRequest=Pedido para alterar a senha para <b> %s </b>
 PasswordChangeRequestSent=Solicitação para alterar a senha para <b>%s</b> enviada a <b>%s</b>.
+ConfirmPasswordReset=Confirmar restauração da senha
 MenuUsersAndGroups=Usuários e Grupos
 LastGroupsCreated=Últimos %s grupos criados
 LastUsersCreated=Últimos %s usuários criados
@@ -59,8 +61,8 @@ CreateDolibarrThirdParty=Criar um fornecedor
 LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr
 ExportDataset_user_1=Usuários e Atributos
 DomainUser=Usuário de Domínio
-CreateInternalUserDesc=Este formulário permite que você crie um usuário interno para sua empresa / organização. Para criar um utilizador externo (cliente, fornecedor, ...), utilize o botão 'Criar Novo Contato' a partir da página de Terceiros > Contatos.
-InternalExternalDesc=Um usuário <b> interno </b> é um usuário que faz parte de sua empresa / organização. <br> Um usuário <b> externo </b> é um cliente, um fornecedor ou outros. <br> <br> Em ambos os casos, as permissões definem direitos no Dolibarr, também o usuário externo pode ter um gerenciador de menu diferente do usuário interno (Ver Início - Configuração - Aparência)
+CreateInternalUserDesc=Este formulário permite que você crie um usuário interno para sua empresa / organização. Para criar um usuário externo (cliente, fornecedor, ...), use o botão 'Criar usuário Dolibarr' do cartão de contato de terceiros.
+InternalExternalDesc=Um usuário <b> interno </b> é um usuário que faz parte de sua empresa / organização. <br> Um usuário <b> externo </b> é um cliente, fornecedor ou outro. <br> <br> Ambos os casos, as permissões definem os direitos no Dolibarr, também o usuário externo pode ter um gerenciador de menus diferente do usuário interno (consulte Início - Configuração - Exibição)
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário.
 UserWillBeInternalUser=Usuario criado sera um usuario interno (porque nao esta conectado a um particular terceiro)
 UserWillBeExternalUser=Usuario criado sera um usuario externo (porque esta conectado a um particular terceiro)
@@ -86,7 +88,10 @@ HierarchicView=Visão hierárquica
 UseTypeFieldToChange=Use campo Tipo para mudar
 OpenIDURL=URL do OpenID
 LoginUsingOpenID=Usar o OpenID para efetuar o login
+WeeklyHours=Horas trabalhadas (por semana)
+ExpectedWorkedHours=Horas trabalhadas esperadas por semana
 ColorUser=Cor do usuario
+UserAccountancyCode=Código de contabilidade do usuário
 UserLogoff=Usuário desconetado
 UserLogged=Usuário Conectado
 DateEmployment=Data do emprego
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index b9f69199817..3b03fc7f05e 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -2,13 +2,78 @@
 WebsiteSetupDesc=Crie aqui o numero de entradas ao website que você precisa. Depois entre no menu websites para editá-las.
 DeleteWebsite=Apagar website
 ConfirmDeleteWebsite=Você tem certeza que deseja apagar este web site. Todas as páginas e conteúdos serão removidos.
+WEBSITE_TYPE_CONTAINER=Tipo de página / recipiente
+WEBSITE_PAGE_EXAMPLE=Página da Web para usar como exemplo
 WEBSITE_PAGENAME=Nome da Página/Apelido
+WEBSITE_ALIASALT=Nomes / alias alternativos de página
 WEBSITE_CSS_URL=URL do arquivo CSS externo.
+WEBSITE_CSS_INLINE=Conteúdo do arquivo CSS (comum a todas as páginas)
+WEBSITE_JS_INLINE=Conteúdo do arquivo Javascript (comum a todas as páginas)
+WEBSITE_HTML_HEADER=Adição na parte inferior do cabeçalho HTML (comum a todas as páginas)
+WEBSITE_ROBOT=Arquivo robô (robots.txt)
+WEBSITE_HTACCESS=Arquivo do site .htaccess
+HtmlHeaderPage=Cabeçalho HTML (específico apenas para esta página)
+PageNameAliasHelp=Nome ou alias da página. Este alias também é usado para forjar um URL de SEO quando o site é executado a partir de um host virtual de um servidor Web (como o Apacke, o Nginx, ...). Use o botão "<strong> %s </ strong>" para editar este alias.
+EditTheWebSiteForACommonHeader=Nota: Se você quiser definir um cabeçalho personalizado para todas as páginas, edite o cabeçalho no nível do site em vez de na página / recipiente.
 MediaFiles=Biblioteca de mídias
+EditCss=Editar estilo / CSS ou cabeçalho HTML
+EditMedias=Editar mídias
 EditPageMeta=Editar Meta
+AddWebsite=Adicionar site
+Webpage=Página WEB / container
+AddPage=Adicionar página / recipiente
+HomePage=Pagina inicial
+PageContainer=Página / recipiente
 PreviewOfSiteNotYetAvailable=A Pré-visualização do seu website <strong>%s</strong> ainda não está disponível. Primeiro você deverá adicionar uma página.
+RequestedPageHasNoContentYet=A página solicitada com id %s ainda não possui conteúdo ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
+PageContent=Página / Contenair
+PageDeleted=Página / Contenair '%s' do site %s excluído
+PageAdded=Página / Contenair '%s' adicionado
 ViewSiteInNewTab=Visualizar site numa nova aba
 ViewPageInNewTab=Visualizar página numa nova aba
 SetAsHomePage=Definir com Página Inicial
 RealURL=URL real
 ViewWebsiteInProduction=Visualizar website usando origem URLs
+SetHereVirtualHost=Se você pode criar, no seu servidor web (Apache, Nginx, ...), um host virtual dedicado com PHP habilitado e um diretório raiz em <br> <strong> %s </ strong> <br> então entre aqui o virtual nome de host que você criou, então a pré-visualização pode ser feita também usando este acesso dedicado ao servidor web em vez de usar o servidor Dolibarr.
+YouCanAlsoTestWithPHPS=No ambiente de desenvolvimento, você pode preferir testar o site com o servidor web embutido no PHP (PHP 5.5 requisitado) executando <br> <strong> php -S 0.0.0.0:8080 -t %s </ strong>
+PreviewSiteServedByWebServer=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido por um servidor web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL servido por servidor externo: <br> <strong> %s </ strong>
+PreviewSiteServedByDolibarr=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido pelo servidor Dolibarr para que não seja necessário instalar qualquer servidor web extra (como Apache, Nginx, IIS). < br> O inconveniente é que o URL das páginas não é amigável e comece com o caminho do seu Dolibarr. URL de URL servido por Dolibarr: <br> <strong> %s </ strong> <br> <br> Para usar o seu próprio servidor web externo para servir este site, crie um host virtual em seu servidor web que aponte para o diretório <br> <strong> %s </ strong> <br> e digite o nome deste servidor virtual e clique no outro botão de visualização .
+VirtualHostUrlNotDefined=URL do host virtual veiculado pelo servidor web externo não definido
+NoPageYet=Ainda não há páginas
+SyntaxHelp=Ajuda sobre dicas de sintaxe específicas
+YouCanEditHtmlSourceckeditor=Você pode editar o código-fonte HTML usando o botão "Fonte" no editor.
+YouCanEditHtmlSource=<br> <span class = "fa fa-bug"> </ span> Você pode incluir o código PHP nesta fonte usando tags <strong> &lt;? php? a076925z0 </ strong>. As seguintes variáveis ​​globais estão disponíveis: $ conf, $ langs, $ db, $ mysoc, $ user, $ website. <br> <br> <span class = "fa fa bug"> </ span> Você também pode incluir conteúdo de outra Página / Container com a seguinte sintaxe: <br> <strong> &lt;? php includeContainer ('alias_of_container_to_include'); ? a076925z0 </ strong> <br> <br> <span class = "fa fa bug"> </ span> Você pode redirecionar para outra Página / Container com a seguinte sintaxe: <br> <strong> &lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ? &gt; </ strong> <br> <br> <span class = "fa fa-download"> </ span> Para incluir um <strong> link para baixar </ strong> um arquivo armazenado nos <strong> documentos < / strong>, use o <strong> document.php </ strong> wrapper: <br> Exemplo, para um arquivo em documentos / ecm (precisa ser logado), a sintaxe é: <br> <strong> &lt;a href = "/document.php?modulepart=ecm&file=[relative_dir/]filename.ext" a076925z0 </ strong> <br> Para um arquivo em documentos / mídias (abrir diretório para acesso público), a sintaxe é: <br> <strong> &lt;a href = "/ document.php? modulepart = medias & file = [relative_dir /] filename.ext" a076925z0 </ strong> <br> Para um arquivo compartilhado com um link compartilhado (acesso aberto usando a chave de hash de compartilhamento do arquivo), sintaxe é: <br> <strong> &lt;a href = "/ document.php? hashp = publicsharekeyoffile" a076925z0 </ strong> <br> <br> <span class = "fa fa-picture-o"> </ span> Para incluir uma imagem <strong> </ strong> armazenada no diretório <strong> documentos </ strong>, use o wrapper <strong> viewimage.php </ strong>: Exemplo, para uma imagem em documentos / mídias (acesso aberto), a sintaxe é: <br> <strong> &lt;a href = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] filename.ext" a076925z0 </ strong> <br>
+ClonePage=Página clone / container
+CloneSite=Site Clone
+SiteAdded=Site adicionado
+ConfirmClonePage=Digite o código / alias da nova página e se é uma tradução da página clonada.
+PageIsANewTranslation=A nova página é uma tradução da página atual?
+LanguageMustNotBeSameThanClonedPage=Você clona uma página como uma tradução. O idioma da nova página deve ser diferente do idioma da página de origem.
+ParentPageId=ID da página principal
+WebsiteId=ID do site
+CreateByFetchingExternalPage=Criar página / recipiente obtendo página do URL externo ...
+OrEnterPageInfoManually=Ou crie a página vazia do zero ...
+FetchAndCreate=Procure e crie
+ExportSite=Exportar site
+IDOfPage=Id da página
+Banner=Bandeira
+BlogPost=Postagem do blog
+WebsiteAccount=Conta do site
+WebsiteAccounts=Contas do site
+AddWebsiteAccount=Criar conta do site
+BackToListOfThirdParty=Voltar à lista para Terceiros
+DisableSiteFirst=Desativar o site primeiro
+MyContainerTitle=Título do meu site
+AnotherContainer=Outro recipiente
+WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar a tabela da conta do site
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas do site (login / pass) para cada site / terceira parte
+YouMustDefineTheHomePage=Você deve primeiro definir a Home page padrão
+OnlyEditionOfSourceForGrabbedContentFuture=Nota: somente uma edição da fonte HTML será possível quando um conteúdo da página for inculgado agarrando-o de uma página externa (o editor WYSIWYG não estará disponível)
+OnlyEditionOfSourceForGrabbedContent=Apenas uma edição de fonte HTML é possível quando o conteúdo foi extraído de um site externo
+GrabImagesInto=Pegue também imagens encontradas no css e na página.
+ImagesShouldBeSavedInto=As imagens devem ser salvas no diretório
+WebsiteRootOfImages=Diretório raiz para imagens do site
+SubdirOfPage=Subdiretório dedicado à página
+AliasPageAlreadyExists=Alias ​​página <strong> %s </ strong> já existe
+CorporateHomePage=Página inicial corporativa
+EmptyPage=Página vazia
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index cd5edf10cf5..b4b141da60f 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -1,6 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Área de pagamento dos pedidos com Débito direto
 SuppliersStandingOrdersArea=Área dos pedidos com pagamento por Crédito direto
+StandingOrdersPayment=Pagamento dos pedidos com Débito direto
+StandingOrderPayment=Pedido com pagamento em Débito direto
 NewStandingOrder=Novo pedido para Débito direto
 StandingOrderToProcess=A Processar
 WithdrawalsReceipts=Pedidos com Débito direto
@@ -10,16 +12,19 @@ WithdrawalsLines=Linhas do pedido para Débito direto
 RequestStandingOrderToTreat=Solicitação para processar o pagamento do pedido por Débito direto
 RequestStandingOrderTreated=Solicitação de pagamento do pedido por Débito direto processada
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar o status deve ser definido como 'creditado' antes de declarar rejeitar em linhas específicas.
+NbOfInvoiceToWithdraw=Nº da Nota Fiscal qualificada com ordem de débito direto
 NbOfInvoiceToWithdrawWithInfo=Nº da fatura do cliente com pedidos para pagamento por Débito direto com informação bancária definida
 InvoiceWaitingWithdraw=Fatura aguardando o Débito direto
 WithdrawsRefused=Débito direto recusado
+NoInvoiceToWithdraw=Nenhuma Nota Fiscal do cliente com aberto 'Ordem de débito direto' está aguardando. Vá na guia '%s' no cartão de Nota Fiscal para fazer um pedido.
 ResponsibleUser=Usuário Responsável dos Débitos Diretos
 WithdrawStatistics=Estatísticas do pagamento por Débito direto
 WithdrawRejectStatistics=Estatísticas de recusa do pagamento por Débito direto
 LastWithdrawalReceipt=Últimos %s recibos de Débito direto
 MakeWithdrawRequest=Efetuar um pedido de débito direto
+WithdrawRequestsDone=%s solicitações de pagamento de débito direto gravadas
 ThirdPartyBankCode=Código Banco do Fornecedor
-NoInvoiceCouldBeWithdrawed=Não há fatura de débito direto com sucesso. Verifique se a fatura da empresa tem um válido IBAN.
+NoInvoiceCouldBeWithdrawed=Nenhuma Nota Fiscal retirada com sucesso. Verifique se as Notas Fiscais estão em empresas com uma BAN padrão e que BAN possui um RUM com o modo <strong> %s </ strong>.
 ClassCredited=Classificar Acreditados
 ClassCreditedConfirm=Você tem certeza que querer marcar este pagamento como realizado em a sua conta bancaria?
 TransData=Data da transferência
@@ -30,16 +35,17 @@ WithdrawalRefusedConfirm=Você tem certeza que quer entrar com uma rejeição de
 RefusedInvoicing=Cobrança da rejeição
 NoInvoiceRefused=Não carregue a rejeição
 InvoiceRefused=Fatura recusada (Verificar a rejeição junto ao cliente)
+StatusDebitCredit=Status débito / crédito
 StatusWaiting=Aguardando
-StatusTrans=Enviado
 StatusRefused=Negado
-StatusMotif0=Não especificado
 StatusMotif1=Saldo insuficiente
 StatusMotif2=Solicitação contestada
 StatusMotif3=Nenhum pedido para pagamento por Débito direto
 StatusMotif4=Pedido do Cliente
-StatusMotif5=RIB inutilizável
 StatusMotif8=Outras razões
+CreateForSepaFRST=Criar arquivo de débito direto (SEPA FRST)
+CreateForSepaRCUR=Criar arquivo de débito direto (SEPA RCUR)
+CreateAll=Criar arquivo de débito direto (todos)
 CreateGuichet=Apenas do escritório
 OrderWaiting=Aguardando resolução
 NotifyTransmision=Retirada de Transmissão
@@ -53,10 +59,12 @@ IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se fatura não tem pelo m
 DoStandingOrdersBeforePayments=Esta aba lhe permite solicitar um pagamento de pedido por Débito direto. Uma vez feito, vá ao menu Banco->Pedidos com Débito Direto para gerenciar o pagamento dos pedidos com Débito direto. Quando o pagamento do pedido estiver fechado, o pagamento da fatura será automaticamente registrado, e a fatura fechada se o alerta para pagamento é nulo.
 WithdrawalFile=Arquivo Retirada
 SetToStatusSent=Defina o status "arquivo enviado"
+ThisWillAlsoAddPaymentOnInvoice=Isso também registrará pagamentos em Notas Fiscais e classificá-las como "Paga" se permanecer para pagar é nulo
 StatisticsByLineStatus=Estatísticas por situação de linhas
 RUMLong=Unique Mandate Reference (Referência Única de Mandato)
-RUMWillBeGenerated=Número UMR a ser gerado uma vez salva a informação da conta bancária
 WithdrawMode=Modo de Débito direto (FRST ou RECUR)
+WithdrawRequestAmount=Quantidade de pedido de débito direto:
+WithdrawRequestErrorNilAmount=Não foi possível criar solicitação de débito direto para quantidade vazia.
 SepaMandate=Mandato de Débito Direto SEPA
 SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Favor devolver este formulário de mandato por e-mail para %s ou por correio para
@@ -71,6 +79,8 @@ SEPAFrstOrRecur=Tipo de pagamento
 ModeRECUR=Pagamento recorrente
 ModeFRST=Pagamento único
 PleaseCheckOne=Favor marcar apenas um
+DirectDebitOrderCreated=Pedido de débito direto %s criado
+AmountRequested=Quantidade solicitada
 InfoCreditSubject=Pagamento do pedido com pagamento por Débito direto %s pelo banco
 InfoCreditMessage=O pagamento do pedido por Débito direto %s foi feito pelo banco.<br>Dados do pagamento: %s
 InfoTransSubject=Transmissão do pedido com pagamento por Débito direto %s para o banco
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 98631a08797..4a4ac0ea784 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -24,9 +24,9 @@ BackToChartofaccounts=Voltar ao plano de contas
 Chartofaccounts=Gráfico de contas
 CurrentDedicatedAccountingAccount=Conta dedicada atual
 AssignDedicatedAccountingAccount=Nova conta para atribuir
-InvoiceLabel=Etiqueta da factura
-OverviewOfAmountOfLinesNotBound=Visão geral da quantidade de linhas não vinculadas à conta contabilística
-OverviewOfAmountOfLinesBound=Visão geral da quantidade de linhas já vinculadas à conta contabilística
+InvoiceLabel=Etiqueta da fatura
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Outra informação
 DeleteCptCategory=Remover conta contabilistica do grupo
 ConfirmDeleteCptCategory=Tem a certeza que deseja remover esta conta contabilística deste grupo?
@@ -88,8 +88,8 @@ MenuLoanAccounts=Contas de empréstimo
 MenuProductsAccounts=Contas de produtos
 ProductsBinding=Contas de produtos
 Ventilation=Vinculação a contas
-CustomersVentilation=Cliente de ligação factura
-SuppliersVentilation=Fornecedor de ligação factura
+CustomersVentilation=Associação à fatura do cliente
+SuppliersVentilation=Associação à fatura do fornecedor
 ExpenseReportsVentilation=Vinculação do relatório de despesas
 CreateMvts=Criar nova transação
 UpdateMvts=Modificação de uma transação
@@ -100,8 +100,8 @@ AccountBalance=Saldo da conta
 ObjectsRef=Source object ref
 CAHTF=Total de compras em fornecedores sem impostos
 TotalExpenseReport=Relatório da despesa total
-InvoiceLines=Linhas de facturas a vincular
-InvoiceLinesDone=Linhas vinculadas de facturas
+InvoiceLines=Linhas de faturas a vincular
+InvoiceLinesDone=Linhas vinculadas de faturas
 ExpenseReportLines=Linhas de relatórios de despesas para vincular
 ExpenseReportLinesDone=Linhas vinculadas de relatórios de despesas
 IntoAccount=Vincular linha com a conta contabilística
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contabilística padrão para serviços ven
 Doctype=Tipo de documento
 Docdate=Data
 Docref=Referência
-Code_tiers=Terceiros
 LabelAccount=Etiqueta de conta
 LabelOperation=Label operation
 Sens=Sentido
@@ -169,18 +168,17 @@ DelYear=Ano a apagar
 DelJournal=Diário a apagar
 ConfirmDeleteMvt=Isto irá apagar todas as linhas do Livro Razão para o ano atual e/ou de um diário específico. Pelo menos um critério é necessário.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Eliminar entrada do Livro Razão
 FinanceJournal=Diário financeiro
 ExpenseReportsJournal=Diário de relatórios de despesas
 DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Conta para efeitos de IVA não definido
 ThirdpartyAccountNotDefined=Conta para terceiros não definido
 ProductAccountNotDefined=Conta para o produto não definido
 FeeAccountNotDefined=Conta para o honorário não definida
 BankAccountNotDefined=Conta de banco não definida
 CustomerInvoicePayment=Pagamento de fatura de cliente
-ThirdPartyAccount=Conta de terceiros
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Nova transação
 NumMvts=Número da transação
 ListeMvts=Lista de movimentos
@@ -202,11 +200,11 @@ TotalMarge=Margem total de vendas
 
 DescVentilCustomer=Consulte aqui a lista de linhas de faturas de clientes associados (ou não) a uma conta contabilística de produto
 DescVentilMore=Na maioria dos casos, se você usar produtos ou serviços predefinidos e configurar o número de conta no cartão do produto/serviço, a aplicação será capaz de efetuar toda a vinculação entre a linhas das faturas e a conta contabilística do seu gráfico de contas através de um clique no botão <strong>"%s"</strong>. Se a conta não for configurada no cartão do produto/serviço or se você tiver algumas linhas não vinculadas a uma conta, então terá de efetuar a vinculação manual a partir do menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consulte aqui a lista das linhas de facturas de clientes e as suas contas de contabilísticas de produto
+DescVentilDoneCustomer=Consulte aqui a lista das linhas de faturas de clientes e as suas contas de contabilísticas de produto
 DescVentilTodoCustomer=Vincular linhas da fatura que não estejam vinculadas a uma conta contabilística de produto
 ChangeAccount=Alterar a conta contabilística de produto/serviço para as linhas selecionadas com a seguinte conta contabilística:
 Vide=-
-DescVentilSupplier=Consulte aqui a lista de linhas fornecedor factura associado ou não, a uma conta contabilística de produto
+DescVentilSupplier=Consulte aqui a lista de linhas de faturas de fornecedor associadas ou não, a uma conta contabilística de produto
 DescVentilDoneSupplier=Consulte aqui a lista das linhas das faturas e a conta contabilística do fornecedor
 DescVentilTodoExpenseReport=Vincule as linhas do relatórios de despesas de não vinculados a um honorário de uma conta de contabilística
 DescVentilExpenseReport=Consulte aqui a lista de linhas do relatório de despesas vinculadas (ou não) a um honorário da conta contabilística
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Erro, não pode apagar esta conta contabilísti
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Cartão de vinculação
 GeneralLedgerIsWritten=As transações são escritas no Livro Razão
-GeneralLedgerSomeRecordWasNotRecorded=Algumas das transações não puderam ser gravadas. Se não existir outra mensagem de erro, então é provável que as transações já tenham sido gravadas.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta contabilística
 ChangeBinding=Alterar vinculação
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Aplicar categorias em massa
@@ -234,13 +234,15 @@ AccountingJournal=Diário contabilistico
 NewAccountingJournal=Novo diário contabilistico
 ShowAccoutingJournal=Mostrar diário contabilistico
 Nature=Natureza
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Vendas
 AccountingJournalType3=Compras
 AccountingJournalType4=Banco
 AccountingJournalType5=Relatório de despesas
+AccountingJournalType8=Inventory
 AccountingJournalType9=Contém novo
 ErrorAccountingJournalIsAlreadyUse=Este diário já está a ser utilizado
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Exportar o diário rascunho
@@ -282,6 +284,8 @@ Formula=Fórmula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Não foram efetuados alguns passos obrigatórios da configuração, por favor complete-os
 ErrorNoAccountingCategoryForThisCountry=Não existe grupo de conta contabilística disponível para o país %s (Consulte Inicio -> Configuração -> Dicionários)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=O formato de exportação configurado não é suportado nesta página
 BookeppingLineAlreayExists=Linhas já existente em contabilidade
 NoJournalDefined=Nenhum diário definido
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 39874e70b8e..f32f9c7f7a4 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -269,10 +269,10 @@ MAIN_MAIL_SMTP_SERVER=Servidor SMTP/SMTPS (Por predefinição no php.ini: <b>%s<
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta do servidor SMTP (Não definido em PHP em sistemas de tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Servidor SMTP/SMTPS (Não definido em PHP em sistemas de tipo Unix)
 MAIN_MAIL_EMAIL_FROM=Email do emissor para envios email automáticos (Por defeito em php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Remetente de email usado para emails enviados que retornaram erro
 MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono de todos os emails enviados para
 MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de emails (para fins de teste ou demonstrações)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_FORCE_SENDTO=Enviar todos os e-mails para (em vez de enviar para destinatários reais, para fins de teste)
 MAIN_MAIL_SENDMODE=Método de envio de emails
 MAIN_MAIL_SMTPS_ID=ID SMTP, se necessário a autenticação
 MAIN_MAIL_SMTPS_PW=Palavra-passe de SMTP, se necessário a autenticação
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Erro, não pode usar a opção @ para repor o cont
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode usar a opção @ se a sequência {yy}{mm} ou {yyyy}{mm} não se encontra na máscara definida.
 UMask=Parâmetro UMask de novos ficheiros em sistemas Unix/Linux/BSD/macOS.
 UMaskExplanation=Este parâmetro permite definir permissões usadas por omissão em ficheiros criados pelo Dolibarr no servidor (durante o carregamento, por exemplo).<br>Este deve ter o valor octal (por exemplo, 0666 significa permissão de leitura/escrita para todos).<br>Este parâmetro não tem nenhum efeito sobre um servidor Windows.
-SeeWikiForAllTeam=Veja o wiki para mais detalhes de todos os atores e da sua organização
+SeeWikiForAllTeam=Consulte a página wiki para obter uma lista completa de todos os atores e as suas organizações
 UseACacheDelay= Atraso, em segundos, para o caching de exportação (0 ou em branco para não criar cache)
 DisableLinkToHelpCenter=Ocultar hiperligação <b>"Precisa de ajuda ou apoio"</b> na página de inicio de sessão
 DisableLinkToHelp=Ocultar a hiperligação para a ajuda on-line "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modificar nos preços com valor de referência base defini
 MassConvert=Executar a conversão em massa
 String=Sequencia de caracteres
 TextLong=Texto longo
+HtmlText=Texto HTML
 Int=Integer
 Float=Float
 DateAndTime=Data e hora
@@ -411,14 +412,14 @@ ExtrafieldCheckBoxFromList=Caixas de marcação da tabela
 ExtrafieldLink=Vincular a um objeto
 ComputedFormula=Campo calculado
 ComputedFormulaDesc=Você pode inserir aqui uma fórmula usando outras propriedades do objeto ou qualquer codificação PHP para obter um valor calculado dinâmico. Você pode usar todas as fórmulas compatíveis com PHP, incluindo o "?" operador de condição e seguinte objeto global: <strong>$db, $conf, $langs, $mysoc, $user, $object.</strong><br><strong>AVISO</strong>: Somente algumas propriedades de $object podem estar disponíveis. Se você precisa de propriedades não carregadas, basta buscar o objeto na sua fórmula, como no segundo exemplo. <br>Usando um campo calculado significa que você não pode entrar qualquer valor da interface. Além disso, se houver um erro de sintaxe, a fórmula pode retornar nada.<br><br> Exemplo de fórmula: <br>$object-> id <10? round ($object-> id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr($mysoc-> zip, 1, 2) <br><br>Exemplo para recarregar o objeto <br>(($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch($obj-> id? $obj-> id: ($obj-> rowid? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Outro exemplo de fórmula para forçar a carga do objeto e seu objeto pai:<br> (($reloadedobj = new Task ($db)) && ($reloadedobj->fetch ($object-> id)> 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj-> fetch($reloadedobj->fk_project)> 0)) ? $secondloadedobj->ref: 'Projeto pai não encontrado'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=A lista de parâmetros tem seguir o seguinte esquema chave,valor (no qual a chave não pode ser '0')<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para que a lista dependa noutra lista de atributos complementares:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para que a lista dependa doutra lista:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=Lista dos valores da tabela <br>sintaxe : table_name:label_field:id_field::filter <br>Exemplo : c_typent:libelle:id::filter <br><br>-idfilter é necessariamente uma chave primaria enteira <br>-filter (filtro) é um simples teste (ex active=1) para mostrar somente os valores activos <br>tem somente de usar $ID$ no filtro como corente id do objecto<br> Para fazer um SELECT no filtro use $SEL$<br> se quizer um filtro com extrafields use a sintax extra.fiedlcode=... (donde field code é o codigo do extrafield) <br><br>Para que a lista dependa de outra lista de atributos complementares: <br>c_typent:libelle:id:options_ <i>parent_list_code</i> |parent_column:filter <br><br>Para ter a lista dependendo de outra lista: <br>c_typent:libelle:id: <i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelpchkbxlst=Lista dos valores da tabela <br>sintaxe :  table_name:label_field:id_field::filter <br>Exemplo : c_typent:libelle:id::filter <br><br>filter (filtro) é um simples teste (ex active=1) para mostrar somente os valores activos <br>tem somente de usar $ID$ no filtro como corente id do objecto <br>Para fazer um SELECT no filtro use $SEL$ <br>se quizer um filtro com extrafields use a sintax extra.fiedlcode=... (donde field code é o codigo do extrafield) <br><br>Para que a lista dependa de outra lista de atributos complementares: <br>c_typent:libelle:id:options_ <i>parent_list_code </i>|parent_column:filter <br><br>Para ter a lista dependendo de outra lista: <br>c_typent:libelle:id: <i>parent_list_code </i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName:Classpath<br>Sintaxe: ObjectName:Classpath<br>Exemplos:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Biblioteca utilizada para gerar PDF
-WarningUsingFPDF=Aviso: O seu ficheiro <b>conf.php</b> contém a diretiva <b>dolibarr_pdf_force_fpdf=1</b>. Isto significa que utiliza a biblioteca FPDF para gerar ficheiros PDF. Esta biblioteca está desatualizada e não suporta muitas funcionalidades (Unicode, transparência de imagens, línguas asiáticas, árabes ou cirílicas, ...), por isso você pode experienciar alguns erros durante a produção de PDFs.<br>Para resolver isto e para ter suporte completo para produção de PDF, por favor descarregue a biblioteca <a href="http://www.tcpdf.org/" target="_blank">TCPDF</a>, comente ou remova a linha <b>$dolibarr_pdf_force_fpdf=1</b>, e adicione <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Alguns países aplicam 2 ou 3 impostos para cada linha da fatura. Se é este o caso, escolha o tipo para o segundo e terceiro imposto e a sua taxa. Os tipos possíveis são:<br>1 : imposto local aplicado em produtos e serviços sem IVA (imposto local é calculado sobre o total sem IVA)<br>2 : imposto local aplicado em produtos e serviços incluindo IVA (imposto local é calculado sobre o total + IVA)<br>3 : imposto local aplicado em produtos sem IVA (imposto local é calculado sobre o total sem IVA)<br>4 : imposto local aplicado em produtos incluindo IVA (imposto local é calculado sobre o total + IVA)<br>5 : imposto local aplicado em serviços sem IVA (imposto local é calculado sobre o total sem IVA)<br>6 : imposto local aplicado em serviços incluindo IVA (imposto local é calculado sobre o total + IVA)
 SMS=SMS
 LinkToTestClickToDial=Introduzida o número de telefone a ligar, de forma mostra um link para testar o ClickToDial para o utilizador <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Retornar um código de contabilidade vazio.
 ModuleCompanyCodeDigitaria=O código de contabilidade depende do código de terceiros. O código é composto pelo caractere "C" na primeira posição seguida pelos primeiros 5 caracteres do código de terceiros.
 Use3StepsApproval=Por padrão, as ordens de compra precisam ser criadas e aprovadas por 2 usuários diferentes (um passo / usuário para criar e um passo / usuário para aprovar. Note que, se o usuário tiver permissão para criar e aprovar, um passo / usuário será suficiente) . Você pode solicitar esta opção para introduzir uma terceira etapa / aprovação do usuário, se o valor for superior a um valor dedicado (então serão necessárias 3 etapas: 1 = validação, 2 = primeira aprovação e 3 = segunda aprovação se a quantidade for suficiente). 1 <br>Defina isto como vazio se uma aprovação (2 etapas) for suficiente, ajuste-o para um valor muito baixo (0,1) se uma segunda aprovação (3 etapas) for sempre necessária.
 UseDoubleApproval=Utilizar uma aprovação de 3 etapas quando o valor (sem impostos) for superior a...
-WarningPHPMail=AVISO: alguns provedores de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor que o servidor Yahoo se o endereço de e-mail usado como remetente é seu e-mail do Yahoo (como myemail@yahoo.com, myemail@yahoo.fr, ...). A sua configuração atual usa o servidor do aplicativo para enviar e-mail, de modo que alguns destinatários (o compatível com o protocolo DMARC restritivo) perguntarão ao Yahoo se eles podem aceitar seu e-mail e o Yahoo responderá "não" porque o servidor não é um servidor Propriedade do Yahoo, então poucos de seus e-mails enviados podem não ser aceitos.<br> Se o seu provedor de e-mail (como o Yahoo) tiver essa restrição, você deve alterar a configuração de e-mail para escolher o outro método "Servidor SMTP" e digitar o servidor SMTP e as credenciais fornecidas por seu provedor de e-mail (peça ao seu provedor de E-mail para obter credenciais SMTP para sua conta).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Clique para mostrar a descrição
 DependsOn=Este módulo depende do(s) módulo(s)
 RequiredBy=Este módulo é necessário para o(s) módulo(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Marca d'água nos rascunhos de relatórios de des
 AttachMainDocByDefault=Defina isto como 1 se desejar anexar o documento principal ao email por defeito (se aplicável)
 FilesAttachedToEmail=Anexar ficheiro
 SendEmailsReminders=Envie lembretes da agenda por e-mails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Utilizadores e grupos
 Module0Desc=Gestão de Utilizadores / Funcionários e Grupos
@@ -489,7 +492,7 @@ Module30Name=Faturas
 Module30Desc=Gestão de faturas e notas de crédito de clientes. Gestão de faturas de fornecedores
 Module40Name=Fornecedores
 Module40Desc=Gestão de fornecedores (encomendas e faturas)
-Module42Name=Debug Logs
+Module42Name=Registos Debug
 Module42Desc=Funções de registo de eventos (ficheiro, registo do sistema, ...). Tais registos, são para fins técnicos/depuração.
 Module49Name=Editores
 Module49Desc=Gestão de editores
@@ -507,8 +510,8 @@ Module55Name=Códigos de barras
 Module55Desc=Gestão dos códigos de barras
 Module56Name=Central telefónica
 Module56Desc=Gestão de central telefónica
-Module57Name=Ordens de pagamento por transferência bancária
-Module57Desc=Gestão de order de pagamento por débito direto. Inclui a produção de ficheiros SEPA para países europeus.
+Module57Name=Ordens de pagamento por débito direto
+Module57Desc=Gestão de ordens de pagamento por débito direto. Inclui a produção de ficheiros SEPA para países europeus.
 Module58Name=ClickToDial
 Module58Desc=Integração com um sistema ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -540,13 +543,13 @@ Module320Desc=Adicionar feed RSS às páginas Dolibarr
 Module330Name=Marcadores
 Module330Desc=Gestão de marcadores
 Module400Name=Projetos/Oportunidades/Leads
-Module400Desc=Gestão de projetos, oportunidades/leads e/ou tarefas. Você também pode atribuir qualquer elemento (fatura, ordem, proposta, intervenção, ...) a um projeto e obter uma visão transversal do projeto.
+Module400Desc=Gestão de projetos, oportunidades/leads e/ou tarefas. Você também pode atribuir qualquer elemento (fatura, encomenda, orçamento, intervenção, ...) a um projeto e obter uma visão transversal do projeto.
 Module410Name=Webcalendar
 Module410Desc=Integração com Webcalendar
 Module500Name=Despesas especiais
 Module500Desc=Gestão de despesas especiais (impostos, impostos sociais ou ficais, dividendos)
-Module510Name=Pagamento dos ordenados do funcionário
-Module510Desc=Registe o seguinte pagamento dos ordenados do seu funcionário
+Module510Name=Pagamento dos salários dos empregados
+Module510Desc=Registe e dê seguimento aos pagamentos dos salários dos seus funcionários
 Module520Name=Empréstimo
 Module520Desc=Gestão de empréstimos
 Module600Name=Notificações sobre eventos comerciais
@@ -568,7 +571,7 @@ Module1780Name=Etiquetas/Categorias
 Module1780Desc=Criar etiquetas/categoria (produtos, clientes, fornecedores, contactos ou membros)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permitir a edição de texto utilizando um editor avançado (baseado no CKEditor)
-Module2200Name=Preços dinamicos
+Module2200Name=Preços dinâmicos
 Module2200Desc=Permitir a utilização de expressões matemáticas para os preços
 Module2300Name=Tarefas agendadas
 Module2300Desc=Gestão de trabalhos agendados (alias cron ou tabela chrono)
@@ -589,8 +592,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidades de conversões GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Adicionar um botão Skype nas fichas dos usuários/terceiros/contactos/membros
-Module3200Name=Unalterable Archives
-Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
+Module3200Name=Arquivos inalteráveis
+Module3200Desc=Ativar o registo de alguns eventos em registos inalteráveis. Os eventos são arquivados em tempo real. O registo é uma tabela de eventos encadeados que podem ser lidos somente e exportados. Este módulo pode ser obrigatório para alguns países.
 Module4000Name=GRH
 Module4000Desc=Gestão de recursos humanos (gestão de departamento e contratos de funcionários)
 Module5000Name=Multiempresa
@@ -619,6 +622,8 @@ Module59000Name=Margens
 Module59000Desc=Módulo para gerir margens
 Module60000Name=Comissões
 Module60000Desc=Módulo para gerir comissões
+Module62000Name=Incoterm
+Module62000Desc=Adione funções para gerir Incoterm
 Module63000Name=Recursos
 Module63000Desc=Gerir recursos (impressoras, carros, ...) que pode partilhar em eventos
 Permission11=Consultar faturas de clientes
@@ -833,11 +838,11 @@ Permission1251=Executar importações em massa de dados externos para a bases de
 Permission1321=Exportar faturas, atributos e cobranças de clientes
 Permission1322=Reabrir uma fatura paga
 Permission1421=Exportar faturas e atributos de clientes
-Permission20001=Consultar pedidos de licença (seu e dos seus subordinados)
-Permission20002=Criar/Modificar os seus pedidos de licença
+Permission20001=Consultar pedidos de licença (seus e dos seus subordinados)
+Permission20002=Criar/modificar pedidos de licença (seus e dos seus subordinados)
 Permission20003=Eliminar pedidos de licença
-Permission20004=Consultar todos os pedidos de licença (seus e dos seus subordinados)
-Permission20005=Criar/Modificar todos os pedidos de licenças
+Permission20004=Consultar todos os pedidos de licença (incluindo os dos utilizadores não são seus subordinados)
+Permission20005=Criar/modificar pedidos de licença de todos (incluindo os dos utilizadores não são seus subordinados)
 Permission20006=Pedidos de licenças do administrador (configuração e atualização do balanço)
 Permission23001=Consultar trabalho agendado
 Permission23002=Criar/atualizar trabalho agendado
@@ -849,7 +854,7 @@ Permission2403=Consultar ações (eventos ou tarefas) vinculadas à conta dele
 Permission2411=Consultar ações (eventos ou tarefas) de outros
 Permission2412=Criar/modificar ações (eventos ou tarefas) de outros
 Permission2413=Eliminar ações (eventos ou tarefas) de outros
-Permission2414=Exportar ações/taregas de outros
+Permission2414=Exportar ações/tarefas de outros
 Permission2501=Consultar/descarregar documentos
 Permission2502=Descarregar documentos
 Permission2503=Submeter ou eliminar documentos
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Quantidade de sêlos fiscais
 DictionaryPaymentConditions=Condições de pagamento
 DictionaryPaymentModes=Métodos de pagamento
 DictionaryTypeContact=Tipos de contacto/endereço
+DictionaryTypeOfContainer=Tipo de páginas/conteúdos do site
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formatos de Papel
 DictionaryFormatCards=Formatos das fichas
@@ -907,12 +913,12 @@ SetupSaved=Configuração guardada
 SetupNotSaved=A configuração não foi guardada
 BackToModuleList=Voltar à lista de módulos
 BackToDictionaryList=Voltar à lista de dicionários
-TypeOfRevenueStamp=Type of revenue stamp
+TypeOfRevenueStamp=Tipo de selo fiscal
 VATManagement=Gestão de IVA
 VATIsUsedDesc=Por defeito, quando prospeções; faturas; encomendas; etc. são criadas, a taxa de IVA segue a seguinte regra:<br>Se o vendedor não estiver sujeito a IVA, então este é igual a 0. Fim da regra.<br>Se o país de venda for igual ao país de compra, então o valor do IVA passa a ser o aplicado no país de venda. Fim da regra.<br>Se o vendedor e o comprador fizerem parte da União Europeia e os bens forem produtos de transporte (carro, navio, avião), o IVA é 0 (o IVA deverá ser pago pelo comprador à alfândega do seu país, e não ao vendedor). Fim da regra.<br>Se o vendedor e o comprador fizerem parte da União Europeia e o comprador não for uma empresa, então o IVA é igual ao IVA aplicado no produto vendido. Fim da regra.<br>Se o vendedor e o comprador fizerem parte da União Europeia e o comprador for uma empresa, então o IVA é igual a 0. Fim da regra.<br>Noutros casos o IVA por defeito é igual a 0. Fim da regra.
 VATIsNotUsedDesc=O tipo de IVA proposto por defeito é 0, este pode ser usado em casos como associações, indivíduos ou pequenas empresas.
-VATIsUsedExampleFR=Em França, trata-se de sociedades ou organismos que elegem um regime fiscal general (Geral simplificado ou Geral normal), regime ao qual se declara o IVA.
-VATIsNotUsedExampleFR=Em França, trata-se de associações ou sociedades isentas de IVA, organismos ou profissionais liberais que escolheram o regime fiscal de módulos (IVA em franquia) e pagaram um IVA em franquia sem fazer declarações de IVA. Esta escolha faz com apareça a anotação "IVA não aplicável" nas faturas.
+VATIsUsedExampleFR=Em França, trata-se de empresas ou organizações que possuem um sistema fiscal real (real simplificado ou real normal). Um sistema no qual se declara o IVA.
+VATIsNotUsedExampleFR=Em França, trata-se de associações isentas de IVA, ou, empresas, organizações ou profissões liberais que escolheram o regime fiscal de módulos (IVA em franquia) e pagaram um IVA em franquia sem fazer declarações de IVA. Esta escolha faz com apareça a anotação "IVA não aplicável" nas faturas.
 ##### Local Taxes #####
 LTRate=Taxa
 LocalTax1IsNotUsed=Não utilizar um segundo imposto
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
 SystemAreaForAdminOnly=Esta área só é acessível aos utilizadores administradores. Nenhuma permissão do Dolibarr permite reduzir esta limitação.
 CompanyFundationDesc=Nesta página modifique toda a informação relacionada com a empresa ou fundação que você gere (para isso, clique em no botão "Modificar" ou "Guardar" no fim da página)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Pode encontrar aqui todos os parâmetros relacionados com a aparência do Dolibarr
 AvailableModules=Aplicações/módulos disponíveis
 ToActivateModule=Para ativar módulos, aceder à área de configuração (Configuração->Módulos).
@@ -1205,7 +1212,7 @@ BillsPDFModules=Modelo de documentos de faturas
 PaymentsPDFModules=Modelos de documentos de pagamento
 CreditNote=Nota de crédito
 CreditNotes=Notas de crédito
-ForceInvoiceDate=Forçar a data de factura para a data de validação
+ForceInvoiceDate=Forçar a data de fatura para a data de validação
 SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento sugeridas para faturas por defeito, se não estiverem definidas explicitamente
 SuggestPaymentByRIBOnAccount=Sugerir o pagamento por levantamento na conta
 SuggestPaymentByChequeToAddress=Sugerir o pagamento por cheque a
@@ -1441,6 +1448,9 @@ SyslogFilename=Nome e caminho do ficheiro
 YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para um ficheiro log no diretório de "documentos" do Dolibarr.
 ErrorUnknownSyslogConstant=A constante %s não é uma constante Syslog conhecida
 OnlyWindowsLOG_USER=O Windows apenas suporta LOG_USER
+CompressSyslogs=Compressão e backup de ficheiros syslog
+SyslogFileNumberOfSaves=Backups de registos
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Configuração do módulo "Donativos"
 DonationsReceiptModel=Modelo de recibo de donativo
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Falha ao inicializar o menu
 ##### Tax #####
 TaxSetup=Configuração do módulo "Impostos, impostos sociais ou fiscais e dividendos"
 OptionVatMode=Aplicação do IVA
-OptionVATDefault=Regime de caixa
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Regime de competência
 OptionVatDefaultDesc=O IVA é aplicado:<br>- ao envio dos bens (é utilizada a data da fatura)<br>- sobre o pagamento dos serviços
 OptionVatDebitOptionDesc=O IVA é aplicado:<br>- ao envio dos bens (é utilizada a data da fatura)<br>- sobre a faturação (débito) dos serviços
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=IVA é devido: <br> - em pagamento de mercadorias <br>- em pagamentos de serviços
 SummaryOfVatExigibilityUsedByDefault=Tempo de exigibilidade do IVA prédefinido, de acordo com a opção escolhida:
 OnDelivery=Na entrega
 OnPayment=No pagamento
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Data da fatura usada
 Buy=Comprar
 Sell=Vender
 InvoiceDateUsed=Data da fatura usada
-YourCompanyDoesNotUseVAT=Sua empresa não tem configuração definida para usar o IVA (Home - Configuração - Empresa/Organização), pelo que não há opções de configuração do IVA.
+YourCompanyDoesNotUseVAT=Sua empresa foi configurada para não usar o IVA (Home - Configuração - Empresa/Organização), pelo que não há opções relacionadas com o IVA a configurar.
 AccountancyCode=Código de Contabilidade
 AccountancyCodeSell=Código de contabilidade de vendas
 AccountancyCodeBuy=Código de contabilidade de compras
@@ -1718,6 +1730,7 @@ MailToSendContract=Para enviar um contrato
 MailToThirdparty=Para enviar e-mail a partir da página dos terceiros
 MailToMember=Para enviar e-mails da página do membro
 MailToUser=Para enviar emails da página de usuário
+MailToProject= To send email from project page
 ByDefaultInList=Mostrar por padrão na vista de lista
 YouUseLastStableVersion=Você possui a última versão estável
 TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta versão principal (sinta-se livre para usá-la nas suas páginas da Internet)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Margem esquerda do PDF
 MAIN_PDF_MARGIN_RIGHT=Margem direita do PDF
 MAIN_PDF_MARGIN_TOP=Margem superior do PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior do PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Várias variantes de idiomas encontradas
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuração do módulo Recursos
 UseSearchToSelectResource=Utilizar um formulário de pesquisa para escolher um recurso (em vez de uma lista)
-DisabledResourceLinkUser=Desativar o link do recurso para o utilizador
-DisabledResourceLinkContact=Desativar o link do recurso para o contacto
+DisabledResourceLinkUser=Desativar funcionalidade que permite vincular um recurso aos utilizadores
+DisabledResourceLinkContact=Desativar funcionalidade que permite vincular um recurso aos contactos
 ConfirmUnactivation=Confirmar restauração do módulo
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 26276850041..dfab731a37c 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -43,7 +43,7 @@ PropalClosedSignedInDolibarr=Orçamento %s, assinado
 PropalClosedRefusedInDolibarr=Orçamento %s, recusado
 PropalValidatedInDolibarr=Orçamento %s, validado
 PropalClassifiedBilledInDolibarr=Orçamento %s, classificado como faturado
-InvoiceValidatedInDolibarr=Factura %s, validada
+InvoiceValidatedInDolibarr=Fatura %s, validada
 InvoiceValidatedInDolibarrFromPos=Fatura %s, validada a partir do ponto de venda
 InvoiceBackToDraftInDolibarr=Fatura %s, voltou ao estado de rascunho
 InvoiceDeleteDolibarr=Fatura %s, apagada
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Membro %s, validado
 MemberModifiedInDolibarr=Membro %s modificado
 MemberResiliatedInDolibarr=Membro %s, terminado
 MemberDeletedInDolibarr=Membro %s, eliminado
-MemberSubscriptionAddedInDolibarr=Subscrição do membro %s, adicionada
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Expedição %s, validada
 ShipmentClassifyClosedInDolibarr=Expedição %s, classificada como faturada
 ShipmentUnClassifyCloseddInDolibarr=Expedição %s, classificada como re-aberta
@@ -82,7 +84,7 @@ PRODUCT_CREATEInDolibarr=O produto %s foi criado
 PRODUCT_MODIFYInDolibarr=O produto %s foi modificado
 PRODUCT_DELETEInDolibarr=O produto %s foi eliminado
 EXPENSE_REPORT_CREATEInDolibarr=Relatório de despesas %s, criado
-EXPENSE_REPORT_VALIDATEInDolibarr=Relatório de despesas %s, validade
+EXPENSE_REPORT_VALIDATEInDolibarr=Relatório de despesas %s, validado
 EXPENSE_REPORT_APPROVEInDolibarr=Relatório de despesas %s, aprovado
 EXPENSE_REPORT_DELETEInDolibarr=Relatório de despesas %s, eliminado
 EXPENSE_REPORT_REFUSEDInDolibarr=Relatório de despesas %s, recusado
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Também pode adicionar os seguintes parâmetros de filtro de s
 AgendaUrlOptions3=<b>logina=%s</b> para restringir a produção para as acções criadas pelo utilizador <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina =!%s</b> para restringir a saída às ações que não pertencem ao utilizador <b>%s</b>.
 AgendaUrlOptions4=<b>logint =%s</b> para restringir a saída às ações atribuídas ao utilizador <b>%s</b> (proprietário e outros).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir a produção para as acções associadas ao projeto <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Mostrar aniversários dos contactos
 AgendaHideBirthdayEvents=Ocultar aniversários dos contactos
 Busy=Ocupado
@@ -109,7 +112,7 @@ ExportCal=Exportar calendário
 ExtSites=Importar calendários externos
 ExtSitesEnableThisTool=Mostrar calendários externos (definidos na configuração global) na agenda. Não afeta os calendários externos definidos pelos utilizadores.
 ExtSitesNbOfAgenda=Número de calendários
-AgendaExtNb=Calendário nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL para aceder ao ficheiro .ical
 ExtSiteNoLabel=Sem Descrição
 VisibleTimeRange=Intervalo de tempo visível
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 2462d79b52a..7ec0b128d7e 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -7,6 +7,7 @@ BankName=Nome do banco
 FinancialAccount=Conta
 BankAccount=Conta bancária
 BankAccounts=Contas Bancárias
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Mostrar Conta
 AccountRef=Ref. Conta financeira
 AccountLabel=Etiqueta Conta financeira
@@ -28,8 +29,8 @@ ShowAllTimeBalance=Mostrar Balanço Desde o Início
 AllTime=Do início
 Reconciliation=Conciliação
 RIB=Conta bancária
-IBAN=Identificador IBAN
-BIC=Identificador BIC/SWIFT
+IBAN=Número IBAN
+BIC=Número BIC/SWIFT
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -83,8 +84,8 @@ AccountToDebit=Conta de débito
 DisableConciliation=Desactivar a função de Conciliação para esta Conta
 ConciliationDisabled=Função de Conciliação desactivada
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Abrir
-StatusAccountClosed=Fechada
+StatusAccountOpened=Ativo
+StatusAccountClosed=Inativo
 AccountIdShort=Número
 LineRecord=Registo
 AddBankRecord=Adicionar entrada
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 740d54aac6f..718a93ca916 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -27,12 +27,12 @@ InvoiceReplacement=Fatura de Substituição
 InvoiceReplacementAsk=Fatura de Substituição para a Fatura
 InvoiceReplacementDesc=A <b>Fatura de Substituição</b> é utilizada para cancelar e substituir completamente uma fatura sem ter sido recebido o pagamento. <br><br> Nota: apenas as faturas sem pagamento podem ser substituídas. Se a fatura de substituição ainda não estiver fechada, esta será automaticamente fechada para "abandonada".
 InvoiceAvoir=Nota de Crédito
-InvoiceAvoirAsk=Nota de Crédito para Corrigir a Factura
-InvoiceAvoirDesc=A <b>Nota de Crédito</b> é uma factura negativa destinada a compensar um montante de uma factura que difere do montante realmente pago (por haver pago de mais ou por devolução de produtos, por Exemplo).<br><br>Nota: Tenha em conta que a factura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito.'
+InvoiceAvoirAsk=Nota de crédito para corrigir a fatura
+InvoiceAvoirDesc=A <b>Nota de Crédito</b> é uma fatura negativa destinada a compensar um montante de uma fatura que difere do montante realmente pago (por haver pago de mais ou por devolução de produtos, por Exemplo).<br><br>Nota: Tenha em conta que a fatura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito.'
 invoiceAvoirWithLines=Criar Nota de Crédito com as linhas da fatura de origem
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
-ReplaceInvoice=Retificar Factura %s
+ReplaceInvoice=Retificar fatura %s
 ReplacementInvoice=Fatura de Substituição
 ReplacedByInvoice=Substituída pela Fatura %s
 ReplacementByInvoice=Substituído pela Fatura
@@ -45,11 +45,11 @@ NoReplacableInvoice=Sem Faturas Retificáveis
 NoInvoiceToCorrect=Nenhuma Fatura para corrigir
 InvoiceHasAvoir=Was source of one or several credit notes
 CardBill=Ficha da Fatura
-PredefinedInvoices=Factura Predefinida
-Invoice=Factura
+PredefinedInvoices=Faturas predefinidas
+Invoice=Fatura
 PdfInvoiceTitle=Fatura
 Invoices=Faturas
-InvoiceLine=Linha de Factura
+InvoiceLine=Linha da fatura
 InvoiceCustomer=Fatura de Cliente
 CustomerInvoice=Fatura de Cliente
 CustomersInvoices=Faturas de Clientes
@@ -67,6 +67,7 @@ PaidBack=Reembolsada
 DeletePayment=Eliminar pagamento
 ConfirmDeletePayment=Tem a certeza que deseja eliminar este pagamento?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Pagamentos a Fornecedores
 ReceivedPayments=Pagamentos recebidos
 ReceivedCustomersPayments=Pagamentos recebidos dos clientes
@@ -90,41 +91,42 @@ PaymentConditionsShort=Condições de Pagamento
 PaymentAmount=Montante a Pagar
 ValidatePayment=Validar pagamento
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a pagar
-HelpPaymentHigherThanReminderToPay=Atenção, o montante do pagamento de uma ou mais letras é maior do que o resto a pagar. <br> Edite sua entrada, caso contrário, confirmar e pensar sobre como criar uma nota de crédito do excesso recebido para cada factura paga em excesso.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPay=Atenção, o montante do pagamento de uma ou mais letras é maior do que o resto a pagar. <br> Edite sua entrada, caso contrário, confirmar e pensar sobre como criar uma nota de crédito do excesso recebido para cada fatura paga em excesso.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classificar como 'Pago'
 ClassifyPaidPartially=Classificar como 'Pago Parcialmente'
 ClassifyCanceled=Classificar como 'Abandonado'
 ClassifyClosed=Classificar como 'Fechado'
 ClassifyUnBilled=Classificar como 'Não faturado'
-CreateBill=Criar Factura
+CreateBill=Criar fatura
 CreateCreditNote=Criar nota de crédito
-AddBill=Criar Factura ou Nota de Crédito
+AddBill=Criar fatura ou nota de crédito
 AddToDraftInvoices=Adicionar à fatura rascunho
-DeleteBill=Eliminar Factura
+DeleteBill=Eliminar fatura
 SearchACustomerInvoice=Procurar por uma fatura de cliente
-SearchASupplierInvoice=Procurar por uma factura de fornecedor
-CancelBill=Anular uma Factura
+SearchASupplierInvoice=Pesquisar uma fatura de fornecedor
+CancelBill=Cancelar uma fatura
 SendRemindByMail=Enviar lembrete por E-mail
 DoPayment=Inserir pagamento
 DoPaymentBack=Inserir reembolso
 ConvertToReduc=Converter em desconto futuro
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento de recibos à cliente
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=preço base
-BillStatus=Estado da factura
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=rascunho (a Confirmar)
+BillStatus=Estado da fatura
+StatusOfGeneratedInvoices=Estado das faturas geradas
+BillStatusDraft=Rascunho (precisa de ser validado)
 BillStatusPaid=Paga
 BillStatusPaidBackOrConverted=Reembolso por nota de crédito ou convertido em desconto
-BillStatusConverted=Converter em Desconto
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandonada
-BillStatusValidated=Validada (a pagar)
+BillStatusValidated=Validado (precisa de ser paga)
 BillStatusStarted=Iniciada
 BillStatusNotPaid=Pendente de pagamento
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Não reembolsado
 BillStatusClosedUnpaid=Fechada (Pendente de pagamento)
 BillStatusClosedPaidPartially=Paga (parcialmente)
 BillShortStatusDraft=Rascunho
@@ -135,28 +137,28 @@ BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
 BillShortStatusStarted=Iniciada
 BillShortStatusNotPaid=Pendente de cobrança
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Não reembolsado
 BillShortStatusClosedUnpaid=Fechada por pagar
 BillShortStatusClosedPaidPartially=Paga (parcialmente)
-PaymentStatusToValidShort=A Confirmar
+PaymentStatusToValidShort=Por validar
 ErrorVATIntraNotConfigured=Número de IVA intracomunitário ainda não configurado
-ErrorNoPaiementModeConfigured=Não existe definido modo de pagamento por defeito.Corrigir este módulo factura
-ErrorCreateBankAccount=Criar uma conta bancária e em seguida, vá para configuração do painel do modulo de factura para definir modos de pagamento
-ErrorBillNotFound=Factura %s inexistente
-ErrorInvoiceAlreadyReplaced=Erro, quer confirmar uma factura que rectifica a factura %s. Mas esta última já está rectificada por a factura %s.
+ErrorNoPaiementModeConfigured=Nenhum modo de pagamento predefinido. Vá à página de configuração do módulo Fatura para corrigir.
+ErrorCreateBankAccount=Criar uma conta bancária e em seguida, vá para configuração do painel do modulo de fatura para definir métodos de pagamento
+ErrorBillNotFound=Fatura %s inexistente
+ErrorInvoiceAlreadyReplaced=Erro, está a tentar validar uma fatura que retifica a fatura %s. Mas esta última já se encontra retificada pela fatura %s.
 ErrorDiscountAlreadyUsed=Erro, a remessa está já assignada
-ErrorInvoiceAvoirMustBeNegative=Erro, uma factura de tipo deposito deve ter um Montante negativo
-ErrorInvoiceOfThisTypeMustBePositive=Erro, uma factura deste tipo deve ter um Montante positivo
-ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma factura que tenha sido substituída por uma outra factura e que está ainda em projecto de estatuto
+ErrorInvoiceAvoirMustBeNegative=Erro, uma fatura deste tipo deve ter um montante negativo
+ErrorInvoiceOfThisTypeMustBePositive=Erro, uma fatura deste tipo deve ter um montante positivo
+ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fatura que tenha sido substituída por uma outra fatura e que se encontra ainda em rascunho
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
 BillFrom=Emissor
 BillTo=Enviar a
-ActionsOnBill=Acções sobre a factura
+ActionsOnBill=Ações sobre a fatura
 RecurringInvoiceTemplate=Template / Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
-NewBill=Nova factura
+NewBill=Nova fatura
 LastBills=Últimas %s faturas
 LatestTemplateInvoices=Latest %s template invoices
 LatestCustomerTemplateInvoices=Latest %s customer template invoices
@@ -185,27 +187,27 @@ ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente devedor
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos devolvidos em parte
 ConfirmClassifyPaidPartiallyReasonOther=Por outra Razão
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Esta eleição é possível sem a sua factura se fornecer da menção adequada. (Exemplo: "Desconto neto de Impostos")
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Esta eleição é possível sem a sua factura se fornecer da menção adequada. (Exemplo: menção por a que se define o Desconto o da classe "somente o imposto que corresponde ao preço efectivamente pago causa Direito a dedução")
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Essa opção é possível se sua fatura contenha comentários adequados. (Exemplo: "Somente o imposto correspondente ao preço efetivamente pago dá direito à dedução")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Em alguns países, esta opção pode ser possível somente se a fatura conter a nota correta.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Esta eleição é a eleição que deve tomar-se sem as Outras não são aplicáveis
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=um <b>cliente devedor</b> é um cliente que não quer regularizar a sua divida.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta eleição é possível se o caso de pagamento incompleto é a raiz de uma devolução de parte dos produtos
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta eleição será possível, por exemplo, nos casos seguinte:<br>-pagamento parcial já que uma rubrica de produtos foi devolvido.<br>- reclamado por não entregar produtos da factura <br>em todos os casos, a reclamação deve regularizar-se mediante um deposito
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use esta opção se qualquer outra opção não se adequar, por exemplo, na seguinte situação: <br> - o pagamento não foi concluído porque alguns produtos foram enviados de volta <br> - montante reivindicado é muito importante porque um desconto foi esquecido <br> Em todos os casos, quantidade sobre-reivindicada deve ser corrigida no sistema de contabilidade criando uma nota de crédito.
 ConfirmClassifyAbandonReasonOther=Outro
-ConfirmClassifyAbandonReasonOtherDesc=Esta eleição será para qualquer outro caso. Por Exemplo a raiz da intenção de Criar uma factura rectificativa.
+ConfirmClassifyAbandonReasonOtherDesc=Esta opção será usada em todos os outros casos. Por exemplo, porque você planeia criar uma fatura de substituição.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
-ValidateBill=Confirmar factura
-UnvalidateBill=Factura invalida
+ConfirmValidatePayment=Tem certeza de que deseja validar este pagamento? Nenhuma alteração pode ser efetuada assim que o pagamento for validado.
+ValidateBill=Validar fatura
+UnvalidateBill=Invalidar fatura
 NumberOfBills=Nº de faturas
 NumberOfBillsByMonth=Nb de faturas por mês
 AmountOfBills=Montante das faturas
 AmountOfBillsByMonthHT=Quantidade de faturas por mês (sem IVA)
 ShowSocialContribution=Show social/fiscal tax
-ShowBill=Ver factura
-ShowInvoice=Ver factura
-ShowInvoiceReplace=Ver factura rectificativa
+ShowBill=Ver fatura
+ShowInvoice=Ver fatura
+ShowInvoiceReplace=Ver fatura retificativa
 ShowInvoiceAvoir=Ver deposito
 ShowInvoiceDeposit=Mostrar fatura de adiantamento
 ShowInvoiceSituation=Show situation invoice
@@ -220,35 +222,36 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pendente
 AmountExpected=Montante reclamado
 ExcessReceived=Recebido em excesso
+ExcessPaid=Excess paid
 EscompteOffered=Desconto oferecido
 EscompteOfferedShort=Desconto
 SendBillRef=Submissão da fatura %s
 SendReminderBillRef=Submissão da fatura %s (lembrete)
 StandingOrders=Encomendas de débito direto
 StandingOrder=Encomenda de débito direto
-NoDraftBills=Nenhuma factura rascunho
-NoOtherDraftBills=Nenhuma outra factura rascunho
+NoDraftBills=Nenhuma fatura rascunho
+NoOtherDraftBills=Nenhuma outra fatura rascunho
 NoDraftInvoices=Sem rascunhos de faturas 
-RefBill=Ref. factura
-ToBill=A facturar
-RemainderToBill=Falta Facturar
-SendBillByMail=Enviar a factura por E-Mail
+RefBill=Ref. fatura
+ToBill=Por faturar
+RemainderToBill=Restante a faturar
+SendBillByMail=Enviar fatura por email
 SendReminderBillByMail=Enviar um lembrete por E-Mail
 RelatedCommercialProposals=Orçamentos para clientes associados
 RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=A Confirmar
 DateMaxPayment=Payment due on
-DateInvoice=Data Facturação
+DateInvoice=Data da fatura
 DatePointOfTax=Point of tax
-NoInvoice=Nenhuma Factura
-ClassifyBill=Classificar a factura
+NoInvoice=Nenhuma fatura
+ClassifyBill=Classificar a fatura
 SupplierBillsToPay=Faturas de fornecedores pendentes de pagamento
 CustomerBillsUnpaid=Faturas a receber de clientes
 NonPercuRecuperable=Não recuperável
 SetConditions=Definir termos de pagamento
 SetMode=Definir modo de pagamento
 SetRevenuStamp=Definir selo fiscal
-Billed=Facturado
+Billed=Faturado
 RecurringInvoices=Recurring invoices
 RepeatableInvoice=Fatura Modelo
 RepeatableInvoices=Faturas Modelo
@@ -261,7 +264,7 @@ CustomersInvoicesAndInvoiceLines=Faturas de clientes e linhas de faturas
 CustomersInvoicesAndPayments=Faturas de clientes e pagamentos
 ExportDataset_invoice_1=Faturas de clientes e linhas de faturas
 ExportDataset_invoice_2=Faturas a clientes e pagamentos
-ProformaBill=Factura proforma:
+ProformaBill=Fatura pró-forma:
 Reduction=Redução
 ReductionShort=Dto.
 Reductions=Descontos
@@ -283,36 +286,40 @@ Deposit=Adiantamento
 Deposits=Adiantamentos
 DiscountFromCreditNote=Desconto resultante do deposito %s
 DiscountFromDeposit=Adiantamentos da fatura %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
-AbsoluteDiscountUse=Este tipo de crédito pode ser usado na factura antes da sua validação
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=Este tipo de crédito pode ser usado na fatura antes da sua validação
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Novo Desconto fixo
 NewRelativeDiscount=Nova parente desconto
+DiscountType=Discount type
 NoteReason=Nota/Motivo
 ReasonDiscount=Motivo
 DiscountOfferedBy=Acordado por
 DiscountStillRemaining=Descontos disponíveis
 DiscountAlreadyCounted=Descontos já utilizados
-BillAddress=Morada de facturação
-HelpEscompte=Um <b>Desconto</b> é um desconto acordado sobre uma factura dada, a um cliente que realizou o seu pagamento muito antes do vencimento.
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
+BillAddress=Morada de faturação
+HelpEscompte=Este desconto é um desconto concedido ao cliente porque o pagamento foi feito antes do prazo.
 HelpAbandonBadCustomer=Este Montante é deixado (cliente julgado como devedor) e se considera como uma perda excepcional.
-HelpAbandonOther=Este Montante é deixado,já que se tratava de um erro de facturação (má introdução de dados, factura substituída por outra).
+HelpAbandonOther=Esse montante foi abandonado, pois foi um erro (cliente ou fatura incorretos substituídos por outro por exemplo)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID de Pagamento
 PaymentRef=Payment ref.
-InvoiceId=Id factura
-InvoiceRef=Ref. factura
-InvoiceDateCreation=Data de Criação da Factura
-InvoiceStatus=Estado factura
-InvoiceNote=Nota factura
-InvoicePaid=Factura paga
+InvoiceId=ID da fatura
+InvoiceRef=Ref. da fatura
+InvoiceDateCreation=Data de criação da fatura
+InvoiceStatus=Estado da fatura
+InvoiceNote=Nota da fatura
+InvoicePaid=Fatura paga
 PaymentNumber=Número de pagamento
 RemoveDiscount=Eliminar Desconto
 WatermarkOnDraftBill=Marca de agua em faturas rascunho (nada sem está vazia)
-InvoiceNotChecked=Factura não seleccionada
-CloneInvoice=Clonar factura
+InvoiceNotChecked=Nenhuma fatura selecionada
+CloneInvoice=Clonar fatura
 ConfirmCloneInvoice=Tem a certeza que pretende clonar esta fatura <b>%s</b>?
-DisabledBecauseReplacedInvoice=Acção desactivada porque é uma factura substituída
+DisabledBecauseReplacedInvoice=Ação desativada porque a fatura foi substituída
 DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
 NbOfPayments=Nb de pagamentos
 SplitDiscount=Dividido em duas desconto
@@ -320,7 +327,7 @@ ConfirmSplitDiscount=Tem a certeza que pretende dividir este desconto de <b>%s</
 TypeAmountOfEachNewDiscount=Entrada montante para cada uma das duas partes:
 TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual ao montante original de desconto.
 ConfirmRemoveDiscount=Tem certeza que deseja remover este desconto?
-RelatedBill=factura relacionados
+RelatedBill=Fatura relacionada
 RelatedBills=Faturas relacionadas
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
@@ -341,11 +348,11 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
-InvoiceAutoValidate=Validate invoices automatically
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validar faturas automaticamente
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
@@ -450,14 +457,14 @@ NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=Este(a) %s foi convertido em %s
 UsBillingContactAsIncoiveRecipientIfExist=Utilizar a morada do contacto de cliente de faturação da fatura em vez da morada do Terceiro como destinatário das faturas
 ShowUnpaidAll=Mostrar todas as faturas não pagas
-ShowUnpaidLateOnly=Mostrar tarde factura única por pagar.
+ShowUnpaidLateOnly=Mostrar apenas faturas atrasadas não pagas
 PaymentInvoiceRef=Pagamento da fatura %s
-ValidateInvoice=Validar a factura
-ValidateInvoices=Validate invoices
+ValidateInvoice=Validar fatura
+ValidateInvoices=Validar faturas
 Cash=Numerário
 Reported=Atrasado
 DisabledBecausePayments=Não é possível, pois há alguns pagamentos
-CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento, uma vez que existe pelo menos uma factura classificada como paga
+CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento, uma vez que existe pelo menos uma fatura classificada como paga
 ExpectedToPay=Pagamento esperado
 CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Pago por esse pagamento
@@ -473,19 +480,19 @@ RevenueStamp=Selo fiscal
 YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Modelo de factura completo (IVA,  método de pago a mostrar, logotipo...)
+PDFCrabeDescription=Modelo de fatura PDF Crabe. Um modelo completo de fatura (modelo recomendado)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 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 down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 TerreNumRefModelError=Uma conta a começar com $syymm já existe e não é compatível com este modelo de sequencia. Remove-o ou renomeia para activar este modulo
 CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representante factura do cliente seguimento
-TypeContact_facture_external_BILLING=Contacto na factura do Cliente
+TypeContact_facture_internal_SALESREPFOLL=Representante que dá seguimento à fatura do cliente
+TypeContact_facture_external_BILLING=Contacto na fatura do cliente
 TypeContact_facture_external_SHIPPING=Contacto com o transporte do cliente
 TypeContact_facture_external_SERVICE=Contactar o serviço ao cliente
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice
-TypeContact_invoice_supplier_external_BILLING=Fornecedor Contactar com factura
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representante de vendas que dá seguimento à fatura do fornecedor
+TypeContact_invoice_supplier_external_BILLING=Contacto na fatura do fornecedor
 TypeContact_invoice_supplier_external_SHIPPING=Fornecedor Contactar com transporte
 TypeContact_invoice_supplier_external_SERVICE=Supplier service contact
 # Situation invoices
@@ -518,6 +525,10 @@ DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
 BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Status of document generation
+StatusOfGeneratedDocuments=Estado da geração de documentos
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang
index 490f9ded738..c9a3d30d49c 100644
--- a/htdocs/langs/pt_PT/commercial.lang
+++ b/htdocs/langs/pt_PT/commercial.lang
@@ -34,7 +34,7 @@ LastActionsToDo=As %s mais antigas ações não concluídas
 DoneAndToDoActions=Lista de acções realizadas ou a realizar
 DoneActions=Lista de acções realizadas
 ToDoActions=Lista de acções incompletas
-SendPropalRef=Submissão da proposta comercial %s
+SendPropalRef=Submissão do orçamento %s
 SendOrderRef=Submissão da encomenda %s
 StatusNotApplicable=Não aplicável
 StatusActionToDo=A realizar
@@ -55,7 +55,7 @@ ActionAC_EMAIL=Enviar email
 ActionAC_RDV=Reuniões
 ActionAC_INT=Intervenção no local
 ActionAC_FAC=Enviar fatura do cliente por correio
-ActionAC_REL=Lembrete factura por correio
+ActionAC_REL=Enviar fatura do cliente por correio (lembrete)
 ActionAC_CLO=Fechar
 ActionAC_EMAILING=Enviar email em massa
 ActionAC_COM=Enviar encomenda de cliente por email
@@ -72,8 +72,8 @@ StatusProsp=Estado da prospeção
 DraftPropals=Orçamentos em rascunho
 NoLimit=Sem limite
 ToOfferALinkForOnlineSignature=Link para assinatura online
-WelcomeOnOnlineSignaturePage=Bem-vindo à página para aceitar propostas comerciais de %s
-ThisScreenAllowsYouToSignDocFrom=Esta página permite que você aceite e assine, ou recuse um orçamento/proposta comercial
+WelcomeOnOnlineSignaturePage=Bem-vindo à página onde pode aceitar orçamentos de %s
+ThisScreenAllowsYouToSignDocFrom=Esta página permite que você aceite e assine, ou recuse um orçamento
 ThisIsInformationOnDocumentToSign=Esta é a informação no documento para aceitar ou recusar
-SignatureProposalRef=Assinatura da orçamento/proposta comercial %s
+SignatureProposalRef=Assinatura do orçamento%s
 FeatureOnlineSignDisabled=Recurso para assinatura online desativado ou este documento foi criado antes que o recurso fosse ativado
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index a40b3fc1dde..8651f8a3cc4 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -43,7 +43,8 @@ Individual=Particular
 ToCreateContactWithSameName=Isto irá criar automaticamente um contacto/morada com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, criar um terceiro apenas é suficiente.
 ParentCompany=Empresa-mãe
 Subsidiaries=Subsidiárias
-ReportByCustomers=Relatório por cliente
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Relatório por trimestre
 CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
@@ -55,7 +56,7 @@ NatureOfThirdParty=Natureza do terceiro
 Address=Direcção
 State=Concelho
 StateShort=Concelho
-Region=Região
+Region=Distrito
 Region-State=Distrito - Concelho
 Country=País
 CountryCode=Código país
@@ -75,10 +76,12 @@ Town=Localidade
 Web=Web
 Poste= Posição
 DefaultLang=Língua por omissão
-VATIsUsed=Sujeito a IVA
-VATIsNotUsed=Não Sujeito a IVA
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Preencha a morada com a morada do terceiro
 ThirdpartyNotCustomerNotSupplierSoNoRef=O terceiro não é cliente nem fornecedor, não contém qualquer objeto de referência
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Conta bancária de pagamentos
 OverAllProposals=Orçamentos
 OverAllOrders=Encomendas
@@ -239,7 +242,7 @@ ProfId3TN=ID Prof. 3 (Código na Alfandega)
 ProfId4TN=ID Prof. 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=ID Profissional
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=NIPC
-VATIntraShort=NIPC
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Sintaxe Válida
+VATReturn=VAT return
 ProspectCustomer=Cliente Potencial/Cliente
 Prospect=Cliente Potencial
 CustomerCard=Ficha do cliente
 Customer=Cliente
 CustomerRelativeDiscount=Desconto Cliente Relativo
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Desconto Relativo
 CustomerAbsoluteDiscountShort=Desconto Fixo
 CompanyHasRelativeDiscount=Este cliente tem um desconto por defeito de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente não tem descontos relativos por defeito
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=Este cliente ainda tem créditos de desconto ou depósitos para <b>%s </b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tem descontos disponíveis (comercial, pronto pagamento) para <b>%s</b>%s
 CompanyHasCreditNote=Este cliente ainda tem notas de crédito para <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Este cliente não tem mas descontos fixos disponiveis
-CustomerAbsoluteDiscountAllUsers=Descontos fixos em curso (acordado por todos os Utilizadores)
-CustomerAbsoluteDiscountMy=Descontos fixos em curso (acordados Pessoalmente)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Nenhuma
 Supplier=Fornecedor
 AddContact=Criar contacto
@@ -318,7 +331,7 @@ NoContactForAnyOrder=Este contacto não é contacto de nenhum pedido
 NoContactForAnyOrderOrShipments=Este contacto não é um contacto para qualquer encomenda ou expedição
 NoContactForAnyProposal=Este contacto não é contacto de nenhum orçamento
 NoContactForAnyContract=Este contacto não é contacto de nenhum contrato
-NoContactForAnyInvoice=Este contacto não é contacto de nenhuma factura
+NoContactForAnyInvoice=Este contacto não é contacto de nenhuma fatura
 NewContact=Novo Contacto
 NewContactAddress=Novo Contato/Morada
 MyContacts=Os Meus Contactos
@@ -358,11 +371,11 @@ TE_RETAIL=Retalhista
 TE_WHOLE=Grossista
 TE_PRIVATE=Indivíduo particular
 TE_OTHER=Outro
-StatusProspect-1=Não Contactar
-StatusProspect0=Nunca Contactado
+StatusProspect-1=Não contactar
+StatusProspect0=Nunca contactado
 StatusProspect1=Para ser contactado
-StatusProspect2=Contacto em Curso
-StatusProspect3=Contacto Realizado
+StatusProspect2=Contacto em progresso
+StatusProspect3=Contacto efetuado
 ChangeDoNotContact=Alterar o Estado para ' Não Contactar '
 ChangeNeverContacted=Alterar o Estado para 'Nunca Nontactado'
 ChangeToContact=Alterar estado para 'Para ser contactado'
@@ -377,9 +390,9 @@ NoDolibarrAccess=Sem Acesso
 ExportDataset_company_1=Terceiros (empresas/fundações/pessoas físicas) e propriedades
 ExportDataset_company_2=Contactos de Terceiro e Atributos
 ImportDataset_company_1=Terceiros (empresas/fundações/pessoas físicas) e propriedades
-ImportDataset_company_2=Contatos/Moradas (de terceiros ou não) e atributos
-ImportDataset_company_3=Dados bancários
-ImportDataset_company_4=Terceiros/Representantes de vendas (afetar utilizadores representantes de vendas a terceiros)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Nível de preços
 DeliveryAddress=Direcção de Envío
 AddAddress=Adicionar Direcção
@@ -399,22 +412,23 @@ ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Área de Terceiros e Contactos
 LastModifiedThirdParties=Os últimos %s terceiros modificados
 UniqueThirdParties=Total de originais terceiros
-InActivity=Abrir
+InActivity=Aberto
 ActivityCeased=Fechado
 ThirdPartyIsClosed=O terceiro encontra-se fechado
 ProductsIntoElements=Lista de produto /serviços em %s
 CurrentOutstandingBill=Risco alcançado
 OutstandingBill=Montante máximo para faturas pendentes
 OutstandingBillReached=Montante máximo para faturas pendente foi alcançado
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Devolve um número baixo o formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos Fornecedores, donde yy é o ano, mm o mês e nnnn um contador sequêncial sem ruptura e sem Voltar a 0.
 LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento.
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
 MergeOriginThirdparty=Terceiro duplicado (terceiro que deseja eliminar)
 MergeThirdparties=Gerir terceiros
 ConfirmMergeThirdparties=Tem a certeza que pretende fundir este terceiro com o atual? Todos os objetos ligados a este serão movidos para o terceiro atual e depois o anterior será eliminado.
-ThirdpartiesMergeSuccess=Os terceiros foram fundidos
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Nome de utilizador do representante de vendas
 SaleRepresentativeFirstname=Primeiro nome do representante de vendas
 SaleRepresentativeLastname=Último nome do representante de vendas
-ErrorThirdpartiesMerge=Ocorreu um erro ao eliminar os terceiros. As alterações foram revertidas.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=O código do cliente ou fornecedor sugerido encontra-se duplicado
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 163aa818f4d..b41e35a7e95 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Faturação | Pagamentos
 TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
 TaxModuleSetupToModifyRulesLT=Ir para <a href="%s">configurar Empresa</a> para modificar as regras de cálculo
 OptionMode=Opção de Gestão Contabilidade
@@ -20,7 +20,7 @@ Outcome=Despesas
 MenuReportInOut=Resultado / Exercício
 ReportInOut=Balance of income and expenses
 ReportTurnover=Volume de Negócios
-PaymentsNotLinkedToInvoice=Pagamentos vinculados a nenhuma factura, sem Terceiro
+PaymentsNotLinkedToInvoice=Pagamentos não vinculados a qualquer fatura, portanto não vinculados a terceiros
 PaymentsNotLinkedToUser=Pagamentos não vinculados a um utilizador
 Profit=Beneficio
 AccountingResult=Accounting result
@@ -31,7 +31,7 @@ Credit=Crédito
 Piece=Doc. Contabilístico
 AmountHTVATRealReceived=Total Recebido
 AmountHTVATRealPaid=Total Pago
-VATToPay=IVA a pagar
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -79,8 +79,8 @@ ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Área Contabilidade/Tesouraria
 NewPayment=Novo pagamento
 Payments=Pagamentos
-PaymentCustomerInvoice=Cobrança factura a cliente
-PaymentSupplierInvoice=Pagamento factura de fornecedor
+PaymentCustomerInvoice=Pagamento de fatura do cliente
+PaymentSupplierInvoice=Pagamento de fatura de fornecedor
 PaymentSocialContribution=Pagamento da taxa social/fiscal
 PaymentVat=Pagamento IVA
 ListPayment=Lista de pagamentos
@@ -103,6 +103,7 @@ LT2PaymentsES=Pagamentos IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Ver Pagamentos IVA
@@ -118,7 +119,7 @@ SalesTurnover=Volume de Negócio
 SalesTurnoverMinimum=Minimum sales turnover
 ByExpenseIncome=By expenses & incomes
 ByThirdParties=Por Terceiro
-ByUserAuthorOfInvoice=Por autor da factura
+ByUserAuthorOfInvoice=Por autor da fatura
 CheckReceipt=Ficha de cheques
 CheckReceiptShort=Ficha
 LastCheckReceiptShort=Latest %s check receipts
@@ -126,7 +127,7 @@ NewCheckReceipt=Novo Cheque
 NewCheckDeposit=Novo Deposito
 NewCheckDepositOn=Criar Novo deposito na conta: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Data introdução de dados de recepção cheque
+DateChequeReceived=Data da receção do cheque
 NbOfCheques=Nº de Cheques
 PaySocialContribution=Pay a social/fiscal tax
 ConfirmPaySocialContribution=Tem certeza de que deseja classificar este imposto social ou fiscal como pago?
@@ -157,33 +158,37 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Inclui os pagamentos efetuados das faturas a clientes.<br>- Se baseia na data de pagamento das mesmas<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- As faturas de adiantamento não estão incluídas
 DepositsAreIncluded=- As faturas de adiantamento estão incluídas
-LT2ReportByCustomersInInputOutputModeES=Relatório de terceiros IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Relatório de terceiros IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Ver o Relatório <b>%sIVA pago%s</b> para um modo de cálculo Standard
 SeeVATReportInDueDebtMode=Ver o Relatório <b>%sIVA devido%s</b> para um modo de cálculo com a Opção sobre o devido
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- Para os bens materiais, que inclui as faturas do IVA com base na data da fatura.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Para os serviços, o relatório inclui faturas de IVA devido, pago ou não, com base na data da fatura.
-RulesVATDueProducts=- Para os bens materiais, que inclui as faturas de IVA, com base na data da fatura.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Nota: Para os bens materiais, seria necessário utilizar a data de entregas para ser mais justo.
-PercentOfInvoice=%%/factura
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/fatura
 NotUsedForGoods=Não utilizados em bens
-ProposalStats=Estatísticas sobre as propostas
+ProposalStats=Estatísticas sobre os orçamentos
 OrderStats=Estatísticas sobre encomendas
 InvoiceStats=Estatísticas sobre as contas
 Dispatch=Repartição
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Período de contabilidade
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 4b01192c5e1..288bbaf7aff 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -91,7 +91,7 @@ LowerDateEndPlannedShort=Menor data de término planeada dos serviços ativos
 SendContractRef=Informação contratual __REF__
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Representante de vendas assinante do contrato
-TypeContact_contrat_internal_SALESREPFOLL=Representante de vendas que dá seguimento ao contrato
-TypeContact_contrat_external_BILLING=Contacto do cliente responsável pela facturação do contrato
+TypeContact_contrat_internal_SALESREPFOLL=Representante que dá seguimento ao contrato
+TypeContact_contrat_external_BILLING=Contacto do cliente responsável pela faturação
 TypeContact_contrat_external_CUSTOMER=Contacto do cliente responsável pelo seguimento do contrato
 TypeContact_contrat_external_SALESREPSIGN=Contacto cliente assinante do contrato
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index 16f3c00c8aa..e45d875c28b 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Nenhumas tarefas registadas
 CronPriority=Prioridade
 CronLabel=Etiqueta
 CronNbRun=N.º de Execução
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Terafa lançada e concluída
 #Page card
@@ -55,9 +55,9 @@ CronSaveSucess=Guardado com sucesso
 CronNote=Comentário
 CronFieldMandatory=Os campos %s são obrigatórios
 CronErrEndDateStartDt=A data de fim não pode ser anterior à data de início
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Activar
-CronStatusInactiveBtn=Desactivar
+StatusAtInstall=Estado da instalação do módulo
+CronStatusActiveBtn=Ativar
+CronStatusInactiveBtn=Desativar
 CronTaskInactive=Esta tarefa está desactivada
 CronId=Id
 CronClassFile=Filename with class
@@ -74,9 +74,10 @@ CronFrom=De
 CronType=Tipo de trabalho
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/pt_PT/dict.lang b/htdocs/langs/pt_PT/dict.lang
index 9658a8ca733..bec5916c1c4 100644
--- a/htdocs/langs/pt_PT/dict.lang
+++ b/htdocs/langs/pt_PT/dict.lang
@@ -250,9 +250,9 @@ CountryMF=Saint Martin
 ##### Civilities #####
 CivilityMME=Sra.
 CivilityMR=Sr.
-CivilityMLE=Dr.
-CivilityMTRE=Eng.
-CivilityDR=Doutor
+CivilityMLE=Doutor
+CivilityMTRE=Mestre
+CivilityDR=Dr.
 ##### Currencies #####
 Currencyeuros=Euros
 CurrencyAUD=Dólar UA
diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang
index f9331e1eebf..e913dcbe1e2 100644
--- a/htdocs/langs/pt_PT/donations.lang
+++ b/htdocs/langs/pt_PT/donations.lang
@@ -10,10 +10,10 @@ ConfirmDeleteADonation=Tem a certeza de que deseja eliminar este donativo?
 ShowDonation=Mostrar Donativo
 PublicDonation=Donativo Público
 DonationsArea=Área de Donativos
-DonationStatusPromiseNotValidated=Promessa Não Validada
-DonationStatusPromiseValidated=Promessa Validada
-DonationStatusPaid=Donativo Recebido
-DonationStatusPromiseNotValidatedShort=Não Validada
+DonationStatusPromiseNotValidated=Promessa em rascunho
+DonationStatusPromiseValidated=Promessa validada
+DonationStatusPaid=Donativo recebido
+DonationStatusPromiseNotValidatedShort=Rascunho
 DonationStatusPromiseValidatedShort=Validado
 DonationStatusPaidShort=Recebido
 DonationTitle=Recibo do donativo
@@ -23,7 +23,7 @@ DonationReceipt=Recibo do Donativo
 DonationsModels=Modelos de documentos dos recibos de donativos
 LastModifiedDonations=%s Últimas doações modificadas
 DonationRecipient=Destinatário do Donativo
-IConfirmDonationReception=O destinatário declarou a recepção, como um donativo, do seguinte montante
+IConfirmDonationReception=O destinatário declarou a receção, como um donativo, do seguinte montante
 MinimumAmount=O montante mínimo é %s
 FreeTextOnDonations=Texto livre para mostrar no rodapé
 FrenchOptions=Opções para França
@@ -31,4 +31,4 @@ DONATION_ART200=Mostrar artigo 200 de CGI se estiver preocupado
 DONATION_ART238=Mostrar artigo 238 de CGI se estiver preocupado
 DONATION_ART885=Mostrar artigo 885 de CGI se estiver preocupado
 DonationPayment=Pagamento do donativo
-DonationValidated=Donation %s validated
+DonationValidated=Doação %s validada
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 32fe83dc0c0..dc1b4a4cfac 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Nenhum erro
 # Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=EMail %s é errado
-ErrorBadUrl=Url %s é errado
+ErrorButCommitIsDone=Erros encontrados, mas a validação foi efetuada apesar disso
+ErrorBadEMail=O email %s está errado
+ErrorBadUrl=O url %s está errado
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=A sessão %s já existe.
+ErrorLoginAlreadyExists=O login %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
-ErrorRecordNotFound=Registro não foi encontrado.
-ErrorFailToCopyFile=Falha ao copiar <b>&quot;%s&quot;</b> arquivo para <b>&quot;%s&quot;.</b>
+ErrorRecordNotFound=Registo não foi encontrado.
+ErrorFailToCopyFile=Ocorreu um erro ao copiar o ficheiro '<b>%s</b>' para '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Falha ao renomear <b>&quot;%s&quot;</b> arquivo para <b>&quot;%s&quot;.</b>
-ErrorFailToDeleteFile=A remoção do ficheiro '<b>%s</b>' falhou.
-ErrorFailToCreateFile=A criação do ficheiro '<b<%s</b> falhou'.
-ErrorFailToRenameDir=Erro à renomear a pasta '<b>%s</b>' a '<b>%s</b>'.
-ErrorFailToCreateDir=Erro ao criar a pasta '<b>%s</b>'
-ErrorFailToDeleteDir=Erro à eliminar a pasta '<b>%s</b>'.
+ErrorFailToRenameFile=Ocorreu um erro ao mudar o nome do ficheiro '<b>%s</b>' para '<b>%s</b>'.
+ErrorFailToDeleteFile=Ocorreu um erro ao remover o ficheiro '<b>%s</b>'.
+ErrorFailToCreateFile=Ocorreu um erro ao criar o ficheiro '<b>%s</b>'.
+ErrorFailToRenameDir=Ocorreu um erro ao mudar o nome da pasta '<b>%s</b>' para '<b>%s</b>'.
+ErrorFailToCreateDir=Ocorreu um erro ao criar a pasta '<b>%s</b>'
+ErrorFailToDeleteDir=Ocorreu um erro ao eliminar a pasta '<b>%s</b>'.
 ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
 ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto já está definido como contacto para este tipo.
@@ -36,13 +36,13 @@ ErrorBadSupplierCodeSyntax=A sintaxis do código fornecedor é incorrecta
 ErrorSupplierCodeRequired=Código fornecedor obrigatório
 ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado
 ErrorBadParameters=Parâmetros incorrectos
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadValueForParameter=Valor errado '%s' para o parâmetro '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=&quot;%s&quot; Valor tem formato de data errado
 ErrorWrongDate=A data não está correcta!
 ErrorFailedToWriteInDir=Impossivel escrever na pasta %s
 ErrorFoundBadEmailInFile=Encontrada sintaxis incorrecta em email em %s linhas em Ficheiro (Exemplo linha %s com email=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
+ErrorUserCannotBeDelete=O utilizador não pode ser eliminado. Pode estar associado a entidades do Dolibarr.
 ErrorFieldsRequired=Não se indicaram alguns campos obrigatórios
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Erro na criação de uma pasta. Verifique se o usuário do servidor Web tem acesso de escrita aos documentos Dolibarr. Se o parâmetro <b> safe_mode </ b> está ativo no PHP, Verifique se os arquivos php do Dolibarr são da propriedade do usuário do servidor web.
@@ -62,8 +62,8 @@ ErrorFileSizeTooLarge=O tamanho do arquivo é muito grande.
 ErrorSizeTooLongForIntType=Tamanho demasiado longo para o tipo int (%s máximo dígitos)
 ErrorSizeTooLongForVarcharType=Tamanho demasiado longo para o tipo string (%s máximo chars)
 ErrorNoValueForSelectType=Por favor, preencha o valor para lista de selecção
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
+ErrorNoValueForCheckBoxType=Preencha o valor da lista da caixa de seleção
+ErrorNoValueForRadioType=Por favor, preencha o valor da lista
 ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
 ErrorFieldCanNotContainSpecialCharacters=O campo <b>%s</b> não deve conter carácteres especiais
 ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
@@ -73,9 +73,9 @@ ErrorLDAPSetupNotComplete=A configuração Dolibarr-LDAP é incompleta.
 ErrorLDAPMakeManualTest=Foi criado um Ficheiro .ldif na pasta %s. Trate de gerir manualmente este Ficheiro desde a linha de comandos para Obter mais detalhes acerca do erro.
 ErrorCantSaveADoneUserWithZeroPercentage=Você não pode mudar uma ação de estado, se um usuário começou a realizante ação.
 ErrorRefAlreadyExists=A referencia utilizada para a criação já existe
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some childs.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Falha ao eliminar o registo, pois tem alguns elementos associados.
+ErrorRecordHasAtLeastOneChildOfType=O objeto tem pelo menos um elemento do tipo %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
 ErrorModuleRequireJavascript=Javascript não deve ser desativado para que este recurso de trabalho. Para ativar / desativar o JavaScript, vá ao menu Home -> Configuração -> Mostrar.
 ErrorPasswordsMustMatch=Ambas as senhas digitadas devem corresponder entre si
@@ -107,7 +107,7 @@ ErrorRecordAlreadyExists=Registo já existente
 ErrorLabelAlreadyExists=This label already exists
 ErrorCantReadFile=Erro na leitura do ficheiro '&s'
 ErrorCantReadDir=Erro na leitura da pasta '%s'
-ErrorBadLoginPassword=Identificadores de utilizador o palavra-passe incorrectos
+ErrorBadLoginPassword=Utilizador ou palavra-passe incorretos
 ErrorLoginDisabled=A sua conta está desactivada
 ErrorFailedToRunExternalCommand=Erro ao tentar o comando externo. verifique que está disponivel e executavel pelo seu servidor PHP. sim o PHP <b>Safe Mode</b> está activo, verifique que o comando encontra-se numa pasta definida ao parâmetro <b>safe_mode_exec_dir</b>.
 ErrorFailedToChangePassword=Erro na modificação da palavra-passe
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
 ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao antigo
 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=Não foi possível ligar à base de dados. Verifique se o servidor MySQL está a ser executado (na maioria dos casos, é possível iniciá-lo a partir de linha de comando com o comando 'sudo /etc/init.d/mysql start').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Falha ao adicionar contato
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -171,7 +171,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=Definiu um valor estimado para esta oportunidado/lead. Também deve inserir o seu estado
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
@@ -199,14 +199,15 @@ ErrorNoWarehouseDefined=Error, no warehouses defined.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
 ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorObjectMustHaveStatusDraftToBeValidated=O objeto %s deve estar no estado 'Rascunho' para ser validado.
+ErrorObjectMustHaveLinesToBeValidated=O objeto %s deve ter linhas para ser validado.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Aviso, o número de destinatários diferentes é limitado a <b> %s </b> ao usar as ações em massa em listas
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index d380dc13a47..2e06bb85b2b 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -16,7 +16,12 @@ CancelCP=Cancelado
 RefuseCP=Recusou
 ValidatorCP=Aprovador
 ListeCP=Lista de pedidos de licença
+LeaveId=Leave ID
 ReviewedByCP=Será aprovado por
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=Firstname of approval user
+UserForApprovalLastname=Lastname of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Descrição
 SendRequestCP=Criar pedido de licença
 DelayToRequestCP=Os pedidos de licença devem ser efetuados com pelo menos <b>%s dia(s)</b> de antecedência.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Você não está autorizado a consultar este pedido de licença.
 InfosWorkflowCP=Informação do fluxo de trabalho
 RequestByCP=Pedido por
 TitreRequestCP=Pedido de licença
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Número de dias de férias consumidos
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Editar
 DeleteCP=Eliminar
 ActionRefuseCP=Recusar
@@ -59,6 +71,7 @@ DateRefusCP=Data de rejeição
 DateCancelCP=Data de cancelamento
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Motivo
 UserCP=Utilizador
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,7 +94,12 @@ EmployeeFirstname=Primeiro do nome do funcionário
 TypeWasDisabledOrRemoved=O tipo de licença (ID %s) foi desativado ou removido
 LastHolidays=Últimos %s pedidos de licença
 AllHolidays=Todos os pedidos de licença
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
 LastUpdateCP=As últimas atualizações automáticas de alocação de licenças
 MonthOfLastMonthlyUpdate=Mês das últimas atualizações automáticas de alocação de licenças
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index fe6f53301fc..8c72882f2fa 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -139,7 +139,7 @@ KeepDefaultValuesDeb=Você pode usar o assistente de configuração Dolibarr de
 KeepDefaultValuesMamp=Você usa o DoliMamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz.
 KeepDefaultValuesProxmox=Você usa o assistente de configuração Dolibarr de um appliance virtual Proxmox, para valores propostos aqui já são otimizados. Alterá-los apenas se você sabe o que fazer.
 UpgradeExternalModule=Corra o processo de atualização dedicado dos módulos externos
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+SetAtLeastOneOptionAsUrlParameter=Defina pelo menos uma opção como um parâmetro no URL. Por exemplo: '...repair.php?standard=confirmed'
 NothingToDelete=Nada para limpar/eliminar
 NothingToDo=Nada para fazer
 #########
@@ -180,8 +180,8 @@ MigrationReopenedContractsNumber=%s contratos modificados
 MigrationReopeningContractsNothingToUpdate=Não fechado. contrato para abrir
 MigrationBankTransfertsUpdate=Atualizar as ligações entre a entrada bancária e a transferência bancária
 MigrationBankTransfertsNothingToUpdate=Todas as ligações são até à data
-MigrationShipmentOrderMatching=Envio recepção atualização
-MigrationDeliveryOrderMatching=Entrega recepção atualização
+MigrationShipmentOrderMatching=Atualização da receção de envios
+MigrationDeliveryOrderMatching=Atualização da receção de encomendas
 MigrationDeliveryDetail=Actualização de entrega
 MigrationStockDetail=Atualizar stock valor dos produtos
 MigrationMenusDetail=Atualização dinâmica menus quadros
@@ -193,11 +193,13 @@ MigrationActioncommElement=Atualizar os dados nas ações
 MigrationPaymentMode=A migração de dados para o modo de pagamento
 MigrationCategorieAssociation=Migração de categorias
 MigrationEvents=Migração dos eventos de forma a adicionar o criador do evento à tabela de atribuições
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEventsContact=Migração dos eventos de forma a adicionar o contacto do evento à tabela de atribuições
 MigrationRemiseEntity=Atualize o valor do campo entity da tabela llx_societe_remise
 MigrationRemiseExceptEntity=Atualize o valor do campo entity da tabela llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Recarregar módulo %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationResetBlockedLog=Restabelecer o módulo BlockedLog para o algoritmo v7
 ShowNotAvailableOptions=Mostrar opções indisponíveis
 HideNotAvailableOptions=Ocultar opções indisponíveis
 ErrorFoundDuringMigration=Não pode proceder ao próximo passo porque foram reportados erros durante o processo de migração. Para ignorar os erros, pode <a href="%s">clicar aqui</a>, mas a aplicação ou algumas funcionalidades desta poderão não funcionar corretamente.
diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
index 9023acc9e1d..895d64743bc 100644
--- a/htdocs/langs/pt_PT/interventions.lang
+++ b/htdocs/langs/pt_PT/interventions.lang
@@ -3,23 +3,23 @@ Intervention=Intervenção
 Interventions=Intervenções
 InterventionCard=Ficha de intervenção
 NewIntervention=Nova Intervenção
-AddIntervention=Create intervention
+AddIntervention=Criar intervenção
 ListOfInterventions=Lista de Intervenções
 ActionsOnFicheInter=Ações de intervenção
-LastInterventions=Latest %s interventions
+LastInterventions=Últimas %s intervenções 
 AllInterventions=Todas as Intervenções
 CreateDraftIntervention=Criar Rascunho
 InterventionContact=Contacto Intervenção
 DeleteIntervention=Eliminar Intervenção
-ValidateIntervention=Confirmar Intervenção
+ValidateIntervention=Validar intervenção
 ModifyIntervention=Modificar intervenção
 DeleteInterventionLine=Eliminar Linha de Intervenção
-CloneIntervention=Clone intervention
+CloneIntervention=Clonar intervenção
 ConfirmDeleteIntervention=Tem certeza de que deseja eliminar esta intervenção?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmValidateIntervention=Tem a certeza de que deseja validar esta intervenção com o nome <b>%s</b>?
+ConfirmModifyIntervention=Tem a certeza de que deseja modificar esta intervenção?
 ConfirmDeleteInterventionLine=Tem certeza de que deseja eliminar esta linha da intervenção?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+ConfirmCloneIntervention=Tem a certeza de que deseja clonar esta intervenção?
 NameAndSignatureOfInternalContact=Nome e Assinatura do Participante:
 NameAndSignatureOfExternalContact=Nome e Assinatura do Cliente:
 DocumentModelStandard=Modelo da Norma Intervenção
@@ -27,40 +27,40 @@ InterventionCardsAndInterventionLines=Fichas e Linhas de Intervenção
 InterventionClassifyBilled=Classificar como "Faturado"
 InterventionClassifyUnBilled=Classificar como "Não faturado"
 InterventionClassifyDone=Classificar como "Efetuado"
-StatusInterInvoiced=Faturados
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
+StatusInterInvoiced=Faturada
+SendInterventionRef=Submissão da intervenção %s
+SendInterventionByMail=Enviar intervenção por email
+InterventionCreatedInDolibarr=Intervenção %s criada
 InterventionValidatedInDolibarr=Intervenção %s validada
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionModifiedInDolibarr=Intervenção %s modificada
+InterventionClassifiedBilledInDolibarr=Intervenção %s definida como faturada
+InterventionClassifiedUnbilledInDolibarr=Intervenção %s definida como não faturada
 InterventionSentByEMail=Intervenção %s enviada por Mensagem Eletrónica
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
+InterventionDeletedInDolibarr=Intervenção %s eliminada
+InterventionsArea=Área de Intervenções
+DraftFichinter=Intervenções rascunho
+LastModifiedInterventions=Últimas %s intervenções modificadas 
+FichinterToProcess=Intervenções a processar
 ##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Contacto do cliente do seguimiento da intervenção
 # Modele numérotation
 PrintProductsOnFichinter=Imprimir também linhas do tipo "produto" (não apenas serviços) na ficha de intervenção
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
+PrintProductsOnFichinterDetails=intervenções geradas a partir de encomendas
+UseServicesDurationOnFichinter=Utilizar a duração do serviço para as intervenções geradas a partir de encomendas
+UseDurationOnFichinter=Oculta o campo de duração dos registos das intervenções
+UseDateWithoutHourOnFichinter=Oculta as horas e minutos campo de data dos registos das intervenções
+InterventionStatistics=Estatísticas das intervenções
 NbOfinterventions=Número de fichas de intervenção
 NumberOfInterventionsByMonth=Número de fcihas de intervenção por mês (data de validação)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
 ##### Exports #####
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-InterLineDuration=Line duration intervention
-InterLineDesc=Line description intervention
+InterId=ID da intervenção
+InterRef=Ref. da intervenção
+InterDateCreation=Data de criação da intervenção
+InterDuration=Duração da intervenção
+InterStatus=Estado da intervenção
+InterNote=Nota da intervenção
+InterLineId=ID da intervenção na linha
+InterLineDate=Data da intervenção na linha
+InterLineDuration=Duração da intervenção na linha
+InterLineDesc=Descrição da intervenção na linha
diff --git a/htdocs/langs/pt_PT/loan.lang b/htdocs/langs/pt_PT/loan.lang
index 11db1661026..b6d37bcc0f1 100644
--- a/htdocs/langs/pt_PT/loan.lang
+++ b/htdocs/langs/pt_PT/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuração do módulo de empréstimo
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 39446882d9b..cb4b529d48a 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -31,14 +31,14 @@ ValidMailing=Confirmar Mailing
 MailingStatusDraft=Rascunho
 MailingStatusValidated=Validado
 MailingStatusSent=Enviado
-MailingStatusSentPartialy=Enviado Parcialmente
-MailingStatusSentCompletely=Enviado Completamente
+MailingStatusSentPartialy=Enviado parcialmente
+MailingStatusSentCompletely=Enviado completamente
 MailingStatusError=Erro
-MailingStatusNotSent=Não Enviado
+MailingStatusNotSent=Não enviado
 MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
 MailingSuccessfullyValidated=Mailing validado com sucesso
 MailUnsubcribe=Cancelar Subscrição
-MailingStatusNotContact=Não efectuar mais contatos
+MailingStatusNotContact=Não contactar
 MailingStatusReadAndUnsubscribe=Ler e cancelar subscrição
 ErrorMailRecipientIsEmpty=A direcção do destinatario está vazia
 WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatarios.
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selecionado
 NbIgnored=Nb ignorado
 NbSent=Nb enviado
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Destinatários (seleção avançada)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Valor mínimo
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 2d006a126a0..bdf5f6acfc2 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parâmetro %s não definido
 ErrorUnknown=Erro desconhecido
 ErrorSQL=Erro de SQL
 ErrorLogoFileNotFound=O ficheiro logo '%s' não se encontra
-ErrorGoToGlobalSetup=Vá à configuração 'Empresa/Organização' para corrigir este problema
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Ir á configuração do módulo para corrigir
 ErrorFailedToSendMail=Erro ao envio do e-mail (emissor=%s, destinatário=%s)
 ErrorFileNotUploaded=Não foi possivel transferir o ficheiro
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o p
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país %s.
 ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou.
 ErrorCannotAddThisParentWarehouse=Está a tentar adicionar um armazém pai que já é filho do armazém atual
-MaxNbOfRecordPerPage=Número máximo de registos por página
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Não tem permissão para efetuar essa operação
 SetDate=Definir data
 SelectDate=Seleccionar uma data
 SeeAlso=Ver também %s
 SeeHere=Veja aqui
+ClickHere=Clique aqui
+Here=Here
 Apply=Aplicar
 BackgroundColorByDefault=Cor de fundo por omissão
 FileRenamed=O ficheiro foi renomeado com sucesso
@@ -159,7 +161,7 @@ Modify=Modificar
 Edit=Editar
 Validate=Validar
 ValidateAndApprove=Validar e Aprovar
-ToValidate=Para validar
+ToValidate=Por validar
 NotValidated=Não validado
 Save=Guardar
 SaveAs=Guardar Como
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Selecionar
 Choose=Escolher
 Resize=Redimensionar
+ResizeOrCrop=Resize or Crop
 Recenter=Centrar
 Author=Autor
 User=Utilizador
@@ -325,8 +328,10 @@ Default=Predefinição
 DefaultValue=Valor Predefinido
 DefaultValues=Valores predefinidos
 Price=Preço
+PriceCurrency=Price (currency)
 UnitPrice=Preço Unitário
 UnitPriceHT=Preço unitário (líquido)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Preço Unitário
 PriceU=P.U.
 PriceUHT=P.U. (líquido)
@@ -334,6 +339,7 @@ PriceUHTCurrency=P.U. (moeda)
 PriceUTTC=P.U. (inc. impostos)
 Amount=Montante
 AmountInvoice=Montante da Fatura
+AmountInvoiced=Amount invoiced
 AmountPayment=Montatne do pagamento
 AmountHTShort=Montante (líquido)
 AmountTTCShort=Montante (IVA inc.)
@@ -353,6 +359,7 @@ AmountLT2ES=Montante IRPF
 AmountTotal=Montante Total
 AmountAverage=Montante médio
 PriceQtyMinHT=Preço quantidade min total
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentagem
 Total=Total
 SubTotal=Subtotal
@@ -374,7 +381,7 @@ TotalLT1IN=Total ICBS
 TotalLT2IN=Total IBSE
 HT=Sem IVA
 TTC=IVA incluido
-INCVATONLY=Inc. VAT
+INCVATONLY=IVA inc.
 INCT=Todos os impostos incluídos
 VAT=IVA
 VATIN=IIBS
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=ICBS
 LT2IN=IBSE
 VATRate=Taxa IVA
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Taxa de imposto predefinida
 Average=Média
 Sum=Soma
@@ -420,13 +429,17 @@ ActionDoneShort=Terminado
 ActionUncomplete=Incompleta
 LatestLinkedEvents=Os últimos %s eventos relacionados
 CompanyFoundation=Empresa/Organização
+Accountant=Accountant
 ContactsForCompany=Contactos para este terceiro
 ContactsAddressesForCompany=Contactos/moradas para este terceiro
 AddressesForCompany=Moradas para este terceiro
 ActionsOnCompany=Eventos sobre este terceiro
 ActionsOnMember=Eventos sobre este membro
-ActionsOnProduct=Events about this product
+ActionsOnProduct=Eventos sobre este produto
 NActionsLate=%s em atraso
+ToDo=A realizar
+Completed=Completed
+Running=Em progresso
 RequestAlreadyDone=O pedido já foi realizado anteriormente
 Filter=Filtro
 FilterOnInto=Critério de pesquisa '<strong>%s</strong>' para os campos %s
@@ -499,7 +512,7 @@ DeletePicture=Apagar Imagem
 ConfirmDeletePicture=Confirmar eliminação da imagem?
 Login=Iniciar Sessão
 LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginOrEmail=Login ou Email
 CurrentLogin=Sessão atual
 EnterLoginDetail=Introduza os detalhes de inicio de sessão
 January=Janeiro
@@ -623,7 +636,7 @@ CloseWindow=Fechar Janela
 Response=Resposta
 Priority=Prioridade
 SendByMail=Enviar por e-mail
-MailSentBy=Mail enviado por
+MailSentBy=Email enviado por
 TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem
 SendAcknowledgementByMail=Enviar email de confirmação
 SendMail=Enviar e-mail
@@ -631,7 +644,7 @@ EMail=E-mail
 NoEMail=Sem e-mail
 Email=Email
 NoMobilePhone=Sem telefone móvel
-Owner=Propietario
+Owner=Proprietário
 FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
 Refresh=Actualizar
 BackToList=Voltar para a lista
@@ -651,7 +664,7 @@ Offered=Oferta
 NotEnoughPermissions=Não tem permissões para efectuar esta acção
 SessionName=Nome Sessão
 Method=Método
-Receive=Recepção
+Receive=Receção
 CompleteOrNoMoreReceptionExpected=Complete ou nada mais é esperado
 ExpectedValue=Valor esperado
 CurrentValue=Valor actual
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Atenção, você está em um modo de manutenção
 CoreErrorTitle=Erro de sistema
 CoreErrorMessage=Ocorreu um erro. Contacte o seu administrador do sistema de forma a que este proceda à análise do relatórios ou desative a opção $dolibarr_main_prod=1 para obter mais informação.
 CreditCard=Cartão de crédito
+ValidatePayment=Validar pagamento
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Os campos com <b>%s</b> são obrigatórios
 FieldsWithIsForPublic=Os campos com <b>%s</b> são mostrados na lista pública dos membros. Se você não quer isso, verificar o &quot;caixa&quot; do público.
 AccordingToGeoIPDatabase=(De acordo com GeoIP conversão)
@@ -776,7 +791,7 @@ SetBankAccount=Definir Conta Bancária
 AccountCurrency=Moeda da conta
 ViewPrivateNote=Ver notas
 XMoreLines=%s linhas(s) ocultas
-ShowMoreLines=Show more/less lines
+ShowMoreLines=Mostrar mais/menos linhas
 PublicUrl=URL público
 AddBox=Adicionar Caixa
 SelectElementAndClick=Selecione um elemento e clique em %s
@@ -805,11 +820,11 @@ NoRecordSelected=Nenhum registo selecionado
 MassFilesArea=Área para os ficheiros criados através de ações em massa
 ShowTempMassFilesArea=Mostrar área para os ficheiros criados através de ações em massa
 ConfirmMassDeletion=Confirmação de eliminação em massa
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
+ConfirmMassDeletionQuestion=Tem certeza de que deseja eliminar o registo %s selecionado ?
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Classificar como faturado
+ClassifyUnbilled=Classify unbilled
 Progress=Progresso
-ClickHere=Clique aqui
 FrontOffice=Front office
 BackOffice=Back office
 View=Vista
@@ -827,7 +842,7 @@ SomeTranslationAreUncomplete=Algumas línguas podem estar apenas parcialmente tr
 DirectDownloadLink=Link de download direto (público/externo)
 DirectDownloadInternalLink=Link de download direto (precisa de ter sessão iniciada e precisa de permissões)
 Download=Download
-DownloadDocument=Download document
+DownloadDocument=Download do documento
 ActualizeCurrency=Atualizar taxa de conversão da moeda
 Fiscalyear=Ano Fiscal
 ModuleBuilder=Construtor de módulos
@@ -836,7 +851,7 @@ BulkActions=Ações em massa
 ClickToShowHelp=Clique para mostrar o balão de ajuda
 WebSite=Site da Web
 WebSites=Websites
-WebSiteAccounts=Web site accounts
+WebSiteAccounts=Contas do website
 ExpenseReport=Relatório de despesas
 ExpenseReports=Relatórios de despesas
 HR=RH
@@ -851,6 +866,8 @@ FileNotShared=Ficheiro não partilhado
 Project=Projeto
 Projects=Projetos
 Rights=Permissões
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
@@ -887,7 +904,7 @@ Select2NotFound=Nenhum resultado encontrado
 Select2Enter=Introduza
 Select2MoreCharacter=ou mais caracteres
 Select2MoreCharacters=ou mais caracteres
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2MoreCharactersMore=<strong>Sintaxe de pesquisa:</strong> <br> <kbd> <strong> | </strong>  <kbd> OR </kbd>(alb) <br> <kbd> <strong> * </strong></kbd> <kbd> Qualquer caractere </kbd> (a*b) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> Começa com </kbd> (^ab) <br> <kbd> <strong> $ </strong> </kbd> <kbd> Terminar com </kbd> (ab$) <br>
 Select2LoadingMoreResults=A carregar mais resultados...
 Select2SearchInProgress=Pesquisa em progresso...
 SearchIntoThirdparties=Terceiros
@@ -914,5 +931,13 @@ CommentPage=Espaço de comentários
 CommentAdded=Comentário adicionado
 CommentDeleted=Comentário eliminado
 Everybody=Toda a Gente
-PayedBy=Payed by
-PayedTo=Payed to
+PayedBy=Pago por
+PayedTo=Pago a
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Atribuído a
diff --git a/htdocs/langs/pt_PT/margins.lang b/htdocs/langs/pt_PT/margins.lang
index a026018cac8..d3dd176bde5 100644
--- a/htdocs/langs/pt_PT/margins.lang
+++ b/htdocs/langs/pt_PT/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index cd227cd67fb..0ca87e31fb8 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Lista de Membros públicos validados
 ErrorThisMemberIsNotPublic=Este membro não é público
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro <b>(nome: %s, login: %s)</b> já está associada a um <b>terceiro %s.</b> Remover este link em primeiro lugar porque um terceiro não pode ser ligada a apenas um membro (e vice-versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por motivos de segurança, você deve ser concedido permissões para editar todos os usuários para poder ligar um membro de um usuário que não é seu.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Conteúdo do seu cartão de membro
 SetLinkToUser=Link para um usuário Dolibarr
 SetLinkToThirdParty=Link para uma Dolibarr terceiro
 MembersCards=Cartões de negócio dos membros
@@ -29,7 +27,7 @@ MenuMembersToValidate=Membros rascunho
 MenuMembersValidated=Membros validados
 MenuMembersUpToDate=Membros actualizados
 MenuMembersNotUpToDate=Membros não actualizados
-MenuMembersResiliated=Terminated members
+MenuMembersResiliated=Membros inativos
 MembersWithSubscriptionToReceive=Membros com assinatura para receber
 DateSubscription=Data filiação
 DateEndSubscription=Data fim filiação
@@ -45,14 +43,14 @@ MemberStatusDraft=Rascunho (a Confirmar)
 MemberStatusDraftShort=Rascunho
 MemberStatusActive=Validado (em espera de filiação )
 MemberStatusActiveShort=Validado
-MemberStatusActiveLate=Subscription expired
-MemberStatusActiveLateShort=Não actualizada
-MemberStatusPaid=Subscrições em dia
-MemberStatusPaidShort=Em dia
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusActiveLate=Subscrição expirada
+MemberStatusActiveLateShort=Expirada
+MemberStatusPaid=Subscrição atualizada
+MemberStatusPaidShort=Atualizada
+MemberStatusResiliated=Membro inativo
+MemberStatusResiliatedShort=Inativo
 MembersStatusToValid=Membros rascunho
-MembersStatusResiliated=Terminated members
+MembersStatusResiliated=Membros inativos
 NewCotisation=Nova filiação
 PaymentSubscription=Nova contribuição pagamento
 SubscriptionEndDate=Data fim filiação
@@ -89,7 +87,7 @@ DeleteSubscription=Eliminar uma filiação
 ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=Ficheiro htpasswd
 ValidateMember=Confirmar um membro
-ConfirmValidateMember=Are you sure you want to validate this member?
+ConfirmValidateMember=Tem a certeza que deseja validar este membro?
 FollowingLinksArePublic=Os vínculos seguintes são páginas acessiveis a todos e não protegidas por Nenhuma habilitação Dolibarr.
 PublicMemberList=Lista pública de Membros
 BlankSubscriptionForm=Public self-subscription form
@@ -108,17 +106,33 @@ PublicMemberCard=Ficha pública do membro
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Mostrar filiação
-SendAnEMailToMember=Enviar e-mail de informação à membro (E-mail: <b>%s</b>)
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Conteúdo do seu cartão de membro
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assunto do e-mail recebido em caso de auto-inscrição de um convidado
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recebido em caso de auto-inscrição de um convidado
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail assunto para autosubscription membro
-DescADHERENT_AUTOREGISTER_MAIL=E-mail para autosubscrição membro
-DescADHERENT_MAIL_VALID_SUBJECT=assunto do e-mail  de validação de membro
-DescADHERENT_MAIL_VALID=E-mail de validação de membro
-DescADHERENT_MAIL_COTIS_SUBJECT=assunto do e-mail de validação de cotação
-DescADHERENT_MAIL_COTIS=E-mail de validação de uma filiação
-DescADHERENT_MAIL_RESIL_SUBJECT=assunto de e-mail de baixa
-DescADHERENT_MAIL_RESIL=E-mail de baixa
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=E-mail emissor para os e-mails automáticos
 DescADHERENT_ETIQUETTE_TYPE=Formato etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto impresso na folhas de endereços dos membros
@@ -177,3 +191,8 @@ NoVatOnSubscription=Sem TVA para assinaturas
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index d62e87b7488..a9303fc822f 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Caminho para o ficheiro pacote .zip do módulo/aplicação
 PathToModuleDocumentation=Caminho para o ficheiro de documentação do módulo/aplicação
 SpaceOrSpecialCharAreNotAllowed=Espaços ou caracteres especiais não são permitidos.
 FileNotYetGenerated=O ficheiro ainda não foi gerado
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 514b8a7c9ac..fd4b45d9820 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -28,30 +28,30 @@ SuppliersOrdersToProcess=Encomendas a fornecedores por processar
 StatusOrderCanceledShort=Anulado
 StatusOrderDraftShort=Rascunho
 StatusOrderValidatedShort=Validado
-StatusOrderSentShort=No processo
-StatusOrderSent=Expedição em processamento
+StatusOrderSentShort=Em processo
+StatusOrderSent=Expedição em processo
 StatusOrderOnProcessShort=Encomendado
 StatusOrderProcessedShort=Processado
-StatusOrderDelivered=A Facturar
-StatusOrderDeliveredShort=A Facturar
-StatusOrderToBillShort=A Facturar
+StatusOrderDelivered=Entregue
+StatusOrderDeliveredShort=Entregue
+StatusOrderToBillShort=Entregue
 StatusOrderApprovedShort=Aprovado
 StatusOrderRefusedShort=Reprovado
 StatusOrderBilledShort=Faturado
-StatusOrderToProcessShort=A Processar
-StatusOrderReceivedPartiallyShort=Recebido Parcialmente
+StatusOrderToProcessShort=Por processar
+StatusOrderReceivedPartiallyShort=Parcialmente recebido
 StatusOrderReceivedAllShort=Produtos recebidos
 StatusOrderCanceled=Anulado
-StatusOrderDraft=Rascunho (a Confirmar)
-StatusOrderValidated=Validado
+StatusOrderDraft=Rascunho (necessita de ser validada)
+StatusOrderValidated=Validada
 StatusOrderOnProcess=Encomendado - Aguarda a receção
 StatusOrderOnProcessWithValidation=Encomendada - Aguarde a receção e validação
 StatusOrderProcessed=Processado
-StatusOrderToBill=A Facturar
+StatusOrderToBill=Entregue
 StatusOrderApproved=Aprovado
-StatusOrderRefused=Reprovado
+StatusOrderRefused=Recusada
 StatusOrderBilled=Faturado
-StatusOrderReceivedPartially=Recebido Parcialmente
+StatusOrderReceivedPartially=Parcialmente recebido
 StatusOrderReceivedAll=Todos os produtos foram recebidos
 ShippingExist=Um existe um envio
 QtyOrdered=Quant. encomendada
@@ -85,7 +85,7 @@ NbOfOrders=Número de encomendas
 OrdersStatistics=Estatísticas de encomendas
 OrdersStatisticsSuppliers=Estatísticas de encomendas a fornecedores
 NumberOfOrdersByMonth=Número de encomendas por mês
-AmountOfOrdersByMonthHT=Quantia originada de encomendas, por mês (líquido)
+AmountOfOrdersByMonthHT=Quantia originada de encomendas, por mês (sem IVA)
 ListOfOrders=Lista de encomendas
 CloseOrder=Fechar encomenda
 ConfirmCloseOrder=Tem a certeza que quer sinalizar esta encomenda como entregue? Assim que uma encomenda foi entregue pode ser sinalizada com faturada.
@@ -94,7 +94,7 @@ ConfirmValidateOrder=Tem a certeza que pretende validar esta encomenda sob o nom
 ConfirmUnvalidateOrder=Tem a certeza que quer restaurar a encomenda <b>%s</b> para estado de rascunho?
 ConfirmCancelOrder=Tem a certeza que deseja cancelar esta encomenda?
 ConfirmMakeOrder=Tem a certeza que deseja confirmar que efetuou esta encomenda a <b>%s</b>?
-GenerateBill=Facturar
+GenerateBill=Gerar fatura
 ClassifyShipped=Classificar como entregue
 DraftOrders=Rascunhos de encomendas
 DraftSuppliersOrders=Rascunhos de encomendas a fornecedores
@@ -122,12 +122,12 @@ OtherOrders=Outros Pedidos
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representante que está a dar seguimento à encomenda do cliente
 TypeContact_commande_internal_SHIPPING=Representante transporte seguimento
-TypeContact_commande_external_BILLING=Contacto na factura do Cliente
+TypeContact_commande_external_BILLING=Contacto da fatura do cliente
 TypeContact_commande_external_SHIPPING=Contato com o transporte do cliente
 TypeContact_commande_external_CUSTOMER=Contacto do cliente que está a dar seguimento à encomenda
 TypeContact_order_supplier_internal_SALESREPFOLL=Representante que está a dar seguimento à encomenda ao fornecedor
 TypeContact_order_supplier_internal_SHIPPING=Representante transporte seguimento
-TypeContact_order_supplier_external_BILLING=Fornecedor Contactar com factura
+TypeContact_order_supplier_external_BILLING=Contacto da fatura do fornecedor
 TypeContact_order_supplier_external_SHIPPING=Fornecedor Contactar com transporte
 TypeContact_order_supplier_external_CUSTOMER=Contacto do fornecedor que está a dar seguimento à encomenda
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON não definida
@@ -152,7 +152,7 @@ OrderCreated=As suas encomendas foram criadas
 OrderFail=Ocorreu um erro durante a criação das suas encomendas
 CreateOrders=Criar encomendas
 ToBillSeveralOrderSelectCustomer=Para criar uma fatura para várias encomendas, clique primeiro num cliente e depois selecione "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+OptionToSetOrderBilledNotEnabled=A opção (do módulo Fluxo de Trabalho) para definir encomendas como 'Faturada' automaticamente quando a fatura é validada, está desativada. Como tal terá que definir o estado da encomenda como 'Faturada' manualmente.
+IfValidateInvoiceIsNoOrderStayUnbilled=Se a validação da fatura for 'Não', a encomenda permanecerá no estado 'Não faturada' até que a fatura seja validada.
 CloseReceivedSupplierOrdersAutomatically=Fechar encomenda para "%s" automaticamente, se todos os produtos tiverem sido recebidos.
 SetShippingMode=Defina o método de expedição
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 0e386596c15..97ddcce07d0 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -3,7 +3,7 @@ SecurityCode=Código segurança
 NumberingShort=N°
 Tools=Utilidades
 TMenuTools=Ferramentas
-ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br><br>All the tools can be reached in the left menu.
+ToolsDesc=Todas as ferramentas não incluídas noutras entradas do menu são colocadas aqui. <br><br> Todas as ferramentas podem ser alcançadas no menu à esquerda.
 Birthday=Aniversario
 BirthdayDate=Data de nascimento
 DateToBirth=Data de Nascimento
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Mensagem na página validado o pagamento de retorno
 MessageKO=Mensagem na página de pagamento cancelado retorno
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -30,7 +32,7 @@ DateNextInvoiceBeforeGen=Date of next invoice (before generation)
 DateNextInvoiceAfterGen=Date of next invoice (after generation)
 
 Notify_FICHINTER_ADD_CONTACT=Adicionado contato à intervenção
-Notify_FICHINTER_VALIDATE=Validação Ficha Intervenção
+Notify_FICHINTER_VALIDATE=Intervenção validada
 Notify_FICHINTER_SENTBYMAIL=Intervenções enviadas por correio
 Notify_ORDER_VALIDATE=Pedido do cliente validado
 Notify_ORDER_SENTBYMAIL=Pedido do cliente enviado pelo correio
@@ -38,16 +40,16 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Para fornecedor enviada por correio
 Notify_ORDER_SUPPLIER_VALIDATE=Encomenda a fornecedor registada
 Notify_ORDER_SUPPLIER_APPROVE=Fornecedor fim aprovado
 Notify_ORDER_SUPPLIER_REFUSE=Fornecedor fim recusado
-Notify_PROPAL_VALIDATE=Proposta do cliente validada
+Notify_PROPAL_VALIDATE=Orçamento validado
 Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
 Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
-Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por correio
+Notify_PROPAL_SENTBYMAIL=Orçamento enviado por correio
 Notify_WITHDRAW_TRANSMIT=Retirada de transmissão
 Notify_WITHDRAW_CREDIT=Retirada de crédito
 Notify_WITHDRAW_EMIT=Realizar a retirada
 Notify_COMPANY_CREATE=Terceiro criado
 Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_BILL_VALIDATE=Validação factura
+Notify_BILL_VALIDATE=Fatura do cliente validada
 Notify_BILL_UNVALIDATE=Fatura do cliente não validada
 Notify_BILL_PAYED=Fatura de Cliente paga
 Notify_BILL_CANCEL=Fatura do cliente cancelada
@@ -78,8 +80,8 @@ LinkedObject=Objecto adjudicado
 NbOfActiveNotifications=Número de notificações
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -104,12 +106,12 @@ ValidatedBy=Validado por %s
 ClosedBy=Fechado por %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
-ValidatedById=User id who validated
+ValidatedById=ID do utilizador que validou
 CanceledById=User id who canceled
 ClosedById=User id who closed
 CreatedByLogin=User login who created
 ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
+ValidatedByLogin=Login de utilizador que validou
 CanceledByLogin=User login who canceled
 ClosedByLogin=User login who closed
 FileWasRemoved=o Ficheiro foi eliminado
@@ -184,9 +186,9 @@ NumberOfUnitsSupplierOrders=Número de unidades em encomendas a fornecedores
 NumberOfUnitsSupplierInvoices=Número de unidades nas faturas de fornecedores
 EMailTextInterventionAddedContact=Foi atribuída uma nova intervenção, %s, a si.
 EMailTextInterventionValidated=Intervenção %s validados
-EMailTextInvoiceValidated=Factura %s validados
-EMailTextProposalValidated=O %s proposta foi validada.
-EMailTextProposalClosedSigned=The proposal %s has been closed signed.
+EMailTextInvoiceValidated=A fatura %s foi validada.
+EMailTextProposalValidated=O orçamento %s foi validado.
+EMailTextProposalClosedSigned=O orçamento %s foi fechado e assinado.
 EMailTextOrderValidated=O %s pedido foi validado.
 EMailTextOrderApproved=Pedido %s Aprovado
 EMailTextOrderValidatedBy=The order %s has been recorded by %s.
@@ -214,7 +216,8 @@ StartUpload=Iniciar upload
 CancelUpload=Cancelar upload
 FileIsTooBig=Arquivos muito grandes
 PleaseBePatient=Por favor, aguarde...
-ResetPassword=Reset password
+NewPassword=New password
+ResetPassword=Repor palavra-passe
 RequestToResetPasswordReceived=Foi recebida uma solicitação para a alteração da sua senha Dolibarr
 NewKeyIs=Estas são as suas novas credenciais para efectuar login
 NewKeyWillBe=Your new key to login to software will be
@@ -224,11 +227,11 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repositório para fontes
 Chart=Gráfico
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
+PassEncoding=Codificação de palavra-passe
+PermissionsAdd=Permissões adicionadas
+PermissionsDelete=Permissões removidas
+YourPasswordMustHaveAtLeastXChars=A sua palavra-passe deve ter pelo menos estes caracteres: <strong>%s</strong>
+YourPasswordHasBeenReset=A sua palavra-passe foi reposta com sucesso
 ApplicantIpAddress=IP address of applicant
 ##### Export #####
 ExportsArea=Área de Exportações
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL da página
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descrição
 WEBSITE_KEYWORDS=Palavras-chave
+LinesToImport=Lines to import
diff --git a/htdocs/langs/pt_PT/paypal.lang b/htdocs/langs/pt_PT/paypal.lang
index e7332848ff2..887f6bd5a25 100644
--- a/htdocs/langs/pt_PT/paypal.lang
+++ b/htdocs/langs/pt_PT/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuração do módulo do PayPal
-PaypalDesc=Esta oferta módulo de páginas para permitir o pagamento em <a href="http://www.paypal.com" target="_blank">PayPal</a> pelos clientes. Isto pode ser utilizado para um pagamento livre ou para um pagamento por um objecto Dolibarr particular (factura, ordem, ...)
+PaypalDesc=Esta oferta módulo de páginas para permitir o pagamento em <a href="http://www.paypal.com" target="_blank">PayPal</a> pelos clientes. Isto pode ser utilizado para um pagamento livre ou para um pagamento por um objeto Dolibarr particular (fatura, ordem, ...)
 PaypalOrCBDoPayment=Pagar com Paypal (Cartão de Crédito ou Paypal)
 PaypalDoPayment=Pague com Paypal
 PAYPAL_API_SANDBOX=Modo de teste / sandbox
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Apenas Paypal
 ONLINE_PAYMENT_CSS_URL=URL opcional da folha de estilo CSS na página de pagamento online
 ThisIsTransactionId=Esta é id. da transação: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Adicionar o url de pagamento Paypal quando enviar um documento por correio eletrónico
-PredefinedMailContentLink=Pode clicar na hiperligação segura abaixo para efetuar o seu pagamento (Paypal), se este ainda não tiver sido efetuado.\n\n%s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=Você está atualmente no modo %s "sandbox"
 NewOnlinePaymentReceived=Novo pagamento online recebido
 NewOnlinePaymentFailed=Novo pagamento em linha tentado, mas falhado
@@ -30,3 +30,6 @@ ErrorCode=Código de Erro
 ErrorSeverityCode=Código de Severidade do Erro
 OnlinePaymentSystem=Sistema de pagamento online
 PaypalLiveEnabled=Paypal ativado (caso contrário, este encontra-se em modo teste)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index b3a8fe305c2..2b8521f0782 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -16,9 +16,9 @@ printEatby=Data de validade: %s
 printSellby=Data de venda: %s
 printQty=Qtd.: %d
 AddDispatchBatchLine=Adicionar uma linha para o apuramento por data de validade
-WhenProductBatchModuleOnOptionAreForced=Quando o módulo Lote/Número de Série estiver ativo, o modo automático de aumento/diminuição de stock é forçado para validação de expedições e despacho manual da recepção de produtos e não pode ser editado. Outras opções podem ser definidas como você desejar.
+WhenProductBatchModuleOnOptionAreForced=Quando o módulo Lote/Número de Série estiver ativo, o modo automático de aumento/diminuição de stock é forçado para validação de expedições e despacho manual da receção de produtos e não pode ser editado. Outras opções podem ser definidas como você desejar.
 ProductDoesNotUseBatchSerial=Este produto não usa lote/número de série
 ProductLotSetup=Configuração do módulo Lote/Número de Série
 ShowCurrentStockOfLot=Mostrar o stock atual para o par produto/lote
 ShowLogOfMovementIfLot=Mostrar registo de movimentos para cada par produto/lote
-StockDetailPerBatch=Stock detail per lot
+StockDetailPerBatch=Detalhes do estoque por lote
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 400c50cbbdb..fff0e4b2c6f 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Produto ou Serviço
 ProductsAndServices=Produtos e Serviços
 ProductsOrServices=Produtos ou Serviços
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Produtos não vendidos e não disponíveis para compra
@@ -48,14 +49,14 @@ Buy=Compras
 OnSell=Em venda
 OnBuy=Comprado
 NotOnSell=Fora de Venda
-ProductStatusOnSell=Em Venda
-ProductStatusNotOnSell=Fora de Venda
-ProductStatusOnSellShort=Em Venda
-ProductStatusNotOnSellShort=Fora de venda
-ProductStatusOnBuy=Disponível
-ProductStatusNotOnBuy=Obsoleto
-ProductStatusOnBuyShort=Disponível
-ProductStatusNotOnBuyShort=Obsoleto
+ProductStatusOnSell=Para venda
+ProductStatusNotOnSell=Não é para venda
+ProductStatusOnSellShort=Para venda
+ProductStatusNotOnSellShort=Não é para venda
+ProductStatusOnBuy=Para compra
+ProductStatusNotOnBuy=Não é para compra
+ProductStatusOnBuyShort=Para compra
+ProductStatusNotOnBuyShort=Não é para compra
 UpdateVAT=Update vat
 UpdateDefaultPrice=Update default price
 UpdateLevelPrices=Update prices for each level
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Está seguro de querer eliminar esta linha de produto?
 ProductSpecial=Especial
 QtyMin=Qtd mínima
 PriceQtyMin=Preço para esta qt. mín. (s/ o desconto)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Taxa de IVA (para este fornecedor/produto)
 DiscountQtyMin=Desconto predefinido para a qt.
 NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto
@@ -138,7 +140,7 @@ ServiceNb=Serviço nº %s
 ListProductServiceByPopularity=Lista dos produtos / serviços por popularidade
 ListProductByPopularity=Lista de Produtos/Perviços por Popularidade
 ListServiceByPopularity=Lista de serviços de popularidade
-Finished=Produto Manofacturado
+Finished=Produto fabricado
 RowMaterial=Matéria Prima
 CloneProduct=Copie produto ou serviço
 ConfirmCloneProduct=Tem certeza de que deseja clonar este produto ou serviço <b>%s</b>?
@@ -272,7 +274,7 @@ IncludingProductWithTag=Including product/service with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unidade
-NbOfQtyInProposals=Qty in proposals
+NbOfQtyInProposals=Quantia nos orçamentos
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
 ProductsOrServicesTranslations=Products or services translation
 TranslatedLabel=Translated label
@@ -320,7 +322,7 @@ ProductCombinationGeneratorWarning=If you continue, before generating new varian
 TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
 DoNotRemovePreviousCombinations=Do not remove previous variants
 UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
+PercentageVariation=Variação percentual
 ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
 NbOfDifferentValues=Nb of different values
 NbProducts=Nb. of products
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 3fe3f13fa77..5ab7dc10990 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -10,14 +10,14 @@ PrivateProject=Contactos do Projeto
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Todos os Projetos
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Esta visualização apresenta todos os projetos que está autorizado a ler.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler.
 ProjectsDesc=Esta visualização apresenta todos os projetos (as suas permissões de utilizador concedem-lhe a permissão para ver tudo).
 TasksOnProjectsDesc=This view presents all tasks on 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.
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Apenas os projetos abertos estão visíveis (projetos em estado rascunho ou fechado não estão visíveis).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler.
 TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas permissões de utilizador concedem-lhe permissão para ver tudo).
@@ -33,8 +33,8 @@ ConfirmDeleteAProject=Tem certeza de que deseja eliminar este projeto?
 ConfirmDeleteATask=Tem certeza de que deseja eliminar esta tarefa?
 OpenedProjects=Open projects
 OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpportunitiesStatusForOpenedProjects=Quantia das oportunidades de projetos abertos, por estado
+OpportunitiesStatusForProjects=Quantia das oportunidades de projetos, por estado
 ShowProject=Mostrar Projeto
 ShowTask=Ver tarefa
 SetProject=Definir Projeto
@@ -42,8 +42,8 @@ NoProject=Nenhum projeto definido ou possuído
 NbOfProjects=Nr. de Projetos
 NbOfTasks=Nb of tasks
 TimeSpent=Tempo Dispendido
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Tempo gasto por você
+TimeSpentByUser=Tempo gasto pelo utilizador
 TimesSpent=Tempos Dispendidos
 RefTask=Ref. da Tarefa
 LabelTask=Etiqueta de Tarefa
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Carga de trabalho não definida
 NewTimeSpent=Tempos Dispendidos
 MyTimeSpent=Meu Tempo Dispendido
+BillTime=Bill the time spent
 Tasks=Tarefas
 Task=Tarefa
 TaskDateStart=Data de início da tarefa
@@ -78,11 +79,11 @@ GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Ir para a lista de tarefas
 GanttView=Gantt View
 ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto
-ListOrdersAssociatedProject=List of customer orders associated with the project
-ListInvoicesAssociatedProject=List of customer invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
+ListOrdersAssociatedProject=Lista de encomendas de clientes associadas ao projeto
+ListInvoicesAssociatedProject=Lista de faturas de clientes associadas ao projeto
+ListPredefinedInvoicesAssociatedProject=Lista de faturas modelo de clientes associadas ao projeto
+ListSupplierOrdersAssociatedProject=Lista de notas de encomenda de fornecedores associadas ao projeto
+ListSupplierInvoicesAssociatedProject=Lista de faturas de fornecedores associadas ao projeto
 ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
 ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
@@ -91,23 +92,25 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Lista de eventos associados ao projeto
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana
 ActivityOnProjectThisMonth=Actividade do Projecto neste Mês
 ActivityOnProjectThisYear=Actividade do Projecto neste Ano
 ChildOfProjectTask=Link do Projeto/Tarefa
-ChildOfTask=Child of task
+ChildOfTask=Filho da tarefa
+TaskHasChild=Task has child
 NotOwnerOfProject=Não é responsável por este projeto privado
 AffectedTo=Atribuido a
 CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por alguns objetos (faturas, pedidos e outros). ver lista de referencias.
-ValidateProject=Validar Projeto
-ConfirmValidateProject=Are you sure you want to validate this project?
+ValidateProject=Validar projeto
+ConfirmValidateProject=Tem certeza de que deseja validar este projeto?
 CloseAProject=Fechar projeto
-ConfirmCloseAProject=Are you sure you want to close this project?
+ConfirmCloseAProject=Tem a certeza de que deseja fechar este projeto?
 AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
-ReOpenAProject=Abrir Projeto
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ReOpenAProject=Reabrir projeto
+ConfirmReOpenAProject=Tem a certeza de que deseja reabrir este projeto?
 ProjectContact=Contactos do Projeto
 TaskContact=Task contacts
 ActionsOnProject=Ações sobre o projeto
@@ -117,7 +120,7 @@ DeleteATimeSpent=Excluir o tempo gasto
 ConfirmDeleteATimeSpent=Tem certeza de que deseja eliminar este tempo gasto?
 DoNotShowMyTasksOnly=Ver também as tarefas não me atribuidas
 ShowMyTasksOnly=Ver só as tarefas que me foram atribuídas
-TaskRessourceLinks=Contacts task
+TaskRessourceLinks=Tarefa de contactos
 ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
 NoTasks=Não existem tarefas para este projeto
 LinkedToAnotherCompany=Vinculado a Terceiros
@@ -131,18 +134,19 @@ CloneContacts=Clonar contactos
 CloneNotes=Clonar notas
 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 dates according to new project start date
+CloneMoveDate=Atualizar as datas dos projetos/tarefas a partir de agora?
+ConfirmCloneProject=Tem a certeza de que deseja clonar este projeto?
+ProjectReportDate=Alterar as datas das tarefas de acordo com a nova data de início do projeto
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projetos e tarefas
 ProjectCreatedInDolibarr=Projeto %s criado
+ProjectValidatedInDolibarr=Projeto %s validado
 ProjectModifiedInDolibarr=Projeto %s, modificado
 TaskCreatedInDolibarr=%s tarefas criadas
 TaskModifiedInDolibarr=%s tarefas modificadas
 TaskDeletedInDolibarr=%s tarefas apagadas
-OpportunityStatus=Opportunity status
-OpportunityStatusShort=Opp. status
+OpportunityStatus=Estado da oportunidade
+OpportunityStatusShort=Estado da Opu.
 OpportunityProbability=Opportunity probability
 OpportunityProbabilityShort=Opp. probab.
 OpportunityAmount=Opportunity amount
@@ -185,12 +189,12 @@ SelectTaskToAssign=Select task to assign...
 AssignTask=Atribuir 
 ProjectOverview=Resumo
 ManageTasks=Use projects to follow tasks and time
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ManageOpportunitiesStatus=Usar projetos para seguir leads/oportunidades
 ProjectNbProjectByMonth=Nb of created projects by month
 ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
-ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
+ProjectOpenedProjectByOppStatus=Projeto/lead aberto, por estado de oportunidade
 ProjectsStatistics=Statistics on projects/leads
 TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=O projeto %s deve estar ativo para ser desativado
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
index 45f3cb1a652..7195490b3f6 100644
--- a/htdocs/langs/pt_PT/propal.lang
+++ b/htdocs/langs/pt_PT/propal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - propal
 Proposals=Orçamentos
 Proposal=Orçamento
-ProposalShort=Proposta
+ProposalShort=Orçamento
 ProposalsDraft=Orçamentos Rascunho
 ProposalsOpened=Orçamentos a clientes abertos
 CommercialProposal=Orçamento
@@ -11,7 +11,7 @@ NewProp=Novo Orçamento
 NewPropal=Novo Orçamento
 Prospect=Cliente Potencial
 DeleteProp=Eliminar Orçamento
-ValidateProp=Confirmar Orçamento
+ValidateProp=Validar orçamento
 AddProp=Criar orçamento
 ConfirmDeleteProp=Tem a certeza que pretende eliminar este orçamento?
 ConfirmValidateProp=Tem certeza de que deseja validar este orçamento com o nome <b>%s</b>?
@@ -26,24 +26,25 @@ AmountOfProposalsByMonthHT=Montante por Mês (sem IVA)
 NbOfProposals=Número Orçamentos
 ShowPropal=Ver Orçamento
 PropalsDraft=Rascunho
-PropalsOpened=Abrir
-PropalStatusDraft=Rascunho (a Confirmar)
+PropalsOpened=Aberta
+PropalStatusDraft=Rascunho (precisa de ser validado)
 PropalStatusValidated=Validado (o orçamento está aberto)
-PropalStatusSigned=Assinado (a facturar)
+PropalStatusSigned=Assinado (por faturar)
 PropalStatusNotSigned=Sem Assinar (Fechado)
-PropalStatusBilled=Facturado
+PropalStatusBilled=Faturado
 PropalStatusDraftShort=Rascunho
+PropalStatusValidatedShort=Validado
 PropalStatusClosedShort=Fechado
 PropalStatusSignedShort=Assinado
-PropalStatusNotSignedShort=Sem Assinar
-PropalStatusBilledShort=Facturado
+PropalStatusNotSignedShort=Não assinado
+PropalStatusBilledShort=Faturado
 PropalsToClose=Orçamento a Fechar
-PropalsToBill=Orçamentos Assinados a Facturar
+PropalsToBill=Orçamentos assinados por faturar
 ListOfProposals=Lista de Orçamentos
 ActionsOnPropal=Acções sobre o Orçamento
 RefProposal=Ref. Orçamento
 SendPropalByMail=Enviar Orçamento por E-mail
-DatePropal=Data da proposta
+DatePropal=Data do orçamento
 DateEndPropal=Válido até
 ValidityDuration=Duração da Validade
 CloseAs=Definir estado como
@@ -55,15 +56,15 @@ CopyPropalFrom=Criar orçamento por Cópia de um existente
 CreateEmptyPropal=Criar orçamento desde a Lista de produtos predefinidos
 DefaultProposalDurationValidity=Prazo de validade por defeito (em días)
 UseCustomerContactAsPropalRecipientIfExist=Utilizar morada contacto de seguimiento de cliente definido em vez da morada do Terceiro como destinatario dos Orçamentos
-ClonePropal=Copiar Proposta Comercial
+ClonePropal=Clonar orçamento
 ConfirmClonePropal=Tem a certeza de que deseja clonar o orçamento <b>%s</b>?
 ConfirmReOpenProp=Tem a certeza de que deseja reabrir or orçamento <b>%s</b>?
-ProposalsAndProposalsLines=Proposta comercial e linhas
-ProposalLine=Proposta linha
+ProposalsAndProposalsLines=Orçamento e linhas do orçamento
+ProposalLine=Linha do orçamento
 AvailabilityPeriod=Disponibilidade atraso
 SetAvailability=Definir atraso disponibilidade
 AfterOrder=após a ordem
-OtherProposals=Outros Orçamentos
+OtherProposals=Outros orçamentos
 ##### Availability #####
 AvailabilityTypeAV_NOW=Imediato
 AvailabilityTypeAV_1W=1 semana
@@ -71,13 +72,13 @@ AvailabilityTypeAV_2W=2 semanas
 AvailabilityTypeAV_3W=3 semanas
 AvailabilityTypeAV_1M=1 mês
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representante proposta seguimento
-TypeContact_propal_external_BILLING=contacto na factura do Cliente
-TypeContact_propal_external_CUSTOMER=Atendimento ao cliente seguinte proposta-up
+TypeContact_propal_internal_SALESREPFOLL=Representante que dá seguimento ao orçamento
+TypeContact_propal_external_BILLING=Contacto na fatura do cliente
+TypeContact_propal_external_CUSTOMER=Contacto do cliente que dá seguimento ao orçamento
 # Document models
 DocModelAzurDescription=Modelo de orçamento completo (logo...)
 DefaultModelPropalCreate=Criação do modelo padrão
-DefaultModelPropalToBill=Modelo padrão ao fechar uma proposta de negócio (a facturar)
-DefaultModelPropalClosed=Modelo padrão ao fechar uma proposta de negócio (não faturada)
+DefaultModelPropalToBill=Modelo padrão ao fechar um orçamento (a faturar)
+DefaultModelPropalClosed=Modelo padrão ao fechar um orçamento (não faturada)
 ProposalCustomerSignature=Aceitação escrita, carimbo da empresa, data e assinatura
 ProposalsStatisticsSuppliers=Estatísticas dos orçamentos dos fornecedores
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index 964e3fa5904..9414ac2143d 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contabilística usada para terceiros
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=A conta contabilidade definida na ficha do utilizador será usada apenas para o Livro Auxiliar de contabilidade. Este será usado para o Livro Razão e como valor padrão da contabilidade do Livro Auxiliar se a conta de contabilidade do utilizador não estiver definida.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta contabilística usada por defeito para pagamentos de salários
 Salary=Salário
 Salaries=Salários
 NewSalaryPayment=Novo Pagamento de Salário
@@ -15,3 +15,4 @@ THMDescription=Esse valor pode ser usado para calcular o custo do tempo consumid
 TJMDescription=Esse valor é atualmente serve apenas como informação e não é utilizado em qualquer cálculo
 LastSalaries=Últimos %s pagamentos salariais
 AllSalaries=Todos os pagamentos salariais
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 0c1c48692a2..1d8df148b7e 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=Todos os Despachos
 Shipment=Envio
 Shipments=Envios
 ShowSending=Mostrar Despachos
-Receivings=Delivery Receipts
+Receivings=Receção de encomendas
 SendingsArea=Área de Envios
 ListOfSendings=Lista de Envios
 SendingMethod=Método de Envio
@@ -26,8 +26,8 @@ QtyInOtherShipments=Qty in other shipments
 KeepToShip=Remain to ship
 KeepToShipShort=Remain
 OtherSendingsForSameOrder=Outros Envios deste Pedido
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
-SendingsToValidate=Envios a Confirmar
+SendingsAndReceivingForSameOrder=Envios e receções para esta encomenda
+SendingsToValidate=Expedições por validar
 StatusSendingCanceled=Cancelado
 StatusSendingDraft=Rascunho
 StatusSendingValidated=Validado (produtos a enviar ou enviados)
@@ -37,7 +37,7 @@ StatusSendingValidatedShort=Validado
 StatusSendingProcessedShort=Processado
 SendingSheet=Shipment sheet
 ConfirmDeleteSending=Tem certeza de que deseja eliminar esta expedição?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmValidateSending=Tem a certeza de que deseja validar esta expedição com a referência <b> %s </b>?
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Mérou modelo A5
 WarningNoQtyLeftToSend=Atenção, não existe qualquer produto à espera de ser enviado.
@@ -58,7 +58,7 @@ ProductQtyInShipmentAlreadySent=Product quantity from open customer order alread
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+ValidateOrderFirstBeforeShipment=Deve validar a encomenda antes de poder efetuar expedições.
 
 # Sending methods
 # ModelDocument
diff --git a/htdocs/langs/pt_PT/sms.lang b/htdocs/langs/pt_PT/sms.lang
index 07094489179..a163a8d9f42 100644
--- a/htdocs/langs/pt_PT/sms.lang
+++ b/htdocs/langs/pt_PT/sms.lang
@@ -34,7 +34,7 @@ SmsStatusSent=Enviado
 SmsStatusSentPartialy=Enviado parcialmente
 SmsStatusSentCompletely=Enviado completamente
 SmsStatusError=Erro
-SmsStatusNotSent=Não enviou
+SmsStatusNotSent=Não enviado
 SmsSuccessfulySent=Sms enviada corretamente (de %s a %s)
 ErrorSmsRecipientIsEmpty=Número de destino está vazio
 WarningNoSmsAdded=Novo número de telefone para adicionar à lista de alvos
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 56927d296e1..c94f9999a00 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modificar armazém
 MenuNewWarehouse=Novo Armazem
 WarehouseSource=Armazem Origem
 WarehouseSourceNotDefined=Sem armazém definido
+AddWarehouse=Create warehouse
 AddOne=Adicionar um
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Armazem Destino
 ValidateSending=Confirmar Envío
 CancelSending=Cancelar Envío
@@ -22,6 +24,7 @@ Movements=Movimentos
 ErrorWarehouseRefRequired=O nome de referencia do armazem é obrigatório
 ListOfWarehouses=Lista de Armazens
 ListOfStockMovements=Lista de movimentos de stock
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
@@ -56,17 +59,17 @@ IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantidade desagregada
 QtyDispatchedShort=Qt. despachada
 QtyToDispatchShort=Qt. a despachar
-OrderDispatch=Item receipts
+OrderDispatch=Receção da encomenda
 RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
 RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrementar os stocks físicos ao validar faturas/recibos
-DeStockOnValidateOrder=Decrementar os stocks físicos sobre os pedidos
-DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnBill=Diminuir stocks reais ao validar faturas/notas de crédito de clientes
+DeStockOnValidateOrder=Diminuir stocks reais ao validar encomendas para clientes
+DeStockOnShipment=Diminuir stocks reais ao validar a expedição
 DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
 ReStockOnBill=Incrementar os stocks físicos ao validar faturas/recibos
 ReStockOnValidateOrder=Incrementar os stocks físicos sobre os pedidos
 ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
-OrderStatusNotReadyToDispatch=Pedido não está pronto para despacho.
+OrderStatusNotReadyToDispatch=A encomenda não está pronta para o despacho dos produtos no stock dos armazéns.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Nenhum produto predefinido para este objeto. Portanto, não é necessário enviar despachos em stock.
 DispatchVerb=Expedição
@@ -124,7 +127,7 @@ NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (>
 MassMovement=Mass 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 transfer
-ReceivingForSameOrder=Receipts for this order
+ReceivingForSameOrder=Receções para esta encomenda
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
 StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
@@ -157,7 +160,7 @@ inventorySetup = Inventory Setup
 inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
+inventoryValidatePermission=Validar inventário
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
diff --git a/htdocs/langs/pt_PT/stripe.lang b/htdocs/langs/pt_PT/stripe.lang
index 9c4de6adcea..81d46eb1ae1 100644
--- a/htdocs/langs/pt_PT/stripe.lang
+++ b/htdocs/langs/pt_PT/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=Novo pagamento Stripe recebido
 NewStripePaymentFailed=Nova tentativa de pagamento Stripo, mas falhou
 STRIPE_TEST_SECRET_KEY=Chave de teste secreta
 STRIPE_TEST_PUBLISHABLE_KEY=Chave de teste publicável
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Criar cliente no Stripe
+CreateCardOnStripe=Criar ficha no Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/pt_PT/supplier_proposal.lang b/htdocs/langs/pt_PT/supplier_proposal.lang
index b98e828cd8a..60d097fde28 100644
--- a/htdocs/langs/pt_PT/supplier_proposal.lang
+++ b/htdocs/langs/pt_PT/supplier_proposal.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
+SupplierProposal=Orçamentos de fornecedores
 supplier_proposalDESC=Gerir pedidos de preço aos fornecedores
 SupplierProposalNew=Novo pedido de preço
 CommRequest=Preço solicitado
 CommRequests=Preços solicitados
 SearchRequest=Encontrar um pedido
 DraftRequests=Pedidos rascunho
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Rascunhos de orçamentos de fornecedores
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Abrir pedidos de preço
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
+SupplierProposalArea=Área de orçamentos de fornecedores
+SupplierProposalShort=Orçamento do fornecedor
 SupplierProposals=Orçamentos de fornecedores
 SupplierProposalsShort=Orçamentos de fornecedores
 NewAskPrice=Novo pedido de preço
@@ -19,11 +19,11 @@ AddSupplierProposal=Create a price request
 SupplierProposalRefFourn=Supplier ref
 SupplierProposalDate=Data de Envio
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+ConfirmValidateAsk=Tem a certeza que pretende validar este pedido de preço com o nome <b> %s </b>?
 DeleteAsk=Eliminar pedido
 ValidateAsk=Validar pedido
-SupplierProposalStatusDraft=Rascunho (a Confirmar)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusDraft=Rascunho (precisa de ser validado)
+SupplierProposalStatusValidated=Validado (pedido aberto)
 SupplierProposalStatusClosed=Fechado
 SupplierProposalStatusSigned=Aceite
 SupplierProposalStatusNotSigned=Recusado
@@ -47,9 +47,9 @@ CommercialAsk=Pedido de preço
 DefaultModelSupplierProposalCreate=Criação do modelo padrão
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+ListOfSupplierProposals=Lista de orçamentos de fornecedores
+ListSupplierProposalsAssociatedProject=Lista de orçamentos de fornecedores associados ao projeto
+SupplierProposalsToClose=Orçamentos de fornecedores por fechar
+SupplierProposalsToProcess=Orçamentos de fornecedores por processar
 LastSupplierProposals=Latest %s price requests
 AllPriceRequests=All requests
diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang
index f3a63e21817..3ed0ee808e3 100644
--- a/htdocs/langs/pt_PT/trips.lang
+++ b/htdocs/langs/pt_PT/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=Novo relatório de despesas
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Quantidade de Quilómetros
 DeleteTrip=Apagar relatório de despesas
 ConfirmDeleteTrip=Tem certeza de que deseja eliminar este relatório de despesas?
@@ -21,17 +21,17 @@ ListToApprove=A aguardar aprovação
 ExpensesArea=Expense reports area
 ClassifyRefunded=Classificar como 'Reembolsado'
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Pessoa para informar para validação.
 TripSociete=Informação da Empresa
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Número do intervalo predefinido
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
@@ -96,7 +97,7 @@ DATE_PAIEMENT=Data de pagamento
 BROUILLONNER=Reabrir
 ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Validar e submeter para aprovação 
-ValidatedWaitingApproval=Validated (waiting for approval)
+ValidatedWaitingApproval=Validado (aguarda aprovação)
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
 ConfirmRefuseTrip=Are you sure you want to deny this expense report?
 ValideTrip=Aprovar relatório de despesas
@@ -107,7 +108,7 @@ ConfirmCancelTrip=Are you sure you want to cancel this expense report?
 BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
 SaveTrip=Validar relatório de despesas
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
+ConfirmSaveTrip=Tem a certeza de que deseja validar este relatório de despesas?
 NoTripsToExportCSV=nenhum relatório de despesas para exportar para este período.
 ExpenseReportPayment=Expense report payment
 ExpenseReportsToApprove=Expense reports to approve
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 07b46602bfa..8f14c13f796 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -6,7 +6,7 @@ Permission=Permissão
 Permissions=Permissões
 EditPassword=Editar Palavra-passe
 SendNewPassword=Regenerar e Enviar a Palavra-passe
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Enviar link para restaurar a palavra-passe
 ReinitPassword=Regenerar Palavra-passe
 PasswordChangedTo=Palavra-passe alterada em: %s
 SubjectNewPassword=A sua nova palavra-passa para %s
@@ -42,11 +42,11 @@ FirstName=Nome
 ListOfGroups=Lista de Grupos
 NewGroup=Novo Grupo
 CreateGroup=Criar Grupo
-RemoveFromGroup=Apagar Grupo
+RemoveFromGroup=Remover do grupo
 PasswordChangedAndSentTo=Palavra-passe alterada e enviada para <b>%s</b>.
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=Pedido para alterar a palavra-passe a <b> %s </b>
 PasswordChangeRequestSent=Pedido para alterar a palavra-passe para <b>%s</b> enviada para <b>%s</b>.
-ConfirmPasswordReset=Confirm password reset
+ConfirmPasswordReset=Confirmar restauração da palavra-passe
 MenuUsersAndGroups=Utilizadores e Grupos
 LastGroupsCreated=Os últimos %s grupos criados
 LastUsersCreated=Os últimos %s utilizadores criados
@@ -69,8 +69,8 @@ InternalUser=Utilizador Interno
 ExportDataset_user_1=Utilizadores e Propriedades do Dolibarr
 DomainUser=Utilizador de Domínio %s
 Reactivate=Reativar
-CreateInternalUserDesc=Este formulário permite que você crie um utilizador interno para a sua empresa/organização. Para criar um utilizador externo (cliente, fornecedor; terceiro), utilize o botão "Criar utilizador Dolibarr" a partir da ficha de contacto do terceiro.
-InternalExternalDesc=Um utilizador <b>interno</b> é um utilizador que faz parte da sua empresa/organização. <br>Um utilizador <b>externo</b> é um cliente, fornecedor ou outro (terceiro). <br><br>Em ambos casos, as permissões definem direitos no Dolibarr, e utilizadores externos podem ter um gestor de menu distinto do utilizador interno (Consulte: Início - Configuração - Interface)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertenece o utilizador.
 Inherited=Herdado
 UserWillBeInternalUser=O utilizador criado irá ser um utilizador interno (porque não está interligado com um terceiro em particular)
@@ -93,6 +93,7 @@ NameToCreate=Nome do Terceiro a Criar
 YourRole=As suas funções
 YourQuotaOfUsersIsReached=A sua quota de utilizadores ativos foi atingida!
 NbOfUsers=N º de Utilizadores
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Apenas um superadmin pode desclassificar um superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Visualização Hierárquica
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index a860b78f5c8..cf74b572dc6 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Crie aqui as entradas e o número de diferentes sites da Web qu
 DeleteWebsite=Eliminar site da Web
 ConfirmDeleteWebsite=Tem a certeza que deseja eliminar este site da Web. Também irão ser removidos todas as suas páginas e conteúdo.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Nome/pseudonimo da página
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL do ficheiro CSS externo
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Ver página no novo separador
 SetAsHomePage=Definir como página Inicial
 RealURL=URL Real
 ViewWebsiteInProduction=Ver site no utilizando URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Pré-visualizar %s num separador novo.<br><br>O %s será servido por um servidor web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes para apontar para a diretoria:<br><strong>%s</strong><br> URL servido por servidor externo:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Ler
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,12 +61,24 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccounts=Contas do website
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 06b24cb1c45..81be5830a28 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Para processar
 WithdrawalsReceipts=Encomenda de débito direto
@@ -38,20 +38,20 @@ WithdrawalRefused=Levantamento rejeitado
 WithdrawalRefusedConfirm=Tem certeza que quer entrar com uma rejeição de levantamento para a sociedade
 RefusedData=Data de rejeição
 RefusedReason=Motivo da rejeição
-RefusedInvoicing=Faturamento da rejeição
-NoInvoiceRefused=Sem factura Cliente, rejeitada
+RefusedInvoicing=Faturação da rejeição
+NoInvoiceRefused=Não cobrar a rejeição
 InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
-StatusWaiting=Espera
-StatusTrans=Transmitido
+StatusDebitCredit=Estado do débito/crédito
+StatusWaiting=Em espera
+StatusTrans=Enviado
 StatusCredited=Creditado
 StatusRefused=Rejeitado
-StatusMotif0=Indefinido
-StatusMotif1=Provisão insuffisante
-StatusMotif2=conteste Tirage
-StatusMotif3=No direct debit payment order
-StatusMotif4=Encomendas
-StatusMotif5=RIB inexploitable
+StatusMotif0=Não especificado
+StatusMotif1=Fundos insuficientes
+StatusMotif2=Pedido contestado
+StatusMotif3=Nenhum pedido de pagamento por débito direto
+StatusMotif4=Encomenda de cliente
+StatusMotif5=RIB inutilizável
 StatusMotif6=Conta sem saldo
 StatusMotif7=Decisão Judicial
 StatusMotif8=Outro motivo
@@ -70,15 +70,15 @@ BankToReceiveWithdraw=Bank account to receive direct debit
 CreditDate=Crédito em
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mostrar levantamento
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se não tiver factura, pelo menos, um pagamento levantamento ainda processado, que não irá ser definido como pago para permitir o levantamento antes de administrar.
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se a fatura tiver pelo menos um pagamento ainda não processado, não será definida como paga para permitir o gestão do pagamento anterior.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=arquivo retirado
-SetToStatusSent=Definir o estado como "arquivo enviado"
+SetToStatusSent=Definir o estado como "Ficheiro Enviado"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Criar ficheiro de débito direto
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 12520462065..3fac49d0d52 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Plan de conturi
 CurrentDedicatedAccountingAccount=Cont curent dedicat
 AssignDedicatedAccountingAccount=Cont nou pentru alocare
 InvoiceLabel=Etichetă de factură
-OverviewOfAmountOfLinesNotBound=Prezentare generală a valorii liniilor care nu sunt asociate unui cont contabil
-OverviewOfAmountOfLinesBound=Prezentare generală a valorii liniilor deja asociate unui cont contabil
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Alte informații
 DeleteCptCategory=Eliminați contul contabil din grup
 ConfirmDeleteCptCategory=Sigur doriți să eliminați acest cont contabil din grupul de cont contabil?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Contul contabil implicit pentru serviciile vând
 Doctype=Tipul documentului
 Docdate=Data
 Docref=Referinţă
-Code_tiers=Terţ
 LabelAccount=Etichetă cont
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Anul pentru ștergere
 DelJournal=Jurnalul de șters
 ConfirmDeleteMvt=Aceasta va șterge toate liniile din Cartea Mare pentru anul și / sau dintr-un anumit jurnal. Este necesar cel puțin un criteriu.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Ștergeți înregistrarea Cărții Mari
 FinanceJournal=Jurnal Bancă
 ExpenseReportsJournal=Jurnalul rapoartelor de cheltuieli
 DescFinanceJournal=Jurnal de finanțe, care include toate tipurile de plăți prin cont bancar
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Contul de TVA nu a fost definit
 ThirdpartyAccountNotDefined=Contul pentru o terță parte nu este definit
 ProductAccountNotDefined=Contul pentru produs nu este definit
 FeeAccountNotDefined=Contul pentru taxă nu este definit
 BankAccountNotDefined=Contul pentru bancă nu este definit
 CustomerInvoicePayment=Incasare factura client
-ThirdPartyAccount=Cont terţi
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Tranzacție nouă
 NumMvts=Numărul tranzacției
 ListeMvts=Lista mișcărilor
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil,
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Card asociat
 GeneralLedgerIsWritten=Tranzacțiile sunt scrise în Cartea Mare
-GeneralLedgerSomeRecordWasNotRecorded=Unele tranzacții nu au putut fi expediate. Dacă nu există niciun alt mesaj de eroare, probabil că acestea au fost expediate.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=Lista produselor care nu sunt asociate unui cont contabil
 ChangeBinding=Schimbați asocierea
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Aplica categorii bulk
@@ -234,13 +234,15 @@ AccountingJournal=Jurnalul contabil
 NewAccountingJournal=Jurnal contabil nou
 ShowAccoutingJournal=Arătați jurnalul contabil
 Nature=Personalitate juridică
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Vânzări
 AccountingJournalType3=Achiziţii
 AccountingJournalType4=Banca
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Are nou
 ErrorAccountingJournalIsAlreadyUse=Acest jurnal este deja folosit
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Câțiva pași obligatorii de configurare nu au fost făcuți, vă rugăm să-i completați
 ErrorNoAccountingCategoryForThisCountry=Nu există un grup de conturi contabile disponibil pentru țara %s (Consultați Acasă - Configurare - Dicționare)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Formatul exportat nu este suportat in aceasta pagina
 BookeppingLineAlreayExists=Linii deja existente în contabilitate
 NoJournalDefined=Nici un jurnal nu a fost definit
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index c6f3dcf2d17..a71415d450e 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Eroare, nu se poate folosi opțiunea  @ resetează
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Eroare, nu poate utilizator @ opţiune dacă secvenţa (aa) (mm) sau (AAAA) (mm) nu este în masca.
 UMask=UMask parametru pentru noi imagini pe Unix / Linux / BSD sistem de fişiere.
 UMaskExplanation=Acest parametru permite să se definească permissions stabilit, în mod implicit pe fişierele create de Dolibarr pe server (în timpul de încărcare, de exemplu). <br> Acesta trebuie să fie de octal valoare (de exemplu, 0666 înseamnă citi şi scrie pentru toată lumea). <br> Ce paramtre ne sert pas sous un serveur Windows.
-SeeWikiForAllTeam=Aruncati o privire la pagina de wiki pentru lista completă a tuturor actorilor şi organizarea lor
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Întârziere pentru caching de export de răspuns în câteva secunde (0 sau gol pentru nici un cache)
 DisableLinkToHelpCenter=Ascundere link-ul <b>"Aveţi nevoie de ajutor sau sprijin"</b> de la pagina de login
 DisableLinkToHelp=Ascunde link-ul Ajutor Online "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modifică la prețuri cu valoarea de referință de bază
 MassConvert=Lansare convertire în masă
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Întreg
 Float=Float
 DateAndTime=Data şi ora
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Căsuțele de selectare din tabel
 ExtrafieldLink=Link către un obiect
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Bibliotecă utilizată pentru generarea PDF-urilor
-WarningUsingFPDF=Atenție: <b>conf.php</b> contine Directiva <b>dolibarr_pdf_force_fpdf = 1.</b> Acest lucru înseamnă că utilizați biblioteca FPDF pentru a genera fișiere PDF. Această bibliotecă este vechi și nu suportă o mulțime de caracteristici (Unicode, transparența imagine, cu litere chirilice, limbi arabe și asiatice, ...), astfel încât este posibil să apară erori în timpul generație PDF. <br> Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , atunci comentariu sau elimina linia <b>$ dolibarr_pdf_force_fpdf = 1,</b> și se adaugă în schimb <b>$ dolibarr_lib_TCPDF_PATH = &#39;path_to_TCPDF_dir&#39;</b>
 LocalTaxDesc=Unele țări aplică 2 sau 3 taxe pe fiecare linie de facturare. Dacă este cazul, alegeți tipul pentru al doilea și al treilea impozit și rata sa. Tipul posibil sunt: ​​<br> 1: taxa locală se aplică produselor și serviciilor fără TVA (taxa locala se calculează pe valoare fără taxă) <br> 2: taxa locală se aplică produselor și serviciilor, inclusiv TVA (taxa locala se calculează în funcție de valoare+ taxa principala ) <br> 3: taxa locală se aplică produselor fără TVA (taxa locala se calculează în funcție de valoare fără taxa) <br> 4: taxa locală se aplică produselor care includ tva (taxa locala se calculează în funcție de valoare+ tva principală) <br> 5: taxa locala se aplică serviciilor fără TVA (taxa locala se calculează pe valoarea fără taxă) <br> 6: taxa locală se aplică serviciilor, inclusiv TVA (taxa locala se calculează pe valoare+ taxă)
 SMS=SMS
 LinkToTestClickToDial=Introduceți un număr de telefon pentru a afișa un link de test ClickToDial  Url pentru utilizatorul<strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Utilizatori & grupuri
 Module0Desc=Managementul Utilizatorilor/Angajaților și Grupurilor
@@ -619,6 +622,8 @@ Module59000Name=Marje
 Module59000Desc=Modul management marje
 Module60000Name=Comisioane
 Module60000Desc=Modul management comisioane
+Module62000Name=Incoterm
+Module62000Desc=Adaugă functionalitati  pentru  gestionarea  Incoterm
 Module63000Name=Resurse
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Citeşte facturi
@@ -833,11 +838,11 @@ Permission1251=Run masa importurile de date externe în baza de date (date de sa
 Permission1321=Export client facturi, atribute şi plăţile
 Permission1322=Reopen a paid bill
 Permission1421=Export client ordinele şi atribute
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Crează/modifică cererile tale de concediu
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Şterge cererile de concediu
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Creaează/modifică toate cererile de concediu 
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Citeste Joburi programate
 Permission23002=Creare/Modificare job programat
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Valoarea timbrelor fiscale
 DictionaryPaymentConditions=Conditiile de plata
 DictionaryPaymentModes=Moduri plată
 DictionaryTypeContact=Tipuri Contact/adresă
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (DEEE)
 DictionaryPaperFormat=Formate hârtie
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=TVA-ul de management
 VATIsUsedDesc=În mod implicit, când se creează perspective, facturi, comenzi etc., rata TVA respectă regula standard activă: <br> Dacă vânzătorul nu este supus TVA, valoarea TVA este implicit 0. Sfârșitul regulii. <br> Dacă (țara de vânzare = tara de cumpărare), atunci TVA-ul este implicit egal cu TVA-ul produsului în țara de vânzare. Sfârșitul regulii. <br> Dacă vânzătorul și cumpărătorul sunt ambele în Comunitatea Europeană, iar bunurile sunt produse de transport (mașină, navă, avion), TVA-ul implicit este 0 (TVA trebuie plătit de cumpărător la vama țării sale și nu la vânzător). Sfârșitul regulii. <br> Dacă vânzătorul și cumpărătorul sunt ambele în Comunitatea Europeană, iar cumpărătorul nu este o companie, atunci TVA-ul este implicit TVA-ul produsului vândut. Sfârșitul regulii. <br> Dacă vânzătorul și cumpărătorul sunt ambii în Comunitatea Europeană, iar cumpărătorul este o companie, atunci TVA este 0 în mod prestabilit. Sfârșitul regulii. <br> În orice alt caz, valoarea implicită propusă este TVA = 0. Sfârșitul regulii.
 VATIsNotUsedDesc=În mod implicit propuse de TVA este 0, care poate fi utilizat pentru cazuri ca asociaţiile, persoane fizice ou firme mici.
-VATIsUsedExampleFR=În Franţa, aceasta înseamnă societăţilor sau organizaţiilor care au un real sistemului fiscal (Simplified reale sau normale de real). Un sistem în care TVA-ul este declarat.
-VATIsNotUsedExampleFR=În Franţa, înseamnă că asociaţiile care nu sunt declarate de TVA sau de companii, organizaţii sau profesiilor liberale care au ales de micro-întreprindere sistemului fiscal (TVA în franciză) şi a plătit o franciza de TVA, fără nici o declaraţie de TVA. Această opţiune va afişa de referinţă "nu se aplică TVA - art-293B din CGI" pe facturi.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rată
 LocalTax1IsNotUsed=Nu utilizează taxa secundă
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver de tip
 SummarySystem=Sistemul de informaţii rezumat
 SummaryConst=Lista tuturor Dolibarr setarea parametrilor
-MenuCompanySetup=Companie / Organizație
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Manager meniul Standard
 DefaultMenuSmartphoneManager=Manager meniul  Smartphone
 Skin=Tema vizuală
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Formular de căutare permanent in meniu din  stânga
 DefaultLanguage=Limba folosita  implicit (cod limba)
 EnableMultilangInterface=Activaţi multilingv interfaţă
 EnableShowLogo=Afişare logo în meniul stânga
-CompanyInfo=Informații despre companie / organizație
-CompanyIds=Identitatea companiei / organizației
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Nume
 CompanyAddress=Adresă
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Parametrii de configurare pot fi setați numai de <b> utilizato
 SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit doar în modul şi vizibil doar pentru administratori.
 SystemAreaForAdminOnly=Această zonă este disponibil numai pentru utilizatorii de administrator. Nici una din Dolibarr permisiunile pot reduce această limită.
 CompanyFundationDesc=Editați pe această pagină toate informațiile cunoscute ale companiei sau fundației pe care trebuie să o gestionați (Pentru aceasta, faceți clic pe "Modificare" sau "Salvare", butonul din partea de jos a paginii)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Puteţi alege fiecare parametru legate de Dolibarr aspect aici
 AvailableModules=Available app/modules
 ToActivateModule=Pentru a activa modulele, du-te la zona de configurare.
@@ -1441,6 +1448,9 @@ SyslogFilename=Nume fişier şi calea
 YouCanUseDOL_DATA_ROOT=Puteţi folosi DOL_DATA_ROOT / dolibarr.log pentru un fişier de log în Dolibarr "Documente" director. Aveţi posibilitatea să setaţi o altă cale de a păstra acest fişier.
 ErrorUnknownSyslogConstant=Constant %s nu este un cunoscut syslog constant
 OnlyWindowsLOG_USER=Windows suportă numai LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donatii modul de configurare
 DonationsReceiptModel=Format de donatie la primirea
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Modul de configurare pentru impozite, taxe sociale sau fiscale și dividende 
 OptionVatMode=Opţiunea de exigibilit de TVA
-OptionVATDefault=Bazată pe incasări
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Bazată pe debit
 OptionVatDefaultDesc=TVA este datorată: <br> - La livrare / plăţile pentru mărfurile <br> - Privind plăţile pentru serviciile
 OptionVatDebitOptionDesc=TVA este datorată: <br> - La livrare / plăţile pentru mărfurile <br> - Pe factura (de debit) pentru serviciile
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Momentul implicit  TVA-ului exigibil pentru opțiunea selectată:
 OnDelivery=Pe  livrare
 OnPayment=Pe  plată
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Data facturii utilizat
 Buy=Cumpăra
 Sell=Vinde
 InvoiceDateUsed=Data facturii utilizat
-YourCompanyDoesNotUseVAT=Compania dvs. a fost definită să nu utilizeze TVA (Acasa- Configurare- Scoeitate/ Organizatie), astfel încât nu există opțiuni de TVA pentru configurare.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Cont vânzare. cod
 AccountancyCodeBuy=Cont cumpărare. cod
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 8366291d1d4..6b69707f879 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -12,7 +12,7 @@ Event=Eveniment
 Events=Evenimente
 EventsNb=Număr evenimente
 ListOfActions=Lista  evenimente
-EventReports=Event reports
+EventReports=Rapoarte Eveniment
 Location=Locație
 ToUserOfGroup=Oricărui utilizator din grup
 EventOnFullDay=Eveniment toat(ă)e zi(ua)lele
@@ -35,7 +35,7 @@ AgendaAutoActionDesc= Definiți aici evenimentele pentru care doriți ca Dolibar
 AgendaSetupOtherDesc= Această pagină permite configurarea unor opțiuni pentru exportul de evenimente Dolibarr într-un calendar extern (Thunderbird, Google Calendar, ...)
 AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe de calendare pentru a vedea evenimentele lor în agenda Dolibarr.
 ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
+EventRemindersByEmailNotEnabled=Evenimentul reamintire prin email nu a fost activata in Configurare Modul Agenda
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terța parte %s a fost creată
 ContractValidatedInDolibarr=Contract %s validat
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Membru %s validat
 MemberModifiedInDolibarr=Membrul %s modificat
 MemberResiliatedInDolibarr=Membru %s terminat
 MemberDeletedInDolibarr=Membru %s şters
-MemberSubscriptionAddedInDolibarr=Înscrierea pentru membrul %s adăugat
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Livrarea %s validata
 ShipmentClassifyClosedInDolibarr=Expediere %s clasificată facturată
 ShipmentUnClassifyCloseddInDolibarr=Expediere %s clasificată redeschisă
@@ -67,7 +69,7 @@ OrderApprovedInDolibarr=Comanda %s aprobată
 OrderRefusedInDolibarr=Comanda %s refuzată
 OrderBackToDraftInDolibarr=Comanda %s revenită de statutul schiţă
 ProposalSentByEMail=Oferta comercială %s  trimisă prin e-mail
-ContractSentByEMail=Contract %s sent by EMail
+ContractSentByEMail=Contract %s  trimis pe  EMail
 OrderSentByEMail=Comanda client %s trimisă prin e-mail
 InvoiceSentByEMail=Factura client %s trimisă prin e-mail
 SupplierOrderSentByEMail=Comanda  furnizor %s  trimisă prin e-mail
@@ -78,26 +80,27 @@ InterventionSentByEMail=Intervenţia %s  trimisă prin e-mail
 ProposalDeleted=Ofertă ştearsă
 OrderDeleted=Comandă ştearsă
 InvoiceDeleted=Factură ştearsă
-PRODUCT_CREATEInDolibarr=Product %s created
-PRODUCT_MODIFYInDolibarr=Product %s modified
-PRODUCT_DELETEInDolibarr=Product %s deleted
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PRODUCT_CREATEInDolibarr=Produs%s creat
+PRODUCT_MODIFYInDolibarr=Produs %s modificat
+PRODUCT_DELETEInDolibarr=Produs %s sters
+EXPENSE_REPORT_CREATEInDolibarr=Raport cheltuieli %s creat
+EXPENSE_REPORT_VALIDATEInDolibarr=Raport cheltuieli  %s validat
+EXPENSE_REPORT_APPROVEInDolibarr=Raport cheltuieli %s aprobat
+EXPENSE_REPORT_DELETEInDolibarr=Raport cheltuieli %ssters
+EXPENSE_REPORT_REFUSEDInDolibarr=Raport cheltuieli %s refuzat
 PROJECT_CREATEInDolibarr=Proiect %s creat
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
+PROJECT_MODIFYInDolibarr=Proiect %s modificat
+PROJECT_DELETEInDolibarr=Proiect %s sters
 ##### End agenda events #####
 AgendaModelModule=Șabloane de documente pentru eveniment
 DateActionStart=Data începerii
 DateActionEnd=Data terminării
 AgendaUrlOptions1=Puteţi, de asemenea, să adăugaţi următorii parametri pentru  filtrarea rezultatelor:
 AgendaUrlOptions3=<b>logind=%s</b> ​​pentru a limita exportul de acțiuni deţinute de utilizatorul <b>%s</b>
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pentru a limita exportul de acțiuni asociate la proiectul <b>PROJECT_ID</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ​​pentru a limita exportul de acțiuni deţinute de utilizatorul  <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> ​​pentru a limita exportul de acțiuni atribuite utilizatorului <b>%s</b>( proprietari sau altii).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Afişează ziua de naştere a contactelor
 AgendaHideBirthdayEvents=Ascunde ziua de naştere a contactelor
 Busy=Ocupat
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import calendare externe
 ExtSitesEnableThisTool=Afişează calendarele externe (definite in setup global) în agenda. Nu afectează calendarele externe definite de utilizatori.
 ExtSitesNbOfAgenda=Număr calendare
-AgendaExtNb=Calendar nr %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL-ul pentru a accesa  fişierul . ical
 ExtSiteNoLabel=Nicio descriere
 VisibleTimeRange=Interval de timp vizibil
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 08191a9ffcd..797efa922be 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Restituit
 DeletePayment=Ştergere plată
 ConfirmDeletePayment=Sunteţi sigur că doriţi să ştergeţi această plată?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Plăţi Furnizori
 ReceivedPayments=Încasări primite
 ReceivedCustomersPayments=Încasări  Clienţi
@@ -91,7 +92,7 @@ PaymentAmount=Sumă de plată
 ValidatePayment=Validează plata
 PaymentHigherThanReminderToPay=Plată mai mare decât restul de  plată
 HelpPaymentHigherThanReminderToPay=Atentie, valoarea plăţii la una sau mai multe facturi este mai mare decât  restul de plată. <br> Corectaţi  intrarea, altfel confirmaţi si gîndiţivă  la crearea unei note de credit pentru fiecare plata în exces.
-HelpPaymentHigherThanReminderToPaySupplier=Atenție, suma de plată la una sau mai multe facturi este mai mare decât restul de plată. <br> Editați intrarea, altfel confirmaţi.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Clasează "Platită"
 ClassifyPaidPartially=Clasează "Platită Parţial"
 ClassifyCanceled=Clasează "Abandonată"
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Transformă în viitor discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Introduceţi o încasare de la client
 EnterPaymentDueToCustomer=Introduceţi o plată restituire pentru client
 DisabledBecauseRemainderToPayIsZero=Dezactivată  pentru că restul de plată este zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status factură generată
 BillStatusDraft=Schiţă (de validat)
 BillStatusPaid=Plătite
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Plătită ( gata pentru factura finală)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandonate
 BillStatusValidated=Validate (de plată)
 BillStatusStarted=Începută
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Creanţă
 AmountExpected=Suma reclamată
 ExcessReceived=Primit în plus
+ExcessPaid=Excess paid
 EscompteOffered=Discount  oferit ( plată înainte de termen)
 EscompteOfferedShort=Discount
 SendBillRef=Trimitere factura %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Reducere de la nota de credit %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Acest tip de credit poate fi utilizat pe factură înainte de validarea acesteia
 CreditNoteDepositUse=Factura trebuie validată pentru a utiliza acest tip de credite
 NewGlobalDiscount=Discount absolut nou
 NewRelativeDiscount=Discount  relativ nou
+DiscountType=Discount type
 NoteReason=Notă / Motiv
 ReasonDiscount=Motiv
 DiscountOfferedBy=Acordate de
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Adresa de facturare
 HelpEscompte=Această reducere este un discount acordat clientului pentru că plata  a fost făcută înainte de termen.
 HelpAbandonBadCustomer=Această sumă a fost abandonată (client declarat  rău platnic) şi este considerată ca fiind o pierdere excepţională.
@@ -341,10 +348,10 @@ NextDateToExecution=Data pentru următoarea generare a facturii
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Ultima dată de generare
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Numărul maxim de facturi generate
-NbOfGenerationDone=Număr facturi deja generate
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Numărul maxim de generări atins
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validare automată facturi
 GeneratedFromRecurringInvoice=Generate din model factura recurentă %s
 DateIsNotEnough=Incă nu este data setată
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 67f0cf332a8..aaf2f118bba 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -43,7 +43,8 @@ Individual=Persoană privată
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Societatea-mamă
 Subsidiaries=Filiale
-ReportByCustomers=Raport pe client
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Raport pe rată
 CivilityCode=Mod adresare
 RegisteredOffice=Sediul social
@@ -75,10 +76,12 @@ Town=Oraş
 Web=Web
 Poste= Poziţie
 DefaultLang=Limba implicită
-VATIsUsed=Utilizează TVA-ul
-VATIsNotUsed=Nu utilizează TVA-ul
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Terţii nu sunt clienţi sau furnizori, nu sunt obiecte asociate disponibile
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Oferte
 OverAllOrders=Comenzi
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane cod)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Codul de TVA
-VATIntraShort=Codul de TVA
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Sintaxa este validă
+VATReturn=VAT return
 ProspectCustomer=Prospect / Client
 Prospect=Prospect
 CustomerCard=Fişa Client
 Customer=Client
 CustomerRelativeDiscount=Discount Relativ client
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Discount Relativ
 CustomerAbsoluteDiscountShort=Discount Absolut
 CompanyHasRelativeDiscount=Acest client are un discount <b>de %s%%</b>
 CompanyHasNoRelativeDiscount=Acest client nu are nici un discount în mod implicit
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Acest client are încă note de credit pentru <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Acest client nu are nici o reducere de credit disponibil
-CustomerAbsoluteDiscountAllUsers=Discount Absolut în curs (acordate pentru toţi utilizatorii)
-CustomerAbsoluteDiscountMy=Discount Absolut în curs  (acordat de dvs.)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Niciunul
 Supplier=Furnizor
 AddContact=Creare contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=Niciun acces utilizator
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacte şi atribute
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacte / Adrese(ale terţilor sau nu) şi atribute
-ImportDataset_company_3=Coordonate bancare
-ImportDataset_company_4=Terti /reprezentanti Vanzari (Afecteaza reprezentantii vanzari utilizato de companie )
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Nivel de Pret
 DeliveryAddress=Adresă de livrare
 AddAddress=Adaugă adresă
@@ -406,15 +419,16 @@ ProductsIntoElements=Ultimele produse / servicii in %s
 CurrentOutstandingBill=Facturi in suspensie curente
 OutstandingBill=Max. limită credit
 OutstandingBillReached=Limită credit depăsită 
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Retrimite numărulcu formatul %syymm-nnnn pentru codul de client și %syymm-nnnn pentru codul de furnizor unde YY este anul, mm  este luna și nnnn este o secvență continuă și fără să revină la 0.
 LeopardNumRefModelDesc=Codul este liber fîrî verificare. Acest cod poate fi modificat în orice moment.
 ManagingDirectors=Nume Manager(i) nume (CEO, director, preşedinte...)
 MergeOriginThirdparty=Duplica terț (terț dorit să-l ștergeți)
 MergeThirdparties=Imbina terti
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Tertii au fost imbinati
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Autentificare reprezentant vânzări
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=A apărut o eroare laștergerea terților. Vă rugăm să verificați logurile. Modificările au fost anulate.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 2c8091aedde..19058a4d6fa 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece= Doc. contabilitate
 AmountHTVATRealReceived=TVA colectat
 AmountHTVATRealPaid=TVA platit
-VATToPay=TVA vânzări
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=Plăţi IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Rambursare
 SocialContributionsPayments=Plata taxe sociale sau fiscale
 ShowVatPayment=Arata plata TVA
@@ -157,30 +158,34 @@ RulesResultDue=- Include facturi deschise, cheltuieli, TVA, donații, indiferent
 RulesResultInOut=- Include plățile efective pe facturi, cheltuieli,TVA și salarii. <br> - Se ia  în calcul data plăţii facturilor, cheltuielilor, TVA-ului  și salariilor .
 RulesCADue=-Include facturile scadente de la clienți indiferent dacă sunt încasate sau nu. <br>-Se ia în calcul data de validare a acestor facturi <br> 
 RulesCAIn=- Ea include toate plăţile efective a facturilor primite de la clienti. <br> - Se bazează pe data de plată a acestor facturi <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Raport de terţă parte IRPF
-LT1ReportByCustomersInInputOutputModeES=Raport pe terţ RE
-VATReport=Raport TVA
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Raport pe terţ RE
+LT2ReportByCustomersES=Raport de terţă parte IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Raport după TVA client colectat și plătit
-VATReportByCustomersInDueDebtMode=Raport după TVA client colectat și plătit
-VATReportByQuartersInInputOutputMode=Raport după rata TVA colectată și plătită
-LT1ReportByQuartersInInputOutputMode=Raport pe rată RE
-LT2ReportByQuartersInInputOutputMode=Raport pe rată IRPF
-VATReportByQuartersInDueDebtMode=Raport după rata TVA colectată și plătită
-LT1ReportByQuartersInDueDebtMode=Raport pe rată RE
-LT2ReportByQuartersInDueDebtMode=Raport pe rată IRPF
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Raport pe rată RE
+LT2ReportByQuartersES=Raport pe rată IRPF
 SeeVATReportInInputOutputMode=A se vedea raportul <b>%sVAT encasement%s</b> pentru un calcul standard
 SeeVATReportInDueDebtMode=A se vedea raportul <b>privind %sVAT flow%s</b> pentru un calcul, cu o opţiune de pe fluxul
 RulesVATInServices=- Pentru servicii, raportul include regularizările de TVA efectiv primite sau emise pe baza datelor plăților.
-RulesVATInProducts=- Pentru activele materiale, aceasta include TVA facturile pe baza de data facturii.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Pentru servicii, raportul include facturi TVA-ului datorat, plătite sau nu, în funcţie de data facturii.
-RulesVATDueProducts=- Pentru activele materiale, aceasta include facturi cu TVA, pe baza data facturii.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Notă: Pentru bunuri materiale, ar trebui să utilizeze la data livrării să fie mai echitabil.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/factura
 NotUsedForGoods=Nu sunt utilizate pentru cumpărarea de bunuri
 ProposalStats=Statistici privind ofertele
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pe
 TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul <b>contabilitate de casă</b> nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul  <b>contabilitate de angajament</b> (a se vedea configurarea modulului de contabilitate).
 CalculationMode=Mod calcul
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound= Eroare: cont bancar nu a fost găsit
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 01f4b4358ce..677540e3313 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Niciun job înregistrat
 CronPriority=Prioritate
 CronLabel=Etichetă
 CronNbRun=Nr. lansări
-CronMaxRun=Nr. max. lansări
+CronMaxRun=Max number launch
 CronEach=Fiecare
 JobFinished=Job lansat şi terminat
 #Page card
@@ -74,9 +74,10 @@ CronFrom=De la
 CronType=Tip job
 CronType_method=Call method of a PHP Class
 CronType_command=Comandă shell
-CronCannotLoadClass=Nu pot încărca clasa %s sau  obiectul %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Module Instrumente - Joburi programate'' pentru a vedea și edita job-urile programate.
 JobDisabled=Job dezactivat
 MakeLocalDatabaseDumpShort=Backup local baza de date
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index b512aaee087..ce79244220d 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP de potrivire nu este completă.
 ErrorLDAPMakeManualTest=A. Ldif fişier a fost generat în directorul %s. Încercaţi să încărcaţi manual de la linia de comandă pentru a avea mai multe informatii cu privire la erori.
 ErrorCantSaveADoneUserWithZeroPercentage=Nu se poate salva o acţiune cu "statut nu a început" în cazul în domeniu "realizat de către" este, de asemenea, completat.
 ErrorRefAlreadyExists=Ref utilizate pentru crearea există deja.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Nu se ppate sterge inregistrarea. Este inca utilizata sau inclusa intr-un alt obiect
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Eşec la adăugarea  %s la lista de Mailman % s sa
 ErrorFailedToRemoveToMailmanList=Eşec la înlăturarea  %s din lista de Mailman % s sau din baza SPIP
 ErrorNewValueCantMatchOldValue=Noua valoare nu poate fi egală cu cea veche
 ErrorFailedToValidatePasswordReset=Eşec la resetarea parolei. Este posibil săfi fost deja folosit acest link ( acest link poate fi folosit doar o dată). Dacă nu, încercați să reporniți şi reiniţializaţi procesul.
-ErrorToConnectToMysqlCheckInstance=Conectarea la baza de date eșuează. Verifică serverul  MySQL dacă rulează (în cele mai multe cazuri, aveți posibilitatea să-l lansaţi din linia de comandă cu 'sudo /etc/init.d/mysql start').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Eşuare la adaugare contact
 ErrorDateMustBeBeforeToday=Data nu poate fi mai mare decât azi
 ErrorPaymentModeDefinedToWithoutSetup=Un modul de plată a fost setat la tipul% s, dar setarea modulului Facturi nu a fost finalizată  a arăta pentru acest mod de plată.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Utilizatorul-ul a fost modificat. Din motive de securitate, va trebui să vă conectați cu noul dvs. utilizator înainte de următoarea acțiune.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/ro_RO/loan.lang b/htdocs/langs/ro_RO/loan.lang
index 5a124beee2e..af29433f62f 100644
--- a/htdocs/langs/ro_RO/loan.lang
+++ b/htdocs/langs/ro_RO/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 1c19903270f..d0d2600df17 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nr selectat
 NbIgnored=Nr  ignorat
 NbSent=Nr trimis
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Valoare minima
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 96f2ab3a260..462de61cca3 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametrul %s nedefinit
 ErrorUnknown=Eroare Necunoscută
 ErrorSQL=Eroare SQL
 ErrorLogoFileNotFound=Fișierul logo '% s' nu a fost găsit
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Mergeţi la configurarea modulului pentru rezolvare
 ErrorFailedToSendMail=Nu se poate  trimite e-mail (expeditor=% s,  destinatar =%s)
 ErrorFileNotUploaded=Fișierul nu a fost încărcat. Verificați ca dimensiunea să nu depășească maximul permis, că spațiu pe disc este disponibil  și că nu există deja un fișier cu același nume, în acest director.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Eroare,  nici o cota de TVA definită pent
 ErrorNoSocialContributionForSellerCountry=Eroare, niciun tip taxa sociala /fiscala definit pentru ţara '%s'.
 ErrorFailedToSaveFile=Eroare,  salvarea fişierului eşuată.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Dvs nu aveti dreptusa faceti aceasta.
 SetDate=setează data
 SelectDate=selectează data
 SeeAlso=Vezi şi %s
 SeeHere=Vezi aici
+ClickHere=Click aici
+Here=Here
 Apply=Aplică
 BackgroundColorByDefault=Culoarea de fundal implicită
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Selectaţi
 Choose=Alege
 Resize=Redimensionează
+ResizeOrCrop=Resize or Crop
 Recenter=Recentrează
 Author=Autor
 User=Utilizator
@@ -325,8 +328,10 @@ Default=Implicit
 DefaultValue=Valoare implicită
 DefaultValues=Default values
 Price=Preţ
+PriceCurrency=Price (currency)
 UnitPrice=Preţ unitar
 UnitPriceHT=Preț unitar (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Preț unitar
 PriceU=UP
 PriceUHT=UP (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (moneda)
 PriceUTTC=U.P. (inc. tax)
 Amount=Valoare
 AmountInvoice=Valoare Factură
+AmountInvoiced=Amount invoiced
 AmountPayment=Valoare de plată
 AmountHTShort=Valoare (net)
 AmountTTCShort=Valoare (inc. taxe)
@@ -353,6 +359,7 @@ AmountLT2ES=Valoare  IRPF
 AmountTotal=Valoare  totală
 AmountAverage=Valoare medie
 PriceQtyMinHT=Preţ cantitate min. (net)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Procentaj
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Taxa TVA
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Medie
 Sum=Suma
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Terminat
 ActionUncomplete=Incomplet
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Companie / Organizație
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacte pentru aceast terţ
 ContactsAddressesForCompany=Contacte pentru aceast terţ
 AddressesForCompany=Adrese pentru acest terţ
@@ -427,6 +437,9 @@ ActionsOnCompany=Evenimente  privind  acest terţ
 ActionsOnMember=Evenimente  privind  acest membru
 ActionsOnProduct=Events about this product
 NActionsLate=%s  întârziat
+ToDo=De facut
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Cerere  deja înregistrată
 Filter=Filtru
 FilterOnInto=Criteriu Cautare '<strong>%s</strong>' in campurile %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Atenție, vă aflați în modul de întreținere,
 CoreErrorTitle=Eroare de sistem
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Card de credit
+ValidatePayment=Validează plata
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Campurile marcate cu <b>%s</b> sunt obligatorii
 FieldsWithIsForPublic=Câmpurile  cu <b>%s</b> vor fi  afișate pe lista publică de membri. Dacă nu doriți acest lucru, debifaţi căsuţa "public".
 AccordingToGeoIPDatabase=(Conform conversiei GeoIP)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Obiecte asociate
 ClassifyBilled=Clasează facturată
+ClassifyUnbilled=Classify unbilled
 Progress=Progres
-ClickHere=Click aici
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Proiect
 Projects=Proiecte
 Rights=Permisiuni
+LineNb=Line no.
+IncotermLabel=Incoterm
 # Week day
 Monday=Luni
 Tuesday=Marţi
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Toată lumea
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Atribuit lui
diff --git a/htdocs/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang
index 61fb6148505..7f991326f07 100644
--- a/htdocs/langs/ro_RO/margins.lang
+++ b/htdocs/langs/ro_RO/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rata trebuie să fie numerică
 markRateShouldBeLesserThan100=Rata mîrcii trebuie să fie mai mica de 100
 ShowMarginInfos=Arată informaţii marjă
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index effde2c0d4f..f1b96789b77 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Listă Membri publici validaţi
 ErrorThisMemberIsNotPublic=Acest membru nu este public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Un alt membru <b>(nume:<b>%s</b>, login: <b>%s</b>) este deja  legat la un terţ<b>%s</b> . Eliminaţi acest link mai întâi deoarece deoarece un terţ  nu poate fi legat decât la membru (şi invers).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Din motive de securitate, trebuie să aveţi drepturi de a modifica toţi utilizatorii de a putea  lega un membru către un utilizator altul decât dvs.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Continutul fişei dvs de membru
 SetLinkToUser=Link către un utilizator Dolibarr
 SetLinkToThirdParty=Link către un terţ Dolibarr
 MembersCards=Carţi de vizită  membri
@@ -108,17 +106,33 @@ PublicMemberCard=Fişa Membru public
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Creare adeziune
 ShowSubscription=Afişează adeziune
-SendAnEMailToMember=Trimite e-mail de informare membrului
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Continutul fişei dvs de membru
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subiect al emailului recepţionat în caz de auto-inscriere a unui vizitator
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email recepţionat în caz de auto-inscriere a unui vizitator
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Subiectul e-mail pentru autoinregistrarea unui membru
-DescADHERENT_AUTOREGISTER_MAIL=E-mail trimis în caz de autoinregistrarea unui membru
-DescADHERENT_MAIL_VALID_SUBJECT=Subiect Email de  validare  membru
-DescADHERENT_MAIL_VALID=E-mail pentru   validare  membru
-DescADHERENT_MAIL_COTIS_SUBJECT=Email Subiect de subscriere
-DescADHERENT_MAIL_COTIS=E-mail pentru înscriere
-DescADHERENT_MAIL_RESIL_SUBJECT=Subiect  Email reziliere  membru
-DescADHERENT_MAIL_RESIL=Email reziliere  membru
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Expeditorul  pentru e-mail-uri automate
 DescADHERENT_ETIQUETTE_TYPE=Format pagină etichete
 DescADHERENT_ETIQUETTE_TEXT=Text imprimat pe foaia de adresă a membrului
@@ -177,3 +191,8 @@ NoVatOnSubscription=Fără TVA la adeziuni
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs folosit pentru linia  abonamentului în factura:  %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 148e8a24ddf..3c1f51d4cf7 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 047d6d176db..0f7276e242f 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Mesaj de pe pagina de întoarcere a platii validate
 MessageKO=Mesaj de pe pagina anulat schimbul de plată
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Legate de obiectul
 NbOfActiveNotifications=Numărul de notificări (Nr de e-mailuri beneficiare)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Începeţi încărcarea
 CancelUpload=Anulaţi încărcarea
 FileIsTooBig=Fişiere este prea mare
 PleaseBePatient=Vă rugăm să aveţi răbdare ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=O cerere pentru a schimba parola dvs. Dolibarr a fost primită
 NewKeyIs=Aceasta este noua cheie pentru login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL pagina
 WEBSITE_TITLE=Titlu
 WEBSITE_DESCRIPTION=Descriere
 WEBSITE_KEYWORDS=Cuvânt cheie
+LinesToImport=Lines to import
diff --git a/htdocs/langs/ro_RO/paypal.lang b/htdocs/langs/ro_RO/paypal.lang
index cbc32c65b21..57ee87a75f1 100644
--- a/htdocs/langs/ro_RO/paypal.lang
+++ b/htdocs/langs/ro_RO/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Numai PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Acesta este ID-ul de tranzacţie: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Adăugaţi URL-ul de plată Paypal atunci când trimiteţi un document prin e-mail
-PredefinedMailContentLink=Puteţi da click pe linkul securizat de mai jos pentru a face plata (PayPal), în cazul în care acesta nu este deja făcută. ⏎\n⏎\n% s ⏎\n⏎\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Cod de eroare
 ErrorSeverityCode=Cod Severitate eroare
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 4b16f51b2f6..e8f79c9fb7c 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Produs sau serviciu
 ProductsAndServices=Produse si Servicii
 ProductsOrServices=Produse sau servicii
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Sunteţi sigur că doriţi să ştergeţi această lini
 ProductSpecial=Special
 QtyMin=Cantitatea minimă
 PriceQtyMin=Pretul pentru această cant. min (w / o reducere)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Cota TVA( pentru acest furnizor/produs)
 DiscountQtyMin=Reducerea implicită pentru cant
 NoPriceDefinedForThisSupplier=Nu Pret / Cantitate definite pentru acest furnizor / produs
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 3de56597c4d..e3166565a08 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Contacte Proiect
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Toate proiectele
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea să le  citiţi.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
 ProjectsDesc=Această vedere prezintă toate proiectele  (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Volumul de muncă nu este definit
 NewTimeSpent=Timpi consumaţi
 MyTimeSpent=Timpul meu consumat
+BillTime=Bill the time spent
 Tasks=Taskuri
 Task=Task
 TaskDateStart=Data start task
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Lista evenimentelor  asociate la proiectului
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activitatea de pe proiect în această săptămână
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activitatea de pe proiect în această lună
 ActivityOnProjectThisYear=Activitatea de pe proiect în acest an
 ChildOfProjectTask=Copil al proiectului / taskului
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Nu este proprietar al acestui proiect privat
 AffectedTo=Alocat  la
 CantRemoveProject=Acest proiect nu pot fi eliminat, deoarece se face referire prin alte obiecte (facturi, comenzi sau altele). Vezi  tab Referinţe
@@ -137,7 +140,8 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua data de debut a proiectului
 ProjectsAndTasksLines=Proiecte şi taskuri
 ProjectCreatedInDolibarr=Proiect %s creat
-ProjectModifiedInDolibarr=Project %s modified
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Proiect %s modificat
 TaskCreatedInDolibarr=Task %s creat
 TaskModifiedInDolibarr=Task %s modificat
 TaskDeletedInDolibarr=Task %s sters
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index f02292a17bd..3bb746a6e2c 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Semnată (de facturat)
 PropalStatusNotSigned=Nesemnată (inchisă)
 PropalStatusBilled=Facturată
 PropalStatusDraftShort=Schiţă
+PropalStatusValidatedShort=Validată
 PropalStatusClosedShort=Închisă
 PropalStatusSignedShort=Semnată
 PropalStatusNotSignedShort=Nesemnată
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 47c84c9e9f0..5daf6f7a489 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 3ad03127491..39fd55fc3ab 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modifică depozit
 MenuNewWarehouse=Depozit nou
 WarehouseSource=Depozit Sursa
 WarehouseSourceNotDefined=Niciun depozit definit,
+AddWarehouse=Create warehouse
 AddOne=Adaugă unul
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Depozit ţintă
 ValidateSending=Şterge expedierea
 CancelSending=Anulează expediere
@@ -22,6 +24,7 @@ Movements=Mişcări
 ErrorWarehouseRefRequired=Referința  Depozit este obligatorie
 ListOfWarehouses=Lista  depozite
 ListOfStockMovements=Lista mişcări de stoc
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 561e0e44973..71c84e714ba 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=Plata noua Stripe incasata
 NewStripePaymentFailed=Plata noua Stripe incercata dar esuata
 STRIPE_TEST_SECRET_KEY=Cheie de testare secreta
 STRIPE_TEST_PUBLISHABLE_KEY=Cheia de test publicabilă
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Cheie secreta de actiune
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index 66b6c73f760..f673ec610be 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip= Raport de cheltuieli nou
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Valoarea  sau km
 DeleteTrip=Șterge raport de cheltuieli
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=În așteptare pentru aprobare
 ExpensesArea=Rapoarte de cheltuieli
 ClassifyRefunded=Clasează "Rambursată"
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=ID Raport de cheltuieli 
 AnyOtherInThisListCanValidate=Persoana de informare pentru validare.
 TripSociete=Informații   companie
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Ați declarat un alt raport de cheltuieli într-un interval de timp similar.
 AucuneLigne=Nu există încă nici un raport de cheltuieli declarate 
 
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index a2bc0f945aa..6ad1d1be734 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -69,8 +69,8 @@ InternalUser=Interne de utilizator
 ExportDataset_user_1=Dolibarr utilizatorii şi proprietăţi
 DomainUser=Domeniu utilizatorul %s
 Reactivate=Reactivaţi
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permisiunea acordată deoarece moştenită de la un utilizator al unui grup.
 Inherited=Moştenit
 UserWillBeInternalUser=De utilizator creat va fi un utilizator intern (pentru că nu este legată de o parte terţă)
@@ -93,6 +93,7 @@ NameToCreate=Nume de terţă parte pentru a crea
 YourRole=Dvs. de roluri
 YourQuotaOfUsersIsReached=Cota dvs. de utilizatori activi este atins!
 NbOfUsers=NB de utilizatori
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Numai un superadmin poate declasa un superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Vedere ierarhică
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index a5749898930..bb3cf7f9426 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Şterge website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Pagina nume/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Seteaza ca  pagina Home 
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Citit
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index c2fb4aaccb0..2a280d08f69 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Ordin de plata prin debit direct
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Ordin de plata prin debit direct
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=De procesat
 WithdrawalsReceipts=Comenzi debit direct
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Cod terţ bancă
-NoInvoiceCouldBeWithdrawed=Nu withdrawed factură cu succes. Verificaţi dacă factura sunt pe companii cu un valide BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Clasifica creditat
 ClassCreditedConfirm=Sunteţi sigur că doriţi sa clasificaţi această retragere ca creditată pe contul bancar?
 TransData=Data transmiterii
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistici după starea  liniilor
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 8b91e4428b7..d64058b0d2b 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -4,29 +4,29 @@ ACCOUNTING_EXPORT_DATE=Формат даты при экспорте в файл
 ACCOUNTING_EXPORT_PIECE=Экспортировать количество
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Экспорт с глобальным аккаунтом
 ACCOUNTING_EXPORT_LABEL=Метка экспорта
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_AMOUNT=Объем экспорта
+ACCOUNTING_EXPORT_DEVISE=Валюта экспорта
+Selectformat=Выберите формат для файла
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
 ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ACCOUNTING_EXPORT_PREFIX_SPEC=Укажите префикс для имени файла
 ThisService=This service
 ThisProduct=This product
 DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Конфигурация бухгалтерского модуля
 Journalization=Journalization
 Journaux=Журналы
 JournalFinancial=Финансовые журналы
-BackToChartofaccounts=Return chart of accounts
+BackToChartofaccounts=Получаемый график счетов
 Chartofaccounts=Схема учётных записей
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -70,7 +70,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
+Selectchartofaccounts=Выберите активный график счетов
 ChangeAndLoad=Change and load
 Addanaccount=Добавить бухгалтерский счёт
 AccountAccounting=Бухгалтерский счёт
@@ -78,7 +78,7 @@ AccountAccountingShort=Бухгалтерский счёт
 SubledgerAccount=Subledger Account
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
-AccountAccountingSuggest=Accounting account suggested
+AccountAccountingSuggest=Учетный счет
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Банковские счета
 MenuVatAccounts=Vat accounts
@@ -87,18 +87,18 @@ MenuExpenseReportAccounts=Expense report accounts
 MenuLoanAccounts=Loan accounts
 MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
-Ventilation=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+Ventilation=Привязка к счетам
+CustomersVentilation=Привязка счета клиента
+SuppliersVentilation=Привязка счета поставщика
 ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
+CreateMvts=Создать новую транзакцию
+UpdateMvts=Изменить транзакцию
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Журнализировать транзакции в Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
-CAHTF=Total purchase supplier before tax
+CAHTF=Все закупки у поставщика без налогов
 TotalExpenseReport=Total expense report
 InvoiceLines=Lines of invoices to bind
 InvoiceLinesDone=Bound lines of invoices
@@ -107,10 +107,10 @@ ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
 
 
-Ventilate=Bind
+Ventilate=Привязка
 LineId=Id line
 Processing=Обрабатывается
-EndProcessing=Process terminated.
+EndProcessing=Процесс прерван.
 SelectedLines=Выделенные строки
 Lineofinvoice=Строка счёта
 LineOfExpenseReport=Line of expense report
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Тип документа
 Docdate=Дата
 Docref=Ссылка
-Code_tiers=Контрагент
 LabelAccount=Метка бухгалтерского счёта
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Платёж счёта клиента
-ThirdPartyAccount=Бухгалтерский счёт контрагента
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Природа
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Продажи
 AccountingJournalType3=Покупки
 AccountingJournalType4=Банк
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index eb23f03353a..b464fabfbc3 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Ошибка, не возможно использовать опцию @ если последовательность {yy}{mm} или {yyyy}{mm} не в маске.
 UMask=UMask параметр для новых файлов в файловых системах Unix / Linux / BSD / Mac.
 UMaskExplanation=Этот параметр позволяет определить набор прав по умолчанию для файлов, созданных Dolibarr на сервере (при загрузке, например).<br> Это должно быть восьмеричное значение (например, 0666 означает, читать и записывать сможет каждый). <br> Этот параметр бесполезен на Windows-сервере.
-SeeWikiForAllTeam=Посмотрите на вики-странице на полный список всех участников и их организации
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Задержка для кэширования при экспорте в секундах (0 или пусто для отключения кэширования)
 DisableLinkToHelpCenter=Скрыть ссылку <b>"нужна помощь или поддержка"</b> на странице авторизации
 DisableLinkToHelp=Скрыть ссылку интернет-справки "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Изменять базовые цены на опреде
 MassConvert=Запустить массовое преобразование
 String=Строка
 TextLong=Длинный текст
+HtmlText=Html text
 Int=Целое
 Float=С плавающей запятой
 DateAndTime=Дата и время
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Ссылка на объект
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Библиотека используемая для создания PDF-файлов
-WarningUsingFPDF=Осторожно: Ваш <b>conf.php</b> содержит директиву <b>dolibarr_pdf_force_fpdf=1</b>. Это означает что вы используете библиотеку FPDF для создания PDF-файлов. Эта библиотека устарела и не поддерживает часть возможностей (Unicode, прозрачность изображений, кирилиуц, арабские и азиатские языки, ...), таким образом вы можете разочароваться в создании PDF-файлов.<br>Для устранения этого и полной поддержки создания PDF-файлов, скачайте пожалуйста <a href="http://www.tcpdf.org/" target="_blank">библиотеку TCPDF</a>, затем закомментируйте или удалите строку <b>$dolibarr_pdf_force_fpdf=1</b>, и добавьте вместо нее <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Некоторые страны взымают по 2 или 3 налога за каждую позицию в счете. Если у вас это так то выберите второй и третий налог и их ставку. Возможные варианты:<br>1 : местный налог взымается с продукции и услуг без НДС (местный налог вычисляется от суммы до начисления налогов)<br>2 : местный налог взымается с продукции и услуг включая НДС (местный налог вычисляется от суммы + основной налог)<br>3 : местный налог взымается с продукции без НДС (местный налог вычисляется от суммы до начисления налогов)<br>4 : местный налог взымается с продукции включая НДС (местный налог вычисляется от суммы + основной НДС)<br>5: местный налог взымается с услуг без НДС (местный налог вычисляется от суммы до начисления налогов)<br>6: местный налог взымается с услуг включая НДС (местный налог вычисляется от суммы + налог)
 SMS=SMS
 LinkToTestClickToDial=Введите номер телефона для отображения ссылки с целью проверки ClickToDial-адреса пользователя <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Пользователи и группы
 Module0Desc=Управление Пользователями / Сотрудниками и Группами
@@ -619,6 +622,8 @@ Module59000Name=Наценки
 Module59000Desc=Модуль управления наценками
 Module60000Name=Комиссии
 Module60000Desc=Модуль управления комиссиями
+Module62000Name=Обязанности по доставке товаров
+Module62000Desc=Добавить функции для управления обязанностями по доставке товаров
 Module63000Name=Ресурсы
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Просмотр счетов-фактур клиентов
@@ -833,11 +838,11 @@ Permission1251=Запуск массового импорта внешних д
 Permission1321=Экспорт клиентом счета-фактуры, качества и платежей
 Permission1322=Reopen a paid bill
 Permission1421=Экспорт заказов и атрибуты
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Создать/изменить мои заявления на отпуск
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Удалить заявления на отпуск
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Создать/изменить заявления на отпуск для всех
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Просмотр Запланированных задач
 Permission23002=Создать/обновить Запланированную задачу
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Количество акцизных марок
 DictionaryPaymentConditions=Условия оплаты
 DictionaryPaymentModes=Режимы оплаты
 DictionaryTypeContact=Типы Контактов/Адресов
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Экологический налог Ecotax (WEEE)
 DictionaryPaperFormat=Форматы бумаги
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=НДС менеджмент
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=По умолчанию, предлагаемый НДС 0, которая может быть использована как для дела ассоциаций, отдельных лиц или небольших компаний.
-VATIsUsedExampleFR=Во Франции, это означает, компаний или организаций, имеющих реальной финансовой системы (упрощенное реальных или нормальный реальный). Система, в которой НДС не объявлены.
-VATIsNotUsedExampleFR=Во Франции, это означает, объединений, которые не объявили НДС или компаний, организаций и свободных профессий, которые выбрали микропредприятиях бюджетной системы (НДС в франшиза) и оплачивается франшиза НДС без НДС декларации. Этот выбор будет отображаться ссылка "не применимо НДС - арт-293B из CGI" на счетах-фактурах.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Ставка
 LocalTax1IsNotUsed=Не использовать второй налог
@@ -977,7 +983,7 @@ Host=Сервер
 DriverType=Тип драйвера
 SummarySystem=Обзор системной информации
 SummaryConst=Список всех параметров настройки Dolibarr
-MenuCompanySetup=\t\nКомпания/Организация
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Менеджер стандартного меню
 DefaultMenuSmartphoneManager=Менеджер Меню Смартфона
 Skin=Тема оформления
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Постоянный поиск формы на лево
 DefaultLanguage=Язык по умолчанию (код языка)
 EnableMultilangInterface=Включить многоязычный интерфейс
 EnableShowLogo=Показать логотип на левом меню
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Имя
 CompanyAddress=Адрес
 CompanyZip=Индекс
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Система информации разного техническую информацию Вы получите в режиме только для чтения и видимые только для администраторов.
 SystemAreaForAdminOnly=Эта область доступна для пользователей только администратором. Ни одно из разрешений Dolibarr может снизить этот предел.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Вы можете выбрать каждого параметра, связанных с Dolibarr выглядеть и чувствовать себя здесь
 AvailableModules=Available app/modules
 ToActivateModule=Чтобы активировать модуль, перейдите на настройку зоны.
@@ -1441,6 +1448,9 @@ SyslogFilename=Имя файла и путь
 YouCanUseDOL_DATA_ROOT=Вы можете использовать DOL_DATA_ROOT / dolibarr.log в лог-файл в Dolibarr "документы" каталог. Вы можете установить различные пути для хранения этого файла.
 ErrorUnknownSyslogConstant=Постоянная %s не известны журнала постоянная
 OnlyWindowsLOG_USER=Windows&copy; поддерживает только LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Пожертвования модуль настройки
 DonationsReceiptModel=Шаблон дарения получения
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=НДС к оплате
-OptionVATDefault=Кассовый
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Принцип начисления
 OptionVatDefaultDesc=НДС из-за: <br> - По доставке / оплате товаров <br> - На оплату услуг
 OptionVatDebitOptionDesc=НДС из-за: <br> - По доставке / оплате товаров <br> - На счета (дебетовой) на услуги
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=О доставке
 OnPayment=Об оплате
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Счет дата, используемая
 Buy=Покупать
 Sell=Продавать
 InvoiceDateUsed=Счет дата, используемая
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Бух. код продаж
 AccountancyCodeBuy=Бух. код покупок
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index f845a490ac4..d94717a8a54 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Участник %s  подтверждён
 MemberModifiedInDolibarr=Участник %sизменён
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Участник  %s удалён
-MemberSubscriptionAddedInDolibarr=Подписка участника %s  добавлена
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Отправка %s  подтверждена
 ShipmentClassifyClosedInDolibarr=Отправка %sотмечена "оплачено"
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Можно также добавить следующие па
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Показывать дни рождения контактов 
 AgendaHideBirthdayEvents=Скрыть дни рождения контактов
 Busy=Занят
@@ -109,7 +112,7 @@ ExportCal=Экспорт календаря
 ExtSites=Импортировать календари
 ExtSitesEnableThisTool=Показывать внешние календари (заданные в глобальных настройках) в повестке дня. Не окажет влияния на внешние календари, заданные пользователями.
 ExtSitesNbOfAgenda=Количество календарей
-AgendaExtNb=Календарь № %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL для файла календаря .ical
 ExtSiteNoLabel=Нет описания
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 2a96a41ab71..36114edd125 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Возврат платежа
 DeletePayment=Удалить платеж
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Платежи Поставщикам
 ReceivedPayments=Полученные платежи
 ReceivedCustomersPayments=Платежи, полученные от покупателей
@@ -91,7 +92,7 @@ PaymentAmount=Сумма платежа
 ValidatePayment=Подтвердть платёж
 PaymentHigherThanReminderToPay=Платеж больше, чем в напоминании об оплате
 HelpPaymentHigherThanReminderToPay=Внимание, сумма оплаты по одному или нескольким документам выше остатка к оплате. <br> Измените вашу запись, или подтвердите и подумать о создании кредитового авизо на превышения, полученные за каждый переплаченный счет-фактуру.
-HelpPaymentHigherThanReminderToPaySupplier=Внимание, сумма к оплате одной или нескольких счетов выше, чем остаток платежа. <br> Отредактируйте запись, в противном случае подтвердите.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Классифицировать как 'Оплачен'
 ClassifyPaidPartially=Классифицировать как 'Оплачен частично'
 ClassifyCanceled=Классифицировать как 'Аннулирован'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Преобразовать в будущую скидку
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
 EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя
 DisabledBecauseRemainderToPayIsZero=Отключено, потому что оставшаяся оплата нулевая
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (должен быть подтвержден)
 BillStatusPaid=Оплачен
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Преобразован в скидку
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Аннулирован
 BillStatusValidated=Подтвержден (необходимо оплатить)
 BillStatusStarted=Начат
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=В ожидании
 AmountExpected=Заявленная сумма
 ExcessReceived=Полученный излишек
+ExcessPaid=Excess paid
 EscompteOffered=Предоставлена скидка (за досрочный платеж)
 EscompteOfferedShort=Скидка
 SendBillRef=Представление счёта %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Скидка из кредитового авизо %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Такой тип кредита может быть использован по счету-фактуре до его подтверждения
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Новая фиксированная скидка
 NewRelativeDiscount=Новая относительная скидку
+DiscountType=Discount type
 NoteReason=Примечание / Основание
 ReasonDiscount=Основание
 DiscountOfferedBy=Предоставлена
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Адрес выставления
 HelpEscompte=Эта скидка предоставлена Покупателю за досрочный платеж.
 HelpAbandonBadCustomer=От этой суммы отказался Покупатель (считается плохим клиентом) и она считается чрезвычайной потерей.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/ru_RU/bookmarks.lang b/htdocs/langs/ru_RU/bookmarks.lang
index 510b8838a73..c6009dfc922 100644
--- a/htdocs/langs/ru_RU/bookmarks.lang
+++ b/htdocs/langs/ru_RU/bookmarks.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
+AddThisPageToBookmarks=Добавить текущую страницу в закладки
 Bookmark=Закладка
 Bookmarks=Закладки
 ListOfBookmarks=Список закладок
-EditBookmarks=List/edit bookmarks
+EditBookmarks=Список/редактирование закладок
 NewBookmark=Новая закладка
 ShowBookmark=Показать закладку
 OpenANewWindow=Открыть новое окно
@@ -12,9 +12,9 @@ BookmarkTargetNewWindowShort=Новое окно
 BookmarkTargetReplaceWindowShort=Текущее окно
 BookmarkTitle=Название закладки
 UrlOrLink=URL
-BehaviourOnClick=Behaviour when a bookmark URL is selected
+BehaviourOnClick=Поведение когда выбран URL закладки
 CreateBookmark=Создать закладку
 SetHereATitleForLink=Установите название для закладки
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Используйте внешний HTTP URL или относительный Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Выберите если связанную страницу необходимо открыть в новом окне
 BookmarksManagement=Управление закладками
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 5aa73da2c98..5496dfe5254 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -43,7 +43,8 @@ Individual=Физическое лицо
 ToCreateContactWithSameName=Будет автоматически создан контакт/адрес с той информацией которая связывает контрагента с контрагентом. В большинстве случаев, даже если контрагент является физическим лицом, достаточно создать одного контрагента.
 ParentCompany=Материнская компания
 Subsidiaries=Филиалы
-ReportByCustomers=Отчет по клиентам
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Отчет по рейтингу
 CivilityCode=Код корректности
 RegisteredOffice=Зарегистрированный офис
@@ -75,10 +76,12 @@ Town=Город
 Web=Web
 Poste= Должность
 DefaultLang=Язык по умолчанию
-VATIsUsed=НДС используется
-VATIsNotUsed=НДС не используется
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Заполнить адрес из адреса контрагента
 ThirdpartyNotCustomerNotSupplierSoNoRef=Контрагенты не имеющие клиентов или связей, пустые контрагенты
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Банковские реквизиты
 OverAllProposals=Предложения
 OverAllOrders=Заказы
@@ -239,7 +242,7 @@ ProfId3TN=Проф ID 3 (Douane код)
 ProfId4TN=Проф Id 4 (БАН)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Размер ставки НДС
-VATIntraShort=Размер ставки НДС
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Синтаксис корректен
+VATReturn=VAT return
 ProspectCustomer=Потенц. клиент / Покупатель
 Prospect=Потенц. клиент
 CustomerCard=Карточка Покупателя
 Customer=Покупатель
 CustomerRelativeDiscount=Относительная скидка покупателя
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Относительная скидка
 CustomerAbsoluteDiscountShort=Абсолютная скидка
 CompanyHasRelativeDiscount=Этот покупатель имеет скидку по умолчанию <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Этот клиент не имеет относительной скидки по умолчанию
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=Этому клиенту доступна скидка (кредитный лимит или авансовый платеж) за <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Этот клиент все еще имеет кредитный лимит или авансовый платеж за <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Этот клиент не имеет дисконтный кредит
-CustomerAbsoluteDiscountAllUsers=Абсолютная скидка (предоставляется всеми пользователями)
-CustomerAbsoluteDiscountMy=Абсолютная скидка (предоставляется вами)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Нет
 Supplier=Поставщик
 AddContact=Создать контакт
@@ -377,9 +390,9 @@ NoDolibarrAccess=Нет доступа к Dolibarr
 ExportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
 ExportDataset_company_2=Контакты и свойства
 ImportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
-ImportDataset_company_2=Контакты/Адреса (контрагенты и другие) и атрибуты
-ImportDataset_company_3=Банковские реквизиты
-ImportDataset_company_4=Контрагенты/торговые представители (Торговые представители влияющие на компании)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Уровень цен
 DeliveryAddress=Адрес доставки
 AddAddress=Добавить адрес
@@ -406,15 +419,16 @@ ProductsIntoElements=Список товаров/услуг в %s
 CurrentOutstandingBill=Валюта неуплаченного счёта
 OutstandingBill=Максимальный неуплаченный счёт
 OutstandingBillReached=Достигнут максимум не оплаченных счетов
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Вернуть номер с форматом %syymm-NNNN для кода покупателя и %syymm NNNN-код для кода поставщиков, где yy - это год, мм - месяц и NNNN - непрерывная последовательность без возврата к 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
 ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
 MergeOriginThirdparty=Копия контрагента (контрагент которого вы хотите удалить)
 MergeThirdparties=Объединить контрагентов
 ConfirmMergeThirdparties=Вы хотите объединить этого контрагента с текущим? Все связанные объекты (счета, заказы, ...) будут перемещены к текущему контрагенту, затем контрагент будет удален.
-ThirdpartiesMergeSuccess=Контрагенты объединены
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Логин торгового представителя
 SaleRepresentativeFirstname=Имя торгового представителя
 SaleRepresentativeLastname=Фамилия торгового представителя
-ErrorThirdpartiesMerge=При удалении контрагента возникла ошибка. Пожалуйста проверьте технические отчеты. Изменения отменены.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Код нового клиента или поставщика дублируется.
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index e901eb4860e..2decddcd8ca 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -31,7 +31,7 @@ Credit=Кредит
 Piece=Accounting Doc.
 AmountHTVATRealReceived=HT собрали
 AmountHTVATRealPaid=HT оплачивается
-VATToPay=НДС к оплате
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF платежей
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Показать оплате НДС
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Она включает в себя все эффективные платежи в счетах-фактурах, полученных от клиентов. <br> - Он основан на день оплаты этих счетов-фактур <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Доклад третьей стороной IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Доклад третьей стороной IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Отчёт по собранному и оплаченному НДС клиента
-VATReportByCustomersInDueDebtMode=Отчёт по собранному и оплаченному НДС клиента
-VATReportByQuartersInInputOutputMode=Отчёт по собранной и оплаченной ставке НДС 
-LT1ReportByQuartersInInputOutputMode=Отчёт по ставке RE
-LT2ReportByQuartersInInputOutputMode=Отчёт по ставке IRPF
-VATReportByQuartersInDueDebtMode=Отчёт по собранной и оплаченной ставке НДС 
-LT1ReportByQuartersInDueDebtMode=Отчёт по ставке RE
-LT2ReportByQuartersInDueDebtMode=Отчёт по ставке IRPF
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Отчёт по ставке RE
+LT2ReportByQuartersES=Отчёт по ставке IRPF
 SeeVATReportInInputOutputMode=См. LE <b>отношения %sTVA encaissement %s</b> для режима де CALCUL стандарт
 SeeVATReportInDueDebtMode=См. LE <b>отношения %sTVA сюр dbit %s</b> для режима де 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.
-RulesVATInProducts=- Для материальных ценностей, она включает в себя счета-фактуры на основе даты выставления счета.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Для услуг, отчет включает в себя счета-фактуры за счет, оплачиваемый или нет, исходя из даты выставления счета.
-RulesVATDueProducts=- Для материальных ценностей, она включает в себя НДС, счета-фактуры, на основе даты выставления счета.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Примечание: Для материальных ценностей, она должна использовать даты доставки будет более справедливым.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/счёт
 NotUsedForGoods=Не используется на товары
 ProposalStats=Статистика по предложениям
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Режим вычислений
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index a1608d190a1..b61a771f133 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Нет зарегистрированных заданий
 CronPriority=Приоритет
 CronLabel=Наименование
 CronNbRun=Кол-во запусков
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Каждый
 JobFinished=Задание запущено и завершено
 #Page card
@@ -74,9 +74,10 @@ CronFrom=От
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Команда командной строки
-CronCannotLoadClass=Невозможно загрузить класс %s или объект %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 6527f5223e2..bfe1375c610 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP соответствия не являе
 ErrorLDAPMakeManualTest=. LDIF файл был создан в директории %s. Попробуйте загрузить его вручную из командной строки, чтобы иметь больше информации об ошибках.
 ErrorCantSaveADoneUserWithZeroPercentage=Не удается сохранить действие с "Статут не началась", если поле "проделанной" также заполнены.
 ErrorRefAlreadyExists=Ссылки, используемые для создания, уже существует.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Нельзя удалить запись. Она уже используется или включена в другой объект.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Невозможно добавить запись
 ErrorFailedToRemoveToMailmanList=Невозможно удалить  запись %s из  списка %s  системы Mailman или  базы  SPIP
 ErrorNewValueCantMatchOldValue=Новое значение не может быть равно старому
 ErrorFailedToValidatePasswordReset=Невозможно обновить пароль. Может быть, обновление пароля уже выполнено (так как вы использовали одноразовую ссылку). Если это не так, попробуйте обновить пароль ещё раз. 
-ErrorToConnectToMysqlCheckInstance=Не удалось соединиться с БД. Проверьте, запущен ли сервер БД MySQL (в большинстве случаев, вы можете запустить его командой  'sudo /etc/init.d/mysql start')  
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Ошибка при добавлении контакта
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/ru_RU/loan.lang b/htdocs/langs/ru_RU/loan.lang
index 193c08535b8..55468ec5f5e 100644
--- a/htdocs/langs/ru_RU/loan.lang
+++ b/htdocs/langs/ru_RU/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Настройка модуля Ссуды
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 5c2b1c3d654..18d59cefc56 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 4d255c5980d..b2ff75c00b8 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Параметр s% не определен
 ErrorUnknown=Неизвестная ошибка
 ErrorSQL=Ошибка SQL
 ErrorLogoFileNotFound=Файл логотипа '%s' не найден
-ErrorGoToGlobalSetup=Для исправления перейдите в настройки "Компании/Организации"
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Для исправления перейдите в настройки модуля
 ErrorFailedToSendMail=Не удалось отправить почту (отправитель=%s, получатель=%s)
 ErrorFileNotUploaded=Файл не был загружен. Убедитесь, что его размер не превышает максимально допустимое значение, свободное место имеется на диске, и файл с таким же именем не существует в этом каталоге.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Ошибка, ставки НДС не у
 ErrorNoSocialContributionForSellerCountry=Ошибка, не определен тип социальных/налоговых взносов для страны %s.
 ErrorFailedToSaveFile=Ошибка, не удалось сохранить файл.
 ErrorCannotAddThisParentWarehouse=Вы пытаетесь добавить родительский склад который является дочерним
-MaxNbOfRecordPerPage=Максимум nb записей на странице
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Вы не авторизованы чтобы сделать это.
 SetDate=Установить дату
 SelectDate=Выбрать дату
 SeeAlso=Смотрите также %s
 SeeHere=Посмотрите сюда
+ClickHere=Нажмите здесь
+Here=Here
 Apply=Применить
 BackgroundColorByDefault=Цвет фона по умолчанию
 FileRenamed=Файл успешно переименован
@@ -185,6 +187,7 @@ ToLink=Ссылка
 Select=Выбор
 Choose=Выберите
 Resize=Изменение размера
+ResizeOrCrop=Resize or Crop
 Recenter=Восстановить
 Author=Автор
 User=Пользователь
@@ -325,8 +328,10 @@ Default=По умолчанию
 DefaultValue=Значение по умолчанию
 DefaultValues=Стандартное значение
 Price=Цена
+PriceCurrency=Price (currency)
 UnitPrice=Цена за единицу
 UnitPriceHT=Цена за единицу (нетто)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Цена за единицу
 PriceU=Цена ед.
 PriceUHT=Цена ед. (нетто)
@@ -334,6 +339,7 @@ PriceUHTCurrency=цена (текущая)
 PriceUTTC=Цена ед. (с тарой)
 Amount=Сумма
 AmountInvoice=Сумма счета-фактуры
+AmountInvoiced=Amount invoiced
 AmountPayment=Сумма платежа
 AmountHTShort=Сумма (нетто)
 AmountTTCShort=Сумма (вкл-я налог)
@@ -353,6 +359,7 @@ AmountLT2ES=Сумма IRPF
 AmountTotal=Общая сумма
 AmountAverage=Средняя сумма
 PriceQtyMinHT=Цена за мин. количество (без налога)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Процент
 Total=Всего
 SubTotal=Подитог
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Ставка НДС
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Среднее
 Sum=Сумма
@@ -419,7 +428,8 @@ ActionRunningShort=Выполняется
 ActionDoneShort=Завершено
 ActionUncomplete=Не завершено
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=\t\nКомпания/Организация
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Контакты для этого контрагента контрагента
 ContactsAddressesForCompany=Контакты/Адреса для этого контрагента
 AddressesForCompany=Адреса для этого контарагента
@@ -427,6 +437,9 @@ ActionsOnCompany=Действия для этого контрагента
 ActionsOnMember=События этого участника
 ActionsOnProduct=Events about this product
 NActionsLate=% с опозданием
+ToDo=Что сделать
+Completed=Completed
+Running=Выполняется
 RequestAlreadyDone=Запрос уже зарегистрован
 Filter=Фильтр
 FilterOnInto=Найти критерий '<strong>%s</strong>' в полях %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Внимание, вы находитесь в р
 CoreErrorTitle=Системная ошибка
 CoreErrorMessage=Извините, произошла ошибка. Для получения большей информации свяжитесь с системным администратором для проверки технических событий или отключения $dolibarr_main_prod=1.
 CreditCard=Кредитная карта
+ValidatePayment=Подтвердть платёж
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Поля с <b>%s</b> являются обязательными
 FieldsWithIsForPublic=Поля с <b>%s</b> показаны для публичного списка членов. Если вы не хотите этого, проверить поле "публичный".
 AccordingToGeoIPDatabase=(в соответствии с преобразованием GeoIP)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Связанные объекты
 ClassifyBilled=Классифицировать счета
+ClassifyUnbilled=Classify unbilled
 Progress=Прогресс
-ClickHere=Нажмите здесь
 FrontOffice=Дирекция
 BackOffice=Бэк-офис
 View=Вид
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Проект
 Projects=Проекты
 Rights=Права доступа
+LineNb=Line no.
+IncotermLabel=Обязанности по доставке товаров
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Общий проект
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Ответств.
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index c24913486e3..75e2da77a30 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Ставка должна быть числом
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Показать инф-цию о наценке
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 9a09a2bcfcf..dc1048c0234 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Список проверенных обществ
 ErrorThisMemberIsNotPublic=Этот член не является государственным
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Еще один член (имя и <b>фамилия: %s, логин: %s)</b> уже связан с третьей <b>стороной %s.</b> Удалить эту ссылку первых, потому третья сторона не может быть связан только один член (и наоборот).
 ErrorUserPermissionAllowsToLinksToItselfOnly=По соображениям безопасности, вы должны получить разрешение, чтобы изменить все пользователи должны иметь доступ к ссылке члена к пользователю, что это не твое.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Содержание Вашей карточки участника
 SetLinkToUser=Ссылка на Dolibarr пользователя
 SetLinkToThirdParty=Ссылка на Dolibarr третья сторона
 MembersCards=Члены печати карт
@@ -108,17 +106,33 @@ PublicMemberCard=Член общественного карту
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Создать подписку
 ShowSubscription=Показать подписки
-SendAnEMailToMember=Отправить по электронной почте информацию члена
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Содержание Вашей карточки участника
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Тема письма, которое будет получено в случае автоматически подписки гостя
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Тело письма, которое будет получено в случае автоматическоей подписки гостя
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Тема сообщения для государств-членов autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail для государств-членов autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail тему член валидации
-DescADHERENT_MAIL_VALID=EMail для членов валидации
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail предметом для подписки
-DescADHERENT_MAIL_COTIS=Адрес электронной почты для подписки
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail тему член resiliation
-DescADHERENT_MAIL_RESIL=EMail для членов resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Отправитель EMail для автоматического письма
 DescADHERENT_ETIQUETTE_TYPE=Этикетки формате
 DescADHERENT_ETIQUETTE_TEXT=Текст, который будет напечетан на адресном листе пользователя
@@ -177,3 +191,8 @@ NoVatOnSubscription=Нет НДС для подписок
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Товар, который будет использован, чтобы включить подписку в счёт: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 05bb32cd8f0..ac552af9595 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Сообщение на странице проверки возвращение оплаты
 MessageKO=Сообщение на странице отменен возврат оплаты
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Связанные объект
 NbOfActiveNotifications=Количество адресов (количество адресов электронной почты получателей)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Начать загрузку
 CancelUpload=Отмена загрузки
 FileIsTooBig=Файлы слишком велик
 PleaseBePatient=Пожалуйста, будьте терпеливы ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Получен запрос на изменение вашего пароля в системе Dolibarr
 NewKeyIs=Ваши новые ключи для доступа
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Название
 WEBSITE_DESCRIPTION=Описание
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/ru_RU/paypal.lang b/htdocs/langs/ru_RU/paypal.lang
index 971e8f6a6b6..bb010936d38 100644
--- a/htdocs/langs/ru_RU/paypal.lang
+++ b/htdocs/langs/ru_RU/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=только PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Это идентификатор транзакции: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Добавить адрес Paypal оплата при отправке документа по почте
-PredefinedMailContentLink=Вы можете нажать на защищённую ссылку нижи для совершения платежа (PayPal), если вы ещё его не производили.\n\n%s\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 0da9039cede..a69dcabc118 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Товар или Услуга
 ProductsAndServices=Товары и Услуги
 ProductsOrServices=Товары  или Услуги
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Товар только для продажи, не для покупки
 ProductsOnPurchaseOnly=Товар только для покупки, не для продажи
 ProductsNotOnSell=Товар не для продажи и не для покупки
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Вы уверены, что хотите удалить
 ProductSpecial=Специальные
 QtyMin=Минимальное кол-во
 PriceQtyMin=Цена для этого мин. кол-ва (без скидки)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Значение НДС (для этого поставщика/товара)
 DiscountQtyMin=Скидка по умолчанию за количество
 NoPriceDefinedForThisSupplier=Нет цена / Qty определенных для этого поставщика / продукта
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 94e53e65645..4d7664ac00f 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Проект контакты
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Все проекты
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Эта точка зрения представлены все проекты, которые Вы позволили читать.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Это представление всех проектов и задач, к которым у вас есть доступ.
 ProjectsDesc=Эта точка зрения представляет все проекты (разрешений пользователей предоставить вам разрешение для просмотра всего).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Рабочая нагрузка не задана
 NewTimeSpent=Время, проведенное
 MyTimeSpent=Мое время
+BillTime=Bill the time spent
 Tasks=Задание
 Task=Задача
 TaskDateStart=Дата начала задачи
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Список пожертвований, связ
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Список мероприятий, связанных с проектом
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Деятельность по проекту на этой неделе
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Деятельность по проектам в э
 ActivityOnProjectThisYear=Деятельность по проектам в этом году
 ChildOfProjectTask=Детский проекта / задачи
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Не владелец этого частного проекта
 AffectedTo=Затронутые в
 CantRemoveProject=Этот проект не может быть удалена, как он ссылается на другие объекты (счета-фактуры, приказы или другие). См. реферрала вкладке.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Невозможно сдвинуть дату задачи по причине новой даты начала проекта
 ProjectsAndTasksLines=Проекты и задачи
 ProjectCreatedInDolibarr=Проект %s создан
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Задача %s создана
 TaskModifiedInDolibarr=Задача %s изменена
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 7b8796877a1..f69990333ff 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Подпись (в законопроекте)
 PropalStatusNotSigned=Не подписал (закрытые)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Черновик
+PropalStatusValidatedShort=Утверждена
 PropalStatusClosedShort=Закрытые
 PropalStatusSignedShort=Подпись
 PropalStatusNotSignedShort=Не подписано
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index f56f12c603b..47be3c234a0 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 7a3691301f7..a16bd0b3d73 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Редактировать склад
 MenuNewWarehouse=Новый склад
 WarehouseSource=Источник склад
 WarehouseSourceNotDefined=Склад не определен,
+AddWarehouse=Create warehouse
 AddOne=Добавить
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Целевой показатель на складе
 ValidateSending=Удалить отправку
 CancelSending=Отменить отправку
@@ -22,6 +24,7 @@ Movements=Перевозкой
 ErrorWarehouseRefRequired=Склад ссылкой зовут требуется
 ListOfWarehouses=Список складов
 ListOfStockMovements=Список акций движения
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
index 4103ca31ff8..f3d51ed45be 100644
--- a/htdocs/langs/ru_RU/stripe.lang
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index d9c5113cebd..6dc702ca4a5 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=Новый отчёт о затртатах
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Сумма или километры
 DeleteTrip=Удалить отчёт о затратах
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Ждёт утверждения
 ExpensesArea=Поле отчётов о затратах
 ClassifyRefunded=Classify 'Refunded'
 ExpenseReportWaitingForApproval=Новый отчёт о затратах направлен на утверждение
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=ID отчёта о затратах
 AnyOtherInThisListCanValidate=Кого уведомлять для подтверждения.
 TripSociete=Информация о компании
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Вы должны задекларировать другой отчёт о затратах в этом временном диапазоне. 
 AucuneLigne=Нет задекларированных отчётов о затратах
 
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 59a7089eaf5..a1e64799b4c 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -69,8 +69,8 @@ InternalUser=Внутренний пользователь
 ExportDataset_user_1=Dolibarr пользователей и свойства
 DomainUser=Домен пользователя %s
 Reactivate=Возобновить
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Разрешение предоставляется, поскольку унаследовал от одного из пользователей в группы.
 Inherited=Унаследованный
 UserWillBeInternalUser=Созданный пользователь будет внутреннего пользователя (потому что не связаны с определенным третьим лицам)
@@ -93,6 +93,7 @@ NameToCreate=Имя третьей стороной для создания
 YourRole=Ваша роль
 YourQuotaOfUsersIsReached=Квота активных пользователей будет достигнута!
 NbOfUsers=Кол-во пользователей
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Только суперамин может понизить суперамин
 HierarchicalResponsible=Руководитель
 HierarchicView=Иерархический вид
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index c22c79309b8..77c665c2398 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Читать
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 8c8d32a4624..f5e4b0bba6e 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Для обработки
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Третьей стороной банковский код
-NoInvoiceCouldBeWithdrawed=Нет счета withdrawed с успехом. Убедитесь в том, что счета-фактуры на компании с действительным запрета.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Классифицировать зачисленных
 ClassCreditedConfirm=Вы уверены, что хотите классифицировать это изъятие   как кредит на вашем счету в банке?
 TransData=Дата передачи
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Статистика статуса по строкам
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ru_UA/compta.lang b/htdocs/langs/ru_UA/compta.lang
index 1cff97150bd..f3f637e8453 100644
--- a/htdocs/langs/ru_UA/compta.lang
+++ b/htdocs/langs/ru_UA/compta.lang
@@ -42,7 +42,6 @@ RulesResultInOut=- Суммы указаны с учетом всех налог
 RulesCADue=- Она включает в себя из-за счета клиента (за исключением депозитов счета-фактуры), являются ли они заплатили или нет. <br> - Он основан на проверке даты этих счетов-фактур. <br>
 RulesCAIn=- Она включает все эффективные платежи счетов-фактур, полученных от клиентов. <br> - Она основана на день оплаты этих счетов <br>
 VATReportByCustomersInInputOutputMode=Доклад клиентов НДС на выплату (НДС квитанция)
-VATReportByCustomersInDueDebtMode=Доклад клиентов НДС на выплату (НДС)
 OptionVatInfoModuleComptabilite=Примечание: Для получения материальных ценностей, он должен использовать дату доставки на более справедливой.
 PercentOfInvoice=%% / Счет
 Dispatch=Диспетчерский
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 9650ceb9915..75b10e7423c 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Účtovná schéma
 CurrentDedicatedAccountingAccount=Aktuálny vyhradený účet
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Účtovný účet predvolene pre predané služb
 Doctype=Druh dokumentu
 Docdate=dátum
 Docref=referencie
-Code_tiers=Tretia strana
 LabelAccount=Značkový účet
 LabelOperation=Label operation
 Sens=sens
@@ -169,18 +168,17 @@ DelYear=Rok na zmazanie
 DelJournal=Žurnále na zmazanie
 ConfirmDeleteMvt=Tým sa odstránia všetky riadky knihy za rok a / alebo z určitého časopisu. Vyžaduje sa aspoň jedno kritérium.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Odstrániť záznam knihy
 FinanceJournal=Finančný časopis
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finančný denník vrátane všetkých druhov platieb prostredníctvom bankového účtu
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Účet DPH nie je definovaný
 ThirdpartyAccountNotDefined=Účet tretej strany nie je definovaný
 ProductAccountNotDefined=Účet pre produkt nie je definovaný
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Účet pre banku nie je definovaný
 CustomerInvoicePayment=Platba zákazníka faktúry
-ThirdPartyAccount=Účet tretej strany
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Nová transakcia
 NumMvts=Počet transakcií
 ListeMvts=Zoznam pohybov
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Chyba, nemôžete odstrániť tento účtovný
 MvtNotCorrectlyBalanced=Pohyb nie je správne vyvážený. Úver = %s. Debit = %s
 FicheVentilation=Viazacia karta
 GeneralLedgerIsWritten=Transakcie sú zapísané v knihe
-GeneralLedgerSomeRecordWasNotRecorded=Niektoré transakcie nebolo možné odoslať. Ak sa nenachádza žiadna iná chybová správa, pravdepodobne je to preto, že už boli odoslané.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=Zoznam produktov, ktoré nie sú viazané na žiadny účtovný účet
 ChangeBinding=Zmeňte väzbu
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Použiť hromadne kategórie
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Príroda
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Predaje
 AccountingJournalType3=Platby
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Vzorec
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=Pre krajinu %s nie je k dispozícii žiadna skupina účtovných účtov (pozri Domovská stránka - Nastavenie - slovníky)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Exportovaný formát nie je podporovaný pre túto stránku
 BookeppingLineAlreayExists=Riadky už existujú v archíve
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 2aa3f20285f..3acaf40375a 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Chyba, nemožno použiť voľbu @ li postupnosť {yy} {mm} alebo {yyyy} {mm} nie je v maske.
 UMask=Umask parameter pre nové súbory na Unix / Linux / BSD / Mac systému súborov.
 UMaskExplanation=Tento parameter umožňuje definovať oprávnenia v predvolenom nastavení na súbory vytvorené Dolibarr na serveri (počas nahrávania napríklad). <br> To musí byť osmičková hodnota (napr. 0666 znamená čítať a písať pre všetkých). <br> Tento parameter je k ničomu, na serveri Windows.
-SeeWikiForAllTeam=Pozrite sa na wiki stránku pre kompletný zoznam všetkých účastníkov a ich organizácie
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Oneskorenie pre ukladanie do medzipamäte export reakcie v sekundách (0 alebo prázdne bez vyrovnávacej pamäte)
 DisableLinkToHelpCenter=Skryť odkaz <b>&quot;Potrebujete pomoc či podporu&quot;</b> na prihlasovacej stránke
 DisableLinkToHelp=Skryť odkaz na online pomoc "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Zmeniť na cenách s hodnotou základného odkazu uvedené
 MassConvert=Spustite hmotnosť previesť
 String=Reťaz
 TextLong=Dlhý text
+HtmlText=Html text
 Int=Celé číslo
 Float=Vznášať sa
 DateAndTime=Dátum a hodina
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Odkaz na objekt
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Knižnica používaná pre generovanie PDF
-WarningUsingFPDF=Upozornenie: Váš <b>conf.php</b> obsahuje direktívu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že môžete používať knižnicu FPDF pre generovanie PDF súborov. Táto knižnica je stará a nepodporuje mnoho funkcií (Unicode, obraz transparentnosť, azbuka, arabské a ázijské jazyky, ...), takže môže dôjsť k chybám pri generovaní PDF. <br> Ak chcete vyriešiť tento a majú plnú podporu generovanie PDF, stiahnite si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knižnice</a> , potom komentár alebo odstrániť riadok <b>$ dolibarr_pdf_force_fpdf = 1,</b> a namiesto neho doplniť <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Zadajte telefónne číslo pre volania ukázať odkaz na test ClickToDial URL pre <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Použiť 3 krokové povolenie ked cena ( bez DPH ) je väčšia ako...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Používatelia a skupiny
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Okraje
 Module59000Desc=Modul pre správu marže
 Module60000Name=Provízie
 Module60000Desc=Modul pre správu provízie
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Zdroje
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Prečítajte si zákazníkov faktúry
@@ -833,11 +838,11 @@ Permission1251=Spustiť Hmotné dovozy externých dát do databázy (načítanie
 Permission1321=Export zákazníkov faktúry, atribúty a platby
 Permission1322=Znova otvoriť zaplatený účet
 Permission1421=Export objednávok zákazníkov a atribúty
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Ukázať naplánovanú úlohu
 Permission23002=Vytvoriť / upraviť naplánovanú úlohu
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Množstvo kolkov
 DictionaryPaymentConditions=Podmienky platby
 DictionaryPaymentModes=Metódy platby
 DictionaryTypeContact=Kontakt/Adresa
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ekologická daň
 DictionaryPaperFormat=Papierový formát
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=DPH riadenia
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=V predvolenom nastavení je navrhovaná DPH 0, ktorý možno použiť v prípadoch, ako je združenie jednotlivcov ou malých podnikov.
-VATIsUsedExampleFR=Vo Francúzsku, to znamená, že podniky a organizácie, ktoré majú skutočnú fiškálnu systém (zjednodušený reálny alebo normálne reálne). Systém, v ktorom je deklarovaný DPH.
-VATIsNotUsedExampleFR=Vo Francúzsku, to znamená, asociácie, ktoré sú bez DPH deklarované alebo spoločnosti, organizácie alebo slobodných povolaní, ktoré sa rozhodli pre Micro Enterprise daňového systému (s DPH v povolení) a platenými franšízovej DPH bez DPH vyhlásenia. Táto voľba sa zobrazí odkaz &quot;nepoužiteľné DPH - art-293B CGI&quot; na faktúrach.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Nepoužívajte druhá daň
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Typ ovládača
 SummarySystem=Systém súhrn informácií
 SummaryConst=Zoznam všetkých nastavených parametrov Dolibarr
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Štandardná ponuka manažér
 DefaultMenuSmartphoneManager=Smartphone Ponuka manažér
 Skin=Skin téma
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanentný vyhľadávací formulár na ľavom menu
 DefaultLanguage=Predvolený jazyk používať (kód jazyka)
 EnableMultilangInterface=Povoliť viacjazyčné rozhranie
 EnableShowLogo=Zobraziť logo na ľavom menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Názov
 CompanyAddress=Adresa
 CompanyZip=Zips
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informácie je rôzne technické informácie získate v režime iba pre čítanie a viditeľné len pre správcov.
 SystemAreaForAdminOnly=Táto oblasť je k dispozícii pre správcu užívateľa. Žiadny z Dolibarr oprávnenia môže znížiť tento limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Môžete si vybrať každý parameter týkajúce sa vzhľadu Dolibarr a cítiť sa tu
 AvailableModules=Available app/modules
 ToActivateModule=Pre aktiváciu modulov, prejdite na nastavenie priestoru (Domov-&gt; Nastavenie-&gt; Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=Názov súboru a cesta
 YouCanUseDOL_DATA_ROOT=Môžete použiť DOL_DATA_ROOT / dolibarr.log pre súbor denníka Dolibarr &quot;Dokumenty&quot; adresára. Môžete nastaviť inú cestu na uloženie tohto súboru.
 ErrorUnknownSyslogConstant=Konštantná %s nie je známe, Syslog konštantný
 OnlyWindowsLOG_USER=Windows podporuje iba LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Darovanie modul nastavenia
 DonationsReceiptModel=Vzor darovacej prijatie
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Nastavenie modulu Dane, sociálne a fiškálne dane a dividendy
 OptionVatMode=DPH z dôvodu
-OptionVATDefault=Hotovostný základ
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Základ nárastu
 OptionVatDefaultDesc=DPH je splatná: <br> - Na dobierku za tovar (používame dátumu vystavenia faktúry) <br> - Platby za služby
 OptionVatDebitOptionDesc=DPH je splatná: <br> - Na dobierku za tovar (používame dátumu vystavenia faktúry) <br> - Na faktúru (debetné) na služby
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=Na dobierku
 OnPayment=Na zaplatenie
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Faktúra použitá dáta
 Buy=Kúpiť
 Sell=Predávať
 InvoiceDateUsed=Faktúra použitá dáta
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Predaj účtu. kód
 AccountancyCodeBuy=Nákup účet. kód
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 822beaaeb15..cdc7be9fd5b 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Užívateľ %s overený
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Užívateľ %s zrušený
 MemberDeletedInDolibarr=Užívateľ %s zmazaný
-MemberSubscriptionAddedInDolibarr=Predplatné pre užívateľa %s pridané
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Zásielka %s overená
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Môžete tiež pridať nasledujúce parametre filtrovania výs
 AgendaUrlOptions3=<b>logina=%s</b> pre obmedzenie výstupu akciam ktoré vlastní užívateľ <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pre obmedzenie výstupu akciam prideleným projektu <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Zobraziť narodeniny kontaktov
 AgendaHideBirthdayEvents=Skryť naroodeniny kontaktov
 Busy=Zaneprázdnený
@@ -109,7 +112,7 @@ ExportCal=Export kalendár
 ExtSites=Importovať externé kalendára
 ExtSitesEnableThisTool=Zobrazit externé kalendáre ( definované v globálnom nastavení ) do agendy. Nemá vplyv na externé kalendáre definované užívateľom.
 ExtSitesNbOfAgenda=Počet kalendárov
-AgendaExtNb=Kalendár nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL pre prístup. Súbor iCal
 ExtSiteNoLabel=Nie Popis
 VisibleTimeRange=Vyditelný časový rozsah
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 8af424cee5c..649e8b3fcdf 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Platené späť
 DeletePayment=Odstrániť platby
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Dodávatelia platby
 ReceivedPayments=Prijaté platby
 ReceivedCustomersPayments=Platby prijaté od zákazníkov
@@ -91,7 +92,7 @@ PaymentAmount=Suma platby
 ValidatePayment=Overenie platby
 PaymentHigherThanReminderToPay=Platobné vyššia než upomienke na zaplatenie
 HelpPaymentHigherThanReminderToPay=Pozor, výška platby z jedného alebo viacerých účtov je vyššia ako vo zvyšku platiť. <br> Upravte položky, inak potvrdí a premýšľať o vytvorenie dobropisu preplatku dostane pre každú preplatku faktúry.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Klasifikáciu &quot;Zaplatené&quot;
 ClassifyPaidPartially=Klasifikovať &quot;Platené čiastočne&quot;
 ClassifyCanceled=Klasifikovať &quot;Opustené&quot;
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Prevod do budúcnosti zľavou
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Zadajte platby, ktoré obdržal od zákazníka
 EnterPaymentDueToCustomer=Vykonať platbu zo strany zákazníka
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Návrh (musí byť overená)
 BillStatusPaid=Platený
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Platená (pripravená pre záverečné faktúre)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Opustený
 BillStatusValidated=Overené (potrebné venovať)
 BillStatusStarted=Začíname
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Až do
 AmountExpected=Nárokovanej čiastky
 ExcessReceived=Nadbytok obdržal
+ExcessPaid=Excess paid
 EscompteOffered=Zľava ponúkol (platba pred semestra)
 EscompteOfferedShort=Zľava
 SendBillRef=Odovzdanie faktúry %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Zľava z %s dobropisu
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Tento druh úveru je možné použiť na faktúre pred jeho overenie
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nový absolútny zľava
 NewRelativeDiscount=Nový relatívna zľava
+DiscountType=Discount type
 NoteReason=Poznámka / príčina
 ReasonDiscount=Dôvod
 DiscountOfferedBy=Poskytnuté
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill adresa
 HelpEscompte=Táto zľava je zľava poskytnutá zákazníkovi, pretože jej platba bola uskutočnená pred horizonte.
 HelpAbandonBadCustomer=Táto suma bola opustená (zákazník povedal, aby bol zlý zákazník) a je považovaný za výnimočný voľné.
@@ -341,10 +348,10 @@ NextDateToExecution=Dátum dalšieho generovania faktúr
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Dátum posledného generovania faktúr
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Maximálny počet generovaných faktúr
-NbOfGenerationDone=Počet už vygenerovaných faktúr
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Overiť faktúrý automaticky
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 2ebf230c850..0b7af8128ae 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -43,7 +43,8 @@ Individual=Súkromná osoba
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Materská spoločnosť
 Subsidiaries=Dcérske spoločnosti
-ReportByCustomers=Správa o zákazníkov
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Správa sadzby
 CivilityCode=Zdvorilosť kód
 RegisteredOffice=Sídlo spoločnosti
@@ -75,10 +76,12 @@ Town=Mesto
 Web=Web
 Poste= Pozícia
 DefaultLang=Predvolený jazyk
-VATIsUsed=DPH sa používa
-VATIsNotUsed=DPH sa nepoužíva
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Návrhy
 OverAllOrders=Objednávky
@@ -239,7 +242,7 @@ ProfId3TN=Prof ID 3 (Douane kód)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Daňové identifikačné číslo
-VATIntraShort=Daňové identifikačné číslo
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax je platná
+VATReturn=VAT return
 ProspectCustomer=Prospect / zákazník
 Prospect=Vyhliadka
 CustomerCard=Zákaznícka karta
 Customer=Zákazník
 CustomerRelativeDiscount=Relatívna zákazník zľava
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relatívna zľava
 CustomerAbsoluteDiscountShort=Absolútna zľava
 CompanyHasRelativeDiscount=Tento zákazník má predvolenú zľavu <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Tento zákazník nemá relatívnej zľavu v predvolenom nastavení
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Tento zákazník má stále dobropisy pre <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Tento zákazník nemá diskontné úver k dispozícii
-CustomerAbsoluteDiscountAllUsers=Absolútna zľavy (udelená všetkým užívateľom)
-CustomerAbsoluteDiscountMy=Absolútna zľavy (udelené sami)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Nikto
 Supplier=Dodávateľ
 AddContact=Vytvoriť kontakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Žiadny prístup Dolibarr
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakty a vlastnosti
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontakty/adresy (tretích strán aj iných) a atribúty
-ImportDataset_company_3=Bankové spojenie
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Cenová hladina
 DeliveryAddress=Dodacia adresa
 AddAddress=Pridať adresu
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. za vynikajúce účet
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Späť numero vo formáte %syymm-nnnn pre zákazníka kódu a %syymm-NNNN s dodávateľmi kódu, kde yy je rok, MM je mesiac a nnnn je sekvencia bez prerušenia a bez návratu na 0.
 LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeniť.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 9a9003a0143..dd6bafb2f82 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -31,7 +31,7 @@ Credit=Úver
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net zhromaždený
 AmountHTVATRealPaid=Čisté platené
-VATToPay=DPH predáva
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Platby
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Zobraziť DPH platbu
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Obsahuje všetky účinné platby faktúry prijaté od klientov. <br> - Je založený na dátume úhrady týchto faktúr <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Správa o treťou stranou IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Správa o treťou stranou IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Správa zákazníka DPH vyzdvihnúť a zaplatiť
-VATReportByCustomersInDueDebtMode=Správa zákazníka DPH vyzdvihnúť a zaplatiť
-VATReportByQuartersInInputOutputMode=Správa sadzby dane z pridanej hodnoty vybranej a odvedenej
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Správa sadzby dane z pridanej hodnoty vybranej a odvedenej
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Pozri správu <b>%sVAT encasement%s</b> pre štandardné výpočet
 SeeVATReportInDueDebtMode=Pozri správu <b>%sVAT na flow%s</b> pre výpočet s možnosťou na toku
 RulesVATInServices=- V prípade služieb, správa obsahuje DPH predpisy skutočne prijaté alebo vydané na základe dátumu splatnosti.
-RulesVATInProducts=- U hmotného majetku, ale zahŕňa DPH faktúry na základe dátumu vystavenia faktúry.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- V prípade služieb, správa obsahuje faktúr s DPH z dôvodu, platené, alebo nie, na základe dátumu vystavenia faktúry.
-RulesVATDueProducts=- U hmotného majetku, ale zahŕňa faktúr s DPH, na základe dátumu vystavenia faktúry.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Poznámka: U hmotného majetku, mal by používať termín dodania bude spravodlivejší.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%% / Faktúra
 NotUsedForGoods=Nepoužíva sa na tovar
 ProposalStats=Štatistiky o návrhoch
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití <b>hotovosti evidencia</b> režim nie je relevantná. Táto správa je k dispozícii len pri použití <b>zásnubný evidencia</b> režimu (pozri nastavenie účtovného modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 58348fe1e56..ba8fc86897a 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Žiadny registrovaný práce
 CronPriority=Priorita
 CronLabel=Štítok
 CronNbRun=Nb. začať
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Každý
 JobFinished=Práca zahájená a dokončená
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Z
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell príkaz
-CronCannotLoadClass=Nemožno načítať triedu alebo objekt %s %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 3de9ca66b12..ec1972457f3 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP zhoda nie je úplná.
 ErrorLDAPMakeManualTest=. LDIF súbor bol vytvorený v adresári %s. Skúste načítať ručne z príkazového riadku získať viac informácií o chybách.
 ErrorCantSaveADoneUserWithZeroPercentage=Nemožno uložiť akciu s &quot;Štatút nezačal&quot;, ak pole &quot;vykonáva&quot; je tiež vyplnená.
 ErrorRefAlreadyExists=Ref používa pre tvorbu už existuje.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Nepodarilo sa pridať záznam do %s %s poštár zo
 ErrorFailedToRemoveToMailmanList=Nepodarilo sa odstrániť záznam %s %s na zoznam poštár alebo SPIP základne
 ErrorNewValueCantMatchOldValue=Nová hodnota nemôže byť presne staré
 ErrorFailedToValidatePasswordReset=Nepodarilo sa Reinita heslo. Môže byť REINIT už bola vykonaná (tento odkaz možno použiť iba raz). Ak nie, skúste reštartovať REINIT procesu.
-ErrorToConnectToMysqlCheckInstance=Pripojenie k databáze zlyhá. Skontrolujte, MySQL server beží (vo väčšine prípadov, môžete ju spustiť z príkazového riadku: sudo / etc / init.d / mysql start ').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Nepodarilo sa pridať kontakt
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Platobný režim bol nastavený na typ %s ale nastavenie modulu Faktúry nebola dokončená definovať informácie, ktoré sa pre tento platobný režim.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/sk_SK/loan.lang b/htdocs/langs/sk_SK/loan.lang
index f267da5524b..8ea9972c9e6 100644
--- a/htdocs/langs/sk_SK/loan.lang
+++ b/htdocs/langs/sk_SK/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index a74909effcb..8f42bf2ca3c 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 9b242072db3..2d76df756fc 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s nie je definovaný
 ErrorUnknown=Neznáma chyba
 ErrorSQL=Chyba SQL
 ErrorLogoFileNotFound=Súbor loga '%s' nebol nájdený
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Choď na Nastavenie modulu to opraviť
 ErrorFailedToSendMail=Nepodarilo sa odoslať poštu (vysielač, prijímač = %s = %s)
 ErrorFileNotUploaded=Súbor nebol nahraný. Skontrolujte, či veľkosť nepresahuje maximálnu povolenú, že voľné miesto na disku a že už nie je súbor s rovnakým názvom v tomto adresári.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Chyba, žiadne sadzby DPH stanovenej pre k
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Chyba sa nepodarilo uložiť súbor.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Nastaviť dátum
 SelectDate=Vybrať dátum
 SeeAlso=Pozri tiež %s
 SeeHere=Viď tu
+ClickHere=Kliknite tu
+Here=Here
 Apply=Platiť
 BackgroundColorByDefault=Predvolené farba pozadia
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Odkaz
 Select=Vybrať
 Choose=Vybrať
 Resize=Zmena veľkosti
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Autor
 User=Užívateľ
@@ -325,8 +328,10 @@ Default=Štandardné
 DefaultValue=Východisková hodnota
 DefaultValues=Default values
 Price=Cena
+PriceCurrency=Price (currency)
 UnitPrice=Jednotková cena
 UnitPriceHT=Jednotková cena (bez DPH)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Množstvo
 AmountInvoice=Fakturovaná čiastka
+AmountInvoiced=Amount invoiced
 AmountPayment=Suma platby
 AmountHTShort=Suma (bez DPH)
 AmountTTCShort=Čiastka (s DPH)
@@ -353,6 +359,7 @@ AmountLT2ES=Suma IRPF
 AmountTotal=Celková čiastka
 AmountAverage=Priemerná suma
 PriceQtyMinHT=Cena množstvo min. (Po zdanení)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percento
 Total=Celkový
 SubTotal=Medzisúčet
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Daňová sadzba
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Priemer
 Sum=Súčet
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Hotový
 ActionUncomplete=Neúplné
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kontakty pre túto tretiu stranu
 ContactsAddressesForCompany=Kontakty / adries tretím stranám tejto
 AddressesForCompany=Adresy pre túto tretiu stranu
@@ -427,6 +437,9 @@ ActionsOnCompany=Akcia o tejto tretej osobe
 ActionsOnMember=Akcia o tomto členovi
 ActionsOnProduct=Events about this product
 NActionsLate=%s neskoro
+ToDo=Ak chcete
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Požiadavka už bola zaznamenaná
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Pozor, ste v režime údržby, tak len prihlásen
 CoreErrorTitle=Systémová chyba
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kreditná karta
+ValidatePayment=Overenie platby
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Polia označené * sú povinné <b>%s</b>
 FieldsWithIsForPublic=Polia s <b>%s</b> sú uvedené na verejnom zozname členov. Ak nechcete, aby to, zaškrtnúť &quot;verejný&quot; box.
 AccordingToGeoIPDatabase=(Podľa prepočet GeoIP)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Klasifikovať účtované
+ClassifyUnbilled=Classify unbilled
 Progress=Pokrok
-ClickHere=Kliknite tu
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekt
 Projects=Projekty
 Rights=Oprávnenia
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Pondelok
 Tuesday=Utorok
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Tretie strany
 SearchIntoContacts=Kontakty
 SearchIntoMembers=Členovia
 SearchIntoUsers=Užívatelia
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Všetci
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Priradené
diff --git a/htdocs/langs/sk_SK/margins.lang b/htdocs/langs/sk_SK/margins.lang
index 461d45ea0cf..f4bce25ade6 100644
--- a/htdocs/langs/sk_SK/margins.lang
+++ b/htdocs/langs/sk_SK/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index ecd2b64a1e9..e89fffdc06b 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Zoznam potvrdených verejné členmi
 ErrorThisMemberIsNotPublic=Tento člen je neverejný
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Ďalší člen (meno: <b>%s,</b> login: <b>%s)</b> je už spojená s tretími stranami <b>%s.</b> Odstráňte tento odkaz ako prvý, pretože tretia strana nemôže byť spájaná len člen (a vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Z bezpečnostných dôvodov musí byť udelené povolenie na úpravu, aby všetci užívatelia mohli spojiť člena užívateľa, ktorá nie je vaša.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Obsah vašej členskú kartu
 SetLinkToUser=Odkaz na užívateľovi Dolibarr
 SetLinkToThirdParty=Odkaz na Dolibarr tretej osobe
 MembersCards=Členovia vizitky
@@ -108,17 +106,33 @@ PublicMemberCard=Členské verejné karta
 SubscriptionNotRecorded=Predplatné nie je zaznamenané
 AddSubscription=Vytvoriť predplatné
 ShowSubscription=Zobraziť predplatné
-SendAnEMailToMember=Poslať e-mail Informácie o členovi
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Obsah vašej členskú kartu
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Predmet e-mailu dostal v prípade auto-nápis host
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail prijatý v prípade auto-nápis host
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Predmet e-mailu pre členské autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail pre členské autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=Predmet e-mailu pre členské validáciu
-DescADHERENT_MAIL_VALID=EMail pre členské validáciu
-DescADHERENT_MAIL_COTIS_SUBJECT=Predmet e-mailu na upisovanie
-DescADHERENT_MAIL_COTIS=E-mail pre odber
-DescADHERENT_MAIL_RESIL_SUBJECT=Predmet e-mailu pre členské resiliation
-DescADHERENT_MAIL_RESIL=EMail pre členské resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Odosielateľa pre automatické e-maily
 DescADHERENT_ETIQUETTE_TYPE=Formát etikety stránku
 DescADHERENT_ETIQUETTE_TEXT=Text tlačený na listoch členských adrese
@@ -177,3 +191,8 @@ NoVatOnSubscription=Nie TVA za upísané vlastné imanie
 MEMBER_PAYONLINE_SENDEMAIL=Email pre upozornenia ked Dolibarr zaznamená potvrdenie overenej platby pre odber. ( pr. paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt použitý pre riadok predplatného vo faktúre %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index fde04a06e92..f0019b9084a 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Správa o overených strane platobnej návrate
 MessageKO=Správa o zrušení strane platobnej návrate
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Prepojený objekt
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Začnite nahrávať
 CancelUpload=Zrušenie nahrávania
 FileIsTooBig=Súbory je príliš veľký
 PleaseBePatient=Prosím o chvíľku strpenia ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Požiadavka na zmenu svojej heslo Dolibarr bol prijatý
 NewKeyIs=To je vaše nové kľúče k prihláseniu
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Názov
 WEBSITE_DESCRIPTION=Popis
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/sk_SK/paypal.lang b/htdocs/langs/sk_SK/paypal.lang
index f2243c20c83..013f03ea5f5 100644
--- a/htdocs/langs/sk_SK/paypal.lang
+++ b/htdocs/langs/sk_SK/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal iba
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=To je id transakcie: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Pridať URL Paypal platby pri odoslaní dokumentu e-mailom
-PredefinedMailContentLink=Môžete kliknúť na nižšie uvedený odkaz bezpečné vykonať platbu (PayPal), ak sa tak už nebolo urobené. \n\n %s \n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index abd4f864cef..b7b778b0787 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Produkt alebo služba
 ProductsAndServices=Produkty a služby
 ProductsOrServices=Produkty alebo služby
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Ste si istí, že chcete zmazať túto produktovú radu
 ProductSpecial=Špeciálne
 QtyMin=Minimálna Množstvo
 PriceQtyMin=Cena za túto min. Množstvo (w / o zľava)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Sadzba DPH (tohto podniku / produktu)
 DiscountQtyMin=Predvolené zľava Množstvo
 NoPriceDefinedForThisSupplier=Nie cena / ks definovaný tohto podniku / produktu
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 2c350453439..687623d8776 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Projekt kontakty
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Všetky projekty
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Tento názor predstavuje všetky projekty, ktoré sú prístupné pre čítanie.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Tento názor predstavuje všetky projekty a úlohy, ktoré sú prístupné pre čítanie.
 ProjectsDesc=Tento názor predstavuje všetky projekty (užívateľského oprávnenia udeliť oprávnenie k nahliadnutiu všetko).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Tento názor predstavuje všetky projekty a úlohy, ktoré sú prístupné pre čítanie.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Čas strávený
 MyTimeSpent=Môj čas strávený
+BillTime=Bill the time spent
 Tasks=Úlohy
 Task=Úloha
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Zoznam udalostí spojených s projektom
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Aktivita na projekte tento týždeň
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktivita na projekte tento mesiac
 ActivityOnProjectThisYear=Aktivita na projekte v tomto roku
 ChildOfProjectTask=Dieťa projektu / úlohy
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Nie je vlastníkom tohto súkromného projektu
 AffectedTo=Priradené
 CantRemoveProject=Tento projekt nie je možné odstrániť, pretože je odvolával sa na niektorými inými objektmi (faktúry, objednávky či iné). Pozri príchodov kartu.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nemožno presunúť úloha termín podľa nový dátum začatia projektu
 ProjectsAndTasksLines=Projekty a úlohy
 ProjectCreatedInDolibarr=Projekt vytvoril %s
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/sk_SK/propal.lang b/htdocs/langs/sk_SK/propal.lang
index d57ee72a994..7c1e4f76cad 100644
--- a/htdocs/langs/sk_SK/propal.lang
+++ b/htdocs/langs/sk_SK/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Podpis (potreby fakturácia)
 PropalStatusNotSigned=Nie ste prihlásený (uzavretý)
 PropalStatusBilled=Účtované
 PropalStatusDraftShort=Návrh
+PropalStatusValidatedShort=Overené
 PropalStatusClosedShort=Zatvorené
 PropalStatusSignedShort=Podpísaný
 PropalStatusNotSignedShort=Nie ste prihlásený
diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
index 905262220d3..65643010092 100644
--- a/htdocs/langs/sk_SK/salaries.lang
+++ b/htdocs/langs/sk_SK/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Táto hodnota môže byť použitá pre výpočet ceny času str
 TJMDescription=Táto hoidnota je iba informačná a nie je použitá pre kalkulácie
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index cc64ea9f1ec..a62a119faf6 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Upraviť sklad
 MenuNewWarehouse=Nový sklad
 WarehouseSource=Zdrojový sklad
 WarehouseSourceNotDefined=Nie je definovaný žiadny sklad,
+AddWarehouse=Create warehouse
 AddOne=Pridať jeden
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Cieľový sklad
 ValidateSending=Zmazať odoslanie
 CancelSending=Zrušiť odoslanie
@@ -22,6 +24,7 @@ Movements=Pohyby
 ErrorWarehouseRefRequired=Referenčné meno skladu je povinné
 ListOfWarehouses=Zoznam skladov
 ListOfStockMovements=Zoznam skladových pohybov
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/sk_SK/stripe.lang b/htdocs/langs/sk_SK/stripe.lang
index 49adda3b23c..3e068895bbd 100644
--- a/htdocs/langs/sk_SK/stripe.lang
+++ b/htdocs/langs/sk_SK/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang
index c3aee29c971..91a69a2394d 100644
--- a/htdocs/langs/sk_SK/trips.lang
+++ b/htdocs/langs/sk_SK/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Množstvo alebo kilometrov
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index cd79d42da9e..2118d8ddb1b 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -69,8 +69,8 @@ InternalUser=Interný užívateľ
 ExportDataset_user_1=Užívatelia a vlastnosti Dolibarr
 DomainUser=Užívateľ domény %s
 Reactivate=Reaktivácia
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Povolenie udelené, pretože dedia z jednej zo skupiny užívateľov.
 Inherited=Zdedený
 UserWillBeInternalUser=Vytvorený užívateľ bude interný užívateľ (pretože nie je spojený s určitou treťou stranou)
@@ -93,6 +93,7 @@ NameToCreate=Názov vytváranej tretej strany
 YourRole=Vaše roly
 YourQuotaOfUsersIsReached=Vaša kvóta aktívnych používateľov bola dosiahnutá!
 NbOfUsers=Počet užívateľov
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Iba superadmin môže degradovať superadmina
 HierarchicalResponsible=Supervízor
 HierarchicView=Hierarchické zobrazenie
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index c7da61cb981..a23076138c6 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Tu vytvorte toľko riadkov kolko rôzných webstránok potrebuj
 DeleteWebsite=Zmazať webstránku
 ConfirmDeleteWebsite=Určite chcete zmazať túto web stránku. Všetky podstránka a obsah budú zmazané tiež.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Meno stránky
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL alebo externý CSS dokument
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=Zobraziť stránku na novej karte
 SetAsHomePage=Nastaviť ako domovskú stránku
 RealURL=Skutočná URL
 ViewWebsiteInProduction=Zobraziť web stránku použitím domovskej URL
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Čítať
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index 74fb8714221..06ca50c5e0d 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Oblasť Inkaso
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Inkaso objednávky
-StandingOrder=Inkaso objednávka
+StandingOrdersPayment=Inkaso objednávky
+StandingOrderPayment=Inkaso objednávka
 NewStandingOrder=Nová inkaso objednávka
 StandingOrderToProcess=Ak chcete spracovať
 WithdrawalsReceipts=Inkaso objednávky
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Treťou stranou kód banky
-NoInvoiceCouldBeWithdrawed=Nie faktúra withdrawed s úspechom. Skontrolujte, že faktúry sú na firmy s platným BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Klasifikovať pripísaná
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 431929dbd26..725a2802bc8 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Kontni plan
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Vrsta dokumenta
 Docdate=Datum
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Račun Label
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Plačilo računa kupca
-ThirdPartyAccount=Thirdparty račun
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko ra
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Narava
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Prodaja
 AccountingJournalType3=Nabava
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 4c24796c56d..87f11b669c9 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Napaka, ni možno uporabiti opcije @, za vsakoletn
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Napaka, ni možno uporabiti opcije @, če sekvence {yy}{mm} ali {yyyy}{mm} ni v maski.
 UMask=UMask parameter za nove datoteke na Unix/Linux/BSD datotečnem sistemu.
 UMaskExplanation=Ta parameter omogoča definicijo privzetih dovoljenj za datoteke na strežniku, ki jih je kreiral Dolibarr (na primer med nalaganjem).<br>Vrednost  je oktalna (na primer, 0666 pomeni branje in pisanje za vse).<br>Tega parametra ni na Windows strežniku.
-SeeWikiForAllTeam=Za celoten seznam vseh udeležencev in njihove organizacije poglejte na wiki stran
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Zakasnitev predpomnilnika za izvozni odziv v sekundah (0 ali prazno pomeni, da ni predpomnilnika)
 DisableLinkToHelpCenter=Skrij link "<b>Potrebujete pomoč ali podporo</b>" na prijavni strani
 DisableLinkToHelp=Skrij povezavo do on-line pomoči "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Sprememba cen z definirano osnovno referenčno vrednostjo
 MassConvert=Poženi množično pretvorbo
 String=Niz
 TextLong=Dolgo besedilo
+HtmlText=Html text
 Int=Celo število
 Float=Plavajoče
 DateAndTime=Datum in ura
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Poveži z objektom
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Pozor: vaš <b>conf.php</b> vsebuje direktivo <b>dolibarr_pdf_force_fpdf=1</b>. To pomeni, da uporabljate knjižnico FPDF za generiranje PDF datotek. Ta knjižnica je stara in ne podpira številnih značilnosti (Unicode, transparentnost slike, cirilico, arabske in azijske jezike, ...), zado lahko med generiranjem PDF pride do napak.<br>Za rešitev tega problema in polno podporo PDF generiranja, prosimo da naložite <a href="http://www.tcpdf.org/" target="_blank">TCPDF knjižnico</a>, nato označite kot komentar ali odstranite vrstico <b>$dolibarr_pdf_force_fpdf=1</b>, in namesto nje dodajte <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=V nekaterih državah se pojavijo 2 ali 3 davki v vsaki vrstici računa. V tem primeru izberite vrsto drugega in tretjega davka in stopnjo. Možne vrste so:<br>1 : lokalni davek na proizvode in storitve brez DDV (lokalni davek se računa na znesek brez davka)<br>2 : lokalni davek na proizvode in storitve z DDV (lokalni davek se računa na znesek + osnovni davek)<br>3 : lokalni davek na proizvode brez DDV (lokalni davek se računa na znesek brez davka)<br>4 :  lokalni davek na proizvode z DDV (lokalni davek se računa na znesek + osnovni davek)<br>5 : lokalni davek na storitve brez DDV (lokalni davek se računa na znesek brez davka)<br>6 :  lokalni davek na storitve z DDV (lokalni davek se računa na znesek + osnovni davek)
 SMS=SMS
 LinkToTestClickToDial=Vnesite telefonsko številko, na katero kličete za prikaz povezave za testiranje ClickToDial url za uporabnika <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Uporabniki & skupine
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Marže
 Module59000Desc=Modul za upravljanje z maržami
 Module60000Name=Provizije
 Module60000Desc=Modul za upravljanje s provizijami
+Module62000Name=Mednarodni poslovni izraz
+Module62000Desc=Mednarodnemu poslovnemu izrazu dodaj lastnost
 Module63000Name=Viri
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Branje računov
@@ -833,11 +838,11 @@ Permission1251=Izvajanje masovnega izvoza zunanjih podatkov v bazo podatkov (nal
 Permission1321=Izvoz računov za kupce, atributov in plačil
 Permission1322=Reopen a paid bill
 Permission1421=Izvoz naročil kupcev in atributov
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Kreiranje/spreminjanje vaših zahtevkov za dopust
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Brisanje zahtevkov za dopust
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Kreiranje/spreminjanje zahtevkov za dopust za vse
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Administriranje zahtevkov za dopust (nastavitve in posodobitev stanja)
 Permission23001=Preberi načrtovano delo
 Permission23002=Ustvari/posodobi načrtovano delo
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Znesek kolekov
 DictionaryPaymentConditions=Pogoji plačil
 DictionaryPaymentModes=Načini plačil
 DictionaryTypeContact=Tipi kontaktov/naslovov
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ekološka taksa (WEEE)
 DictionaryPaperFormat=Formati papirja
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Upravljanje DDV
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Privzeta predlagana stopnja DDV je 0, kar se lahko uporabi za primere kot so združenja, posamezniki ali majhna podjetja.
-VATIsUsedExampleFR=V Franciji to pomeni podjetja ali organizacije, ki imajo realen fiskalni sistem (poenostavljen realen ali normalen realen), v katerem mora biti DDV prikazan.
-VATIsNotUsedExampleFR=V Franciji to pomeni združenja, ki niso davčni zavezanci ali podjetja, organizacije ali svobodni poklici, ki so izbrali davčni sistem za mikro podjetja (franšizni DDV) in plačajo franšizni DDV brez davčne izjave.  Ta izbira prikaže na računu opombo "DDV ni obračunan v skladu z …".
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Stopnja
 LocalTax1IsNotUsed=Ne uporabi drugega davka
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Tip gonilnika
 SummarySystem=Povzetek sistemskih informacij
 SummaryConst=Seznam vseh Dolibarr nastavitvenih parametrov
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Vmesnik za standardni meni
 DefaultMenuSmartphoneManager=Vmesnik za Smartphone meni
 Skin=Tema preobleke
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Stalno polje za iskanje na levem meniju
 DefaultLanguage=Privzet jezik uporabe (koda jezika)
 EnableMultilangInterface=Omogočen večjezični vmesnik
 EnableShowLogo=Prikaži logo na levem meniju
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Ime podjetja
 CompanyAddress=Naslov
 CompanyZip=Poštna številka
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemske informacije so raznovrstne tehnične informacije, ki so na voljo samo v bralnem načinu in jih vidi samo administrator.
 SystemAreaForAdminOnly=To področje je na voljo samo administratorju. Nobeno od Dolibarr dovoljenj ne more spremeniti teh omejitev.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Tukaj lahko izberete parametre, ki določajo videz in vtis aplikacije Dolibarr
 AvailableModules=Available app/modules
 ToActivateModule=Za aktivacijo modula, pojdite na področje nastavitev (Domov->Nastavitve->Moduli).
@@ -1441,6 +1448,9 @@ SyslogFilename=Ime datoteke in pot
 YouCanUseDOL_DATA_ROOT=Za log datoteko v Dolibarr dokumentni mapi lahko uporabite DOL_DATA_ROOT/dolibarr.log. Za shranjevanje te datoteke lahko nastavite tudi drugačno pot.
 ErrorUnknownSyslogConstant=Konstanta %s ni znana syslog konstanta
 OnlyWindowsLOG_USER=Windowsi podpirajo samo LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Nastanitev modula za donacije
 DonationsReceiptModel=Predloga računa za donacijo
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Nastavitveni modul za DDV, socialne ali fiskalne davke in dividende
 OptionVatMode=Rok za DDV
-OptionVATDefault=Gotovinska osnova
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Povečana osnova
 OptionVatDefaultDesc=DDV zapade:<br>- ob dobavi/plačilu blaga<br>- ob plačilu storitev
 OptionVatDebitOptionDesc=DDV zapade:<br>- ob dobavi/plačilu blaga<br>- ob računu (zapadlosti) za storitev
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Privzeta zapadlost DDV glede na izbrano opcijo:
 OnDelivery=Ob dobavi
 OnPayment=Ob plačilu
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Predvideva se datum računa
 Buy=Nakup
 Sell=Prodaja
 InvoiceDateUsed=Uporabljen datum računa
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Računovodska koda prodaje
 AccountancyCodeBuy=Računovodska koda nabave
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 402c6edd3cf..f87ca6ba364 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Član %s potrjen
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Član %s izbrisan
-MemberSubscriptionAddedInDolibarr=Naročnina za člana %s dodana
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Pošiljka %s potrjena
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=V filtriran izhod lahko dodate tudi naslednje parametre:
 AgendaUrlOptions3=<b>logina=%s</b> za omejitev izhoda na aktivnosti v lasti uporabnika <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>projekt=PROJECT_ID</b> za omejitev izhoda na aktivnosti povezane s projektom<b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Zaseden
@@ -109,7 +112,7 @@ ExportCal=Izvoz koledarja
 ExtSites=Zunanji koledarji
 ExtSitesEnableThisTool=Prikaži zunanje koledarje (definirane v globalnih nastavitvah) v agendi. Nima učinka na zunanje koledarje, ki jih določi uporabnik.
 ExtSitesNbOfAgenda=Število koledarjev
-AgendaExtNb=Koledar št. %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL za dostop do .ical datoteke
 ExtSiteNoLabel=Ni opisa
 VisibleTimeRange=Prikazano časovno območje
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 1e574fa42da..8ad1c72386e 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Vrnjeno plačilo
 DeletePayment=Brisanje plačila
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Plačila dobaviteljem
 ReceivedPayments=Prejeta plačila
 ReceivedCustomersPayments=Prejeta plačila od kupcev
@@ -91,7 +92,7 @@ PaymentAmount=Znesek plačila
 ValidatePayment=Potrdi plačilo
 PaymentHigherThanReminderToPay=Plačilo višje od opomina
 HelpPaymentHigherThanReminderToPay=Pozor, plačilo zneska enega ali več računov  je višje od preostanka za plačilo. <br> Popravite vaš vnos, ali potrdite znesek in pripravite dobropise za prekoračene zneske za vsak preveč plačan račun.
-HelpPaymentHigherThanReminderToPaySupplier=Pozor, plačilo zneska enega ali več računov je višje od preostanka za plačilo. <br> Popravite vaš vnos, ali potrdite znesek.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Označeno kot 'Plačano'
 ClassifyPaidPartially=Označeno kot 'Delno plačano'
 ClassifyCanceled=Označeno kot 'Opuščeno'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Pretvori v bodoči popust
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Vnesi prejeto plačilo od kupca
 EnterPaymentDueToCustomer=Vnesi rok plačila za kupca
 DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan opomin enako nič
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Osnutek (potrebna potrditev)
 BillStatusPaid=Plačano
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Spremenjeno v popust
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Opuščeno
 BillStatusValidated=Potrjeno (potrebno plačilo)
 BillStatusStarted=Začeto
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Na čakanju
 AmountExpected=Reklamiran znesek
 ExcessReceived=Prejet presežek
+ExcessPaid=Excess paid
 EscompteOffered=Ponujen popust (plačilo pred rokom)
 EscompteOfferedShort=Popust
 SendBillRef=Oddaja račuuna %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Popust z dobropisa %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ta način dobropisa se lahko uporabi na računu pred njegovo potrditvijo
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nov fiksni popust
 NewRelativeDiscount=Nov relativni popust
+DiscountType=Discount type
 NoteReason=Opomba/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobril
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Naslov za račun
 HelpEscompte=Ta popust je bil kupcu odobren zaradi plačila pred rokom zapadlosti.
 HelpAbandonBadCustomer=Ta znesek je bil opuščen (Kupec je označen kot 'slab kupec') in se obravnava kot potencialna izguba.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 116fee4654d..8ec7f29265f 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -43,7 +43,8 @@ Individual=Posameznik
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Lastniško podjetje
 Subsidiaries=Podružnice
-ReportByCustomers=Poročilo po kupcih
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Poročilo po četrtletjih
 CivilityCode=Vljudnostni naziv
 RegisteredOffice=Registrirana poslovalnica
@@ -75,10 +76,12 @@ Town=Mesto
 Web=Spletna stran
 Poste= Položaj
 DefaultLang=Privzet jezik
-VATIsUsed=Davčni zavezanec
-VATIsNotUsed=Ni davčni zavezanec
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Ponudbe
 OverAllOrders=Naročila
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN==
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ==
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Davčna številka
-VATIntraShort=Davčna številka
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Ime zavezanca veljavno
+VATReturn=VAT return
 ProspectCustomer=Možna stranka / kupec
 Prospect=Možna stranka
 CustomerCard=Kartica kupca
 Customer=Kupec
 CustomerRelativeDiscount=Relativni popust za kupca
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Absolutni popust
 CompanyHasRelativeDiscount=Temu kupcu pripada popust v višini <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ta kupec nima odobrenega relativnega popusta
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Ta kupec ima dobropis ali depozit v višini <b>%s %s</b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Ta kupec nima diskontnega kredita
-CustomerAbsoluteDiscountAllUsers=Absolutni popust (odobren od vseh uporabnikov)
-CustomerAbsoluteDiscountMy=Absolutni popust (odobren osebno od vas)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Brez popusta
 Supplier=Dobavitelj
 AddContact=Ustvari kntakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Nima dostopa v Dolibarr
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakti in lastništvo
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontakti/naslovi (partnerjev ali ne) in atributi
-ImportDataset_company_3=Podatki o banki
-ImportDataset_company_4=Patner/prodajni predstavnik (Vpliva na prodajne prdstavnike partnerjem)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Cenovni nivo
 DeliveryAddress=Naslov za dostavo
 AddAddress=Dodaj naslov
@@ -406,15 +419,16 @@ ProductsIntoElements=Seznam proizvodov/storitev v %s
 CurrentOutstandingBill=Trenutni neplačan račun
 OutstandingBill=Max. za neplačan račun
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Predlaga kodo kupca v formatu %syymm-nnnn in kodo dobavitelja v formatu %syymm-nnnn kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledka, večja od 0.
 LeopardNumRefModelDesc=Koda kupca / dobavitelja po želji. Lahko jo kadarkoli spremenite.
 ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Podvojen partner (partner, ki ga želite zbrisati)
 MergeThirdparties=Združi partnerje
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Partnerja sta bila združena
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=Pri brisanju partnerja je prišlo do napake. Prosimo, preverite dnevnik. Spremembe so bile preklicane.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 2bb8a4faede..40bc4bdcba1 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -31,7 +31,7 @@ Credit=Kredit
 Piece=Računovodska dokumentacija
 AmountHTVATRealReceived=Neto priliv
 AmountHTVATRealPaid=Neto odliv
-VATToPay=DDV za plačilo
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=Plačila IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Prikaži plačilo DDV
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Vključuje vsa dejanska plačila kupcev.<br>- Temelji na datumu plačila teh računov<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Poročilo tretjih oseb IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Poročilo tretjih oseb IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Poročilo o pobranem in plačanem DDV po kupcih
-VATReportByCustomersInDueDebtMode=Poročilo o pobranem in plačanem DDV po kupcih
-VATReportByQuartersInInputOutputMode=Poročilo o pobranem in plačanem DDV po stopnji DDV
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Poročilo o pobranem in plačanem DDV po stopnji DDV
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Glej poročilo <b>%sVAT encasement%s</b> za standardno kalkulacijo
 SeeVATReportInDueDebtMode=Glej poročilo <b>%sVAT on flow%s</b> za kalkulacijo z opcijo denarnega toka
 RulesVATInServices=- Za storitve, poročilo vključuje DDV predpise dejansko prejete ali izdane na podlagi datuma plačila.
-RulesVATInProducts=- Za materialnih sredstev, da vključuje DDV račune na podlagi datuma izdaje računa.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Za storitve, poročilo vključuje DDV račune zaradi, plačane ali ne, na podlagi datuma izdaje računa.
-RulesVATDueProducts=- Za materialnih sredstev, vključuje DDV, račune, na podlagi datuma izdaje računa.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Opomba: Za material naj se zaradi korektnosti uporablja datum dobave.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/račun
 NotUsedForGoods=Se ne uporablja za material
 ProposalStats=Statistika po ponudbah
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Način kalkulacije
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index 74f87ebd336..bf247f95c88 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Nobene naloge niso registrirane
 CronPriority=Prioriteta
 CronLabel=Oznaka
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Od
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index b408983d322..58482d10514 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP združevanje ni popolno.
 ErrorLDAPMakeManualTest=Datoteka .ldif je bila ustvarjena v mapi %s. Poskusite jo naložiti ročno preko ukazne vrstice, da bi dobili več podatkov o napaki.
 ErrorCantSaveADoneUserWithZeroPercentage=Ni možno shraniti aktivnosti "statut not started" če je tudi polje "done by" izpolnjeno.
 ErrorRefAlreadyExists=Referenca, uporabljena za kreiranje, že obstaja.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/sl_SI/loan.lang b/htdocs/langs/sl_SI/loan.lang
index 6f8507be44a..4791f1375ed 100644
--- a/htdocs/langs/sl_SI/loan.lang
+++ b/htdocs/langs/sl_SI/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 1762301c688..b1a66572cde 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Rezultati masovnega e-poštnega pošiljanja
 NbSelected=Št. izbranih
 NbIgnored=Št. ignoriranih
 NbSent=Št. poslanih
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Trenutno število emailov ciljnih kontaktov
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index d675810c9d6..0afe08d1d6f 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s ni definiran
 ErrorUnknown=Neznana napaka
 ErrorSQL=SQL napaka
 ErrorLogoFileNotFound=Datoteka z logotipom '%s' ni bila najdena
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Popravite v meniju 'Nastavitve', 'Moduli'
 ErrorFailedToSendMail=Napaka pri pošiljanju E-maila (pošiljatelj=%s, prejemnik=%s)
 ErrorFileNotUploaded=Datoteka ni bila naložena. Preverite, če velikost ne presega omejitve, če je na disku dovolj prostora ali če datoteka z istim imenom že obstaja v tej mapi.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Napaka, za državo '%s' niso definirane da
 ErrorNoSocialContributionForSellerCountry=Napaka, za državo '%s' niso definirane stopnje socialnega/fiskalnega davka.
 ErrorFailedToSaveFile=Napaka, datoteka ni bila shranjena.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Nimate dovoljenja za to.
 SetDate=Nastavi datum
 SelectDate=Izberi datum
 SeeAlso=Glejte tudi %s
 SeeHere=Glej tukaj
+ClickHere=Kliknite tukaj
+Here=Here
 Apply=Uporabi
 BackgroundColorByDefault=Privzeta barva ozadja
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Povezava
 Select=Dodaj kot lastnika
 Choose=Izbira
 Resize=Spremeni velikost
+ResizeOrCrop=Resize or Crop
 Recenter=Ponovno centriraj
 Author=Avtor
 User=Uporabnik
@@ -325,8 +328,10 @@ Default=Privzeto
 DefaultValue=Privzeta vrednost
 DefaultValues=Default values
 Price=Cena
+PriceCurrency=Price (currency)
 UnitPrice=Cena enote
 UnitPriceHT=Cena enote (neto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Cena enote
 PriceU=C.E.
 PriceUHT=C.E. (neto)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=C.E. (z davkom)
 Amount=Znesek
 AmountInvoice=Znesek računa
+AmountInvoiced=Amount invoiced
 AmountPayment=Znesek za plačilo
 AmountHTShort=Znesek (neto)
 AmountTTCShort=Znesek (z DDV)
@@ -353,6 +359,7 @@ AmountLT2ES=Znesek IRPF
 AmountTotal=Skupni znesek
 AmountAverage=Povprečni znesek
 PriceQtyMinHT=Minimalna cena za to količino (neto)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Procent
 Total=Skupaj
 SubTotal=Delna vsota
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Stopnja DDV
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Povprečje
 Sum=Vsota
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Končane
 ActionUncomplete=Nepopolno
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kontakti tega partnerja
 ContactsAddressesForCompany=Kontakti/naslovi za tega partnerja
 AddressesForCompany=Naslovi za tega partnerja
@@ -427,6 +437,9 @@ ActionsOnCompany=Aktivnosti v zvezi s tem partnerjem
 ActionsOnMember=Dogodki okoli tega člana
 ActionsOnProduct=Events about this product
 NActionsLate=%s zamujenih
+ToDo=Planirane
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Zahtevek je bil že zabeležen
 Filter=Filter
 FilterOnInto=Iskalni kriterij '<strong>%s</strong>' v poljih %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Pozor, ste v vzdrževalnem načinu, zato je trenu
 CoreErrorTitle=Sistemska napaka
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kreditna kartica
+ValidatePayment=Potrdi plačilo
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Polja z <b>%s</b> so obvezna
 FieldsWithIsForPublic=Polja z <b>%s</b> so prikazana na javnem seznamu članov. Če tega ne želite, označite okvir "public".
 AccordingToGeoIPDatabase=(V skladu s  GeoIP pretvorbo)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Klasificiraj kot fakturirano
+ClassifyUnbilled=Classify unbilled
 Progress=Napredek
-ClickHere=Kliknite tukaj
 FrontOffice=Front office
 BackOffice=Administracija
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekt
 Projects=Projekti
 Rights=Dovoljenja
+LineNb=Line no.
+IncotermLabel=Mednarodni Poslovni Izrazi
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Projekti v skupni rabi
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Se nanaša na
diff --git a/htdocs/langs/sl_SI/margins.lang b/htdocs/langs/sl_SI/margins.lang
index 0c1447cfe6e..3456bec6485 100644
--- a/htdocs/langs/sl_SI/margins.lang
+++ b/htdocs/langs/sl_SI/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Stopnja mora biti numerična vrednost
 markRateShouldBeLesserThan100=Označena vrednost mora biti manjša od 100
 ShowMarginInfos=Prikaži informacije o marži
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 610eb155d3d..7bf2af5986b 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Seznam potrjenih javnih članov
 ErrorThisMemberIsNotPublic=Ta član ni javen
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Drug član (ime: <b>%s</b>, uporabniško ime: <b>%s</b>) je že povezan s partnerjem <b>%s</b>. Najprej odstranite to povezavo, ker partner ne more biti povezan samo s članom (in obratno).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Zaradi varnostnih razlogov, morate imeti dovoljenje za urejanje vseh uporabnikov, če želite povezati člana z uporabnikom, ki ni vaš.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Vsebina vaše članske kartice
 SetLinkToUser=Povezava z Dolibarr uporabnikom
 SetLinkToThirdParty=Povezava z Dolibarr partnerjem
 MembersCards=Tiskane kartice članov
@@ -108,17 +106,33 @@ PublicMemberCard=Javna kartica člana
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Ustvari naročnino
 ShowSubscription=Prikaži naročnino
-SendAnEMailToMember=Pošlji članu informativno e-pošto
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Vsebina vaše članske kartice
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Zadeva v e-pošti, ki je prejeta ob avtomatskem vpisu gosta
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-pošta, ki je prejeta ob avtomatskem vpisu gosta
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-Mail obrazec za avtomatsko včlanitev
-DescADHERENT_AUTOREGISTER_MAIL=E-Mail za avtomatsko včlanitev
-DescADHERENT_MAIL_VALID_SUBJECT=E-Mail obrazec za potrditev člana
-DescADHERENT_MAIL_VALID=E-Mail za potrditev člana
-DescADHERENT_MAIL_COTIS_SUBJECT=E-Mail obrazec za naročnino
-DescADHERENT_MAIL_COTIS=E-Mail za naročnino
-DescADHERENT_MAIL_RESIL_SUBJECT=E-Mail obrazec za obnovitev članstva
-DescADHERENT_MAIL_RESIL=E-Mail za obnovitev članstva
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Pošiljateljev E-Mail za avtomatsko pošto
 DescADHERENT_ETIQUETTE_TYPE=Format nalepk
 DescADHERENT_ETIQUETTE_TEXT=Tekst na evidenčnem listu člana
@@ -177,3 +191,8 @@ NoVatOnSubscription=Ni davka za naročnine
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod uporabljen za naročniško vrstico v računu: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index ea0a68e7efa..0578fea32f3 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Sporočilo na strani za potrditev plačila
 MessageKO=Sporočilo na strani za preklic plačila
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Povezani objekti
 NbOfActiveNotifications=Število obvestil (število emailov prejemnika)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Zaženi prenos
 CancelUpload=Prekliči prenos
 FileIsTooBig=Datoteke so prevelike
 PleaseBePatient=Prosim, bodite potrpežljivi...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Prejet je bil zahtevek za spremembo vašega Dolibarr gesla
 NewKeyIs=To so vaši novi podatki za prijavo
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Naziv
 WEBSITE_DESCRIPTION=Opis
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/sl_SI/paypal.lang b/htdocs/langs/sl_SI/paypal.lang
index 403a700f309..752fc6b82ec 100644
--- a/htdocs/langs/sl_SI/paypal.lang
+++ b/htdocs/langs/sl_SI/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Samo PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=To je ID transakcije: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Pri pošiljanju dokumenta po pošti dodaj url Paypal plačila
-PredefinedMailContentLink=Za izvedbo vašega plačila (PayPal)lahko kliknete na spodnjo varno povezavo, če plačilo še ni bilo izvršeno.\n\n%s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 56819ced31e..4e9dacc6aa9 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Proizvod ali storitev
 ProductsAndServices=Proizvodi in storitve
 ProductsOrServices=Proizvodi ali storitve
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Ali zares želite izbrisati to vrstico proizvoda?
 ProductSpecial=Specialni
 QtyMin=Minimalna količina
 PriceQtyMin=Cena za to min. količino (brez popusta)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Stopnja DDV (za tega dobavitelja/proizvod)
 DiscountQtyMin=Privzet popust za količino
 NoPriceDefinedForThisSupplier=Za tega dobavitelja/storitev ni definirana cena/količina
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 0d07d3731d9..9a0419d4cb7 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Kontakti za projekt
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Vsi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=To pogled predstavlja vse projekte, za katere imate dovoljenje za branje.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Ta pogled predstavlja vse projekte in naloge, za katere imate dovoljenje za branje.
 ProjectsDesc=Ta pogled predstavlja vse projekte (vaše uporabniško dovoljenje vam omogoča ogled vseh).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Ta pogled predstavlja vse projekte in naloge, za katere imate dovoljenje za branje.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Porabljen čas
 MyTimeSpent=Moj porabljen čas
+BillTime=Bill the time spent
 Tasks=Naloge
 Task=Naloga
 TaskDateStart=Datum začetka naloge
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Seznam aktivnosti, povezanih s projektom
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Aktivnosti na projektu v tem tednu
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktivnosti na projektu v tem mesecu
 ActivityOnProjectThisYear=Aktivnosti na projektu v tem letu
 ChildOfProjectTask=Podrejen projektu/nalogi
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Niste lastnik tega zasebnega projekta
 AffectedTo=Učinkuje na
 CantRemoveProject=Tega projekta ne morete premakniti, ker je povezan z nekaterimi drugimi objekti (računi, naročila ali drugo). Glejte jeziček z referencami.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nemogoče je spremeniti datum naloge glede na nov začetni datum projekta
 ProjectsAndTasksLines=Projekti in naloge
 ProjectCreatedInDolibarr=Projekt %s je bil ustvarjen
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/sl_SI/propal.lang b/htdocs/langs/sl_SI/propal.lang
index 1c8feda0267..9ae329299b7 100644
--- a/htdocs/langs/sl_SI/propal.lang
+++ b/htdocs/langs/sl_SI/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Podpisana (potrebno fakturirati)
 PropalStatusNotSigned=Nepodpisana (zaprta)
 PropalStatusBilled=Fakturirana
 PropalStatusDraftShort=Osnutek
+PropalStatusValidatedShort=Potrjen
 PropalStatusClosedShort=Zaprta
 PropalStatusSignedShort=Podpisana
 PropalStatusNotSignedShort=Nepodpisana
diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
index ce79a0493e2..3efbd465192 100644
--- a/htdocs/langs/sl_SI/salaries.lang
+++ b/htdocs/langs/sl_SI/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Ta kalkulacija se lahko uporabi za izračun stroškov porabljeneg
 TJMDescription=Ta vrednost je trenutno samo informativna in se ne uporablja v nobeni kalkulaciji
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index f8092fe9a61..9c6c400c022 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Uredi skladišče
 MenuNewWarehouse=Novo skladišče
 WarehouseSource=Izvorno skladišče
 WarehouseSourceNotDefined=Ni definirano skladišče,
+AddWarehouse=Create warehouse
 AddOne=dodajte ga
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Ciljno skladišče
 ValidateSending=Potrdi pošiljko
 CancelSending=Prekliči pošiljko
@@ -22,6 +24,7 @@ Movements=Gibanja
 ErrorWarehouseRefRequired=Obvezno je referenčno ime skladišča
 ListOfWarehouses=Spisek skladišč
 ListOfStockMovements=Seznam gibanja zaloge
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/sl_SI/stripe.lang b/htdocs/langs/sl_SI/stripe.lang
index e8f54cb47cf..2c80a5bba3d 100644
--- a/htdocs/langs/sl_SI/stripe.lang
+++ b/htdocs/langs/sl_SI/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang
index 149b13e872b..b12ec2eaee6 100644
--- a/htdocs/langs/sl_SI/trips.lang
+++ b/htdocs/langs/sl_SI/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Količina kilometrov
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 ClassifyRefunded=Označi kot "Povrnjeno"
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index ce69ebc7cfe..267c9ecd884 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -69,8 +69,8 @@ InternalUser=Interni uporabnik
 ExportDataset_user_1=Uporabniki Dolibarrja in značilnosti
 DomainUser=Uporabnik domene %s
 Reactivate=Ponovno aktiviraj
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Dovoljenje dodeljeno zaradi podedovanja od druge uporabniške skupine.
 Inherited=Podedovan
 UserWillBeInternalUser=Kreiran uporabnik bo interni uporabnik (ker ni povezan z določenim partnerjem)
@@ -93,6 +93,7 @@ NameToCreate=Kreiranje imena partnerja
 YourRole=Vaše vloge
 YourQuotaOfUsersIsReached=Dosežena je vaša kvota aktivnih uporabnikov !
 NbOfUsers=Število uporabnikov
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Samo superadmin lahko degradira samo superadmin
 HierarchicalResponsible=Nadzornik
 HierarchicView=Hierarhični pogled
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 584d10b78b9..f49f7d53304 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Vnesite toliko zapisov, kot želite imeti spletnih strani.  Za
 DeleteWebsite=Izbriši spletno stran
 ConfirmDeleteWebsite=Ali ste prepričani, da želite izbrisati to spletno starn. Vse strani in vsebina bodo pobrisani.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Preberite
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 66af7597995..bb9dda18773 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za obdelavo
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Bančna koda partnerja
-NoInvoiceCouldBeWithdrawed=Noben račun ni bil uspešno nakazan. Preverite, če imajo izdajatelji računov veljaven BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Označi kot prejeto
 ClassCreditedConfirm=Ali zares želite to potrdilo o nakazilu označiti kot »v dobro« na vašem bančnem računu ?
 TransData=Datum prenosa
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistika po statusu vrstic
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 9fd145812e8..8c98e90477d 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Viti qё do tё fshihet
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Transaksion i ri
 NumMvts=Numri i transaksionit
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 30307e94759..2a8e9865efb 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Serveri
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Adresa
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Bli
 Sell=Shit
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index c6d20c90e57..9565510270d 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 34306558e16..764caee52e2 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Ulje
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 2578d55fadc..164562e1106 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=Qyteti
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=Përdoret T.V.SH
-VATIsNotUsed=Nuk përdoret T.V.SH
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Klienti
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Shto adresë
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index c1fd39c7ec1..ddaa4c2377b 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index d859196b776..6238f0fce2c 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Prioriteti
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/sq_AL/loan.lang b/htdocs/langs/sq_AL/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/sq_AL/loan.lang
+++ b/htdocs/langs/sq_AL/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 9e6f2f52c7a..8085bb381cb 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 8fd34c929b2..fcc2cb23d4e 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Kliko këtu
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Kliko këtu
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/sq_AL/margins.lang
+++ b/htdocs/langs/sq_AL/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index e8babaa966c..9a43a470e8d 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 9f9d1e13f98..5eff375f6f0 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Përshkrimi
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/sq_AL/paypal.lang b/htdocs/langs/sq_AL/paypal.lang
index 5d69dd1e691..8ff0a0cc3dd 100644
--- a/htdocs/langs/sq_AL/paypal.lang
+++ b/htdocs/langs/sq_AL/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 068855d2f84..2244867f340 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 56405d3f1f2..02b7d1b40cc 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
index f55eedbf367..43475bb2955 100644
--- a/htdocs/langs/sq_AL/propal.lang
+++ b/htdocs/langs/sq_AL/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Mbyllur
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index 45d740a8f1e..605df9436d4 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index a6f2003659b..c53abe3016a 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/sq_AL/stripe.lang b/htdocs/langs/sq_AL/stripe.lang
index 5776611e8f3..4ed4aebf311 100644
--- a/htdocs/langs/sq_AL/stripe.lang
+++ b/htdocs/langs/sq_AL/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
index 2a22428fb35..ccdba1be936 100644
--- a/htdocs/langs/sq_AL/trips.lang
+++ b/htdocs/langs/sq_AL/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index 147cb7abfa4..d8a764e47e7 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -69,8 +69,8 @@ InternalUser=Përdorues i brendshëm
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 6b4e2ada84a..0350da13f8f 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index 56d03f9b008..3ded0e4cd36 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 1a609a4bcdf..802487be9e1 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Tabela računa
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Tip dokumenta
 Docdate=Datum
 Docref=Referenca
-Code_tiers=Treće lice
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finansijski izveštaji
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finansijski izveštaji uključujući sve vrste uplata preko bankovnog računa
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Uplata kupca po fakturi
-ThirdPartyAccount=Račun subjekta
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete opbrisati ovaj računovodst
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Priroda
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Prodaje
 AccountingJournalType3=Nabavke
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index d2f34c111a6..782ccb2363f 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Sakrijte link za online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Dodavanje funkcionalnosti za upravljanje Incoterm
 Module63000Name=Resursi
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Pročitaj zahteve za odsustvo (Vaše i Vašeg tima)
-Permission20002=Kreiraj/izmeni svoje zahteve za odsustvo
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Obriši zahteve za odsustvo
-Permission20004=Pročitaj sve zahteve za odsustvo
-Permission20005=Kreiraj/izmeni zahteve za odsustvo za sve korisnike
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Podešavanja zahteva za odsustvo (podešavanja i ažuriranje stanja)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Greška prilikom inicijalizacije menija
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Prikaži po defaultu na prikazu liste
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Primer poruke koju možete koristiti da biste najavili novu verziju (možete je koristiti na Vašim sajtovima)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/sr_RS/agenda.lang b/htdocs/langs/sr_RS/agenda.lang
index ac0378a4c27..0c9dce996c2 100644
--- a/htdocs/langs/sr_RS/agenda.lang
+++ b/htdocs/langs/sr_RS/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Član %s je potvrđen
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Član %s je obrisan
-MemberSubscriptionAddedInDolibarr=Pretplata za člana %s je dodata
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Isporuka %s je potvrđena
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Možete dodati i sledeće parametre da filtrirate rezultat:
 AgendaUrlOptions3=<b>logina=%s</b> da se zabrani izlaz akcijama čiji je vlasnik korisnik <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> da se zabrani izlaz akcijama povezanim sa projektom <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Zauzet
@@ -109,7 +112,7 @@ ExportCal=Izvezi kalendar
 ExtSites=Uvezi eksterni kalendar
 ExtSitesEnableThisTool=Prikaži eksterni kalendar (definisan u opštim podešavanjima) u agendi. Ne utiče na eksterni kalendar definisan od strane korisnika.
 ExtSitesNbOfAgenda=Broj kalendara
-AgendaExtNb=Kalendar broj %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL za pristup .ical datoteke
 ExtSiteNoLabel=Nema opisa
 VisibleTimeRange=Vidljiv vremenski period
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index ae1d03d925e..b2dea98d368 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Refundirano
 DeletePayment=Obriši plaćanje
 ConfirmDeletePayment=Da li ste sigurni da želite da obrišete ovu uplatu?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Plaćanja dobavljačima
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Uplate primljene od kupaca
@@ -91,7 +92,7 @@ PaymentAmount=Iznos za plaćanje
 ValidatePayment=Potvrdi plaćanje
 PaymentHigherThanReminderToPay=Iznos koji želite da platiteje viši od iznosa za plaćanje
 HelpPaymentHigherThanReminderToPay=Pažnja, iznos za plaćanje na jednom ili više računa je viši od preostalog iznosa za plaćanje. <br> Izmenite svoj unos, ili potvrdite i razmislite o kreiranju knjižnog odobrenja za svaki više uplaćen račun.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Klasifikuj kao "plaćeno"
 ClassifyPaidPartially=Klasifikuj "delimično plaćeno"
 ClassifyCanceled=Klasifikuj "napušteno"
@@ -110,6 +111,7 @@ DoPayment=Unesite uplatu
 DoPaymentBack=Enter refund
 ConvertToReduc=Konvertuj u budući popust
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Unesi prijem uplate kupca
 EnterPaymentDueToCustomer=Uplatiti zbog kupca
 DisabledBecauseRemainderToPayIsZero=Onemogući jer je preostali iznos nula
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status generisanih računa
 BillStatusDraft=Nacrt (treba da se potvrdi)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Knjižno odobrenje refundirano ili konvertovano u popust
-BillStatusConverted=Plaćeno (spremno za konačni račun)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Napušteno
 BillStatusValidated=Potvrdjeno (potrebno izvršiti plaćanje)
 BillStatusStarted=Započeto
@@ -220,6 +222,7 @@ RemainderToPayBack=Preostali iznos za refundiranje
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Popust
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Dostupni popusti
 DiscountAlreadyCounted=Popusti su već iskorišćeni
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Datum generisanja sledećeg računa
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Datum najskorijeg generisanja
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max br računa za generisanje
-NbOfGenerationDone=Br već generisanih računa
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Potvrdi račune automatski
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Datum još nije dospeo
@@ -521,3 +528,7 @@ BillCreated=%s račun(a) kreirano
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 7a306b68b34..fb91aa4c95a 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -43,7 +43,8 @@ Individual=Fizičko lice
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Osnovna kompanija
 Subsidiaries=SubsidiariesPoslovnice
-ReportByCustomers=Izveštaj po klijentima
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Izveštaj po kursu
 CivilityCode=Prijavni kod
 RegisteredOffice=Registrovane kancelarije
@@ -75,10 +76,12 @@ Town=Grad
 Web=Web
 Poste= Pozicija
 DefaultLang=Jezik po default-u
-VATIsUsed=U PDV-u
-VATIsNotUsed=Van PDV-a
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Ponude
 OverAllOrders=Narudžbine
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=PDV broj
-VATIntraShort=PDV number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Sintaksa je ispravna
+VATReturn=VAT return
 ProspectCustomer=Kandidat / Klijent
 Prospect=Kandidat
 CustomerCard=Kartica klijenta
 Customer=Klijent
 CustomerRelativeDiscount=Relativni popust klijenta
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Apsolutni popust
 CompanyHasRelativeDiscount=Klijent ima default popust od <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Klijent nema default relativni popust
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Apsolutni popusti (odobreni od svih korisnika)
-CustomerAbsoluteDiscountMy=Apsolutni popusti (odobreni od Vaše strane)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Nema
 Supplier=Dobavljač
 AddContact=kreiraj kontakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Nemoguć pristup Dolibarr-u
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakti i podešavanja
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontakti/Adrese (subjekata i drugi) i atributi
-ImportDataset_company_3=Detalji banke
-ImportDataset_company_4=Subjekti/agenti prodaje (dodela agenata prodaje kompanijama)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Nivo cene
 DeliveryAddress=Adresa dostave
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=Lista proizvoda/usluga u %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Ime menadžera (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Duplirani subjekt (subjekt kojeg želite obrisati)
 MergeThirdparties=Spoji subjekte
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Subjekti su spojeni
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index ef7f6aa3eea..3aeb8cf44d5 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -31,7 +31,7 @@ Credit=Ulaz
 Piece=Računovodstvena dokumentacija
 AmountHTVATRealReceived=Neto prihoda
 AmountHTVATRealPaid=Plaćeno neto
-VATToPay=PDV prodaje
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF uplate
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Povraćaj
 SocialContributionsPayments=Uplate poreza/doprinosa
 ShowVatPayment=Prikaži PDV uplatu
@@ -157,30 +158,34 @@ RulesResultDue=- Sadrži sve račune, troškove, PDV, donacije, bez obzira da li
 RulesResultInOut=- Sadrži realne uplate računa, troškova, PDV-a i zarada.<br>- Zasniva se na datumima isplate računa, troškova, PDV-a i zarada. Za donacije se zasniva na datumu donacije.
 RulesCADue=- Sadrži račune izdate klijentu, bez obzira da li su plaćeni ili ne. <br>- Zasniva se na datumu potvrde računa.<br>
 RulesCAIn=- Sadrži sve realne isplate računa primljene od klijenata.<br>- Zasniva se na datumu isplate računa<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Izveštaj po subjektu IRPF
-LT1ReportByCustomersInInputOutputModeES=Izveštaj po RE subjektima
-VATReport=PDV izveštaj
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Izveštaj po RE subjektima
+LT2ReportByCustomersES=Izveštaj po subjektu IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Izveštaj po prihodovanom i isplaćenom PDV-u po subjektu 
-VATReportByCustomersInDueDebtMode=Izveštaj po prihodovanom i isplaćenom PDV-u po subjektu
-VATReportByQuartersInInputOutputMode=Izveštaj po nivou prihodovanog i isplaćenog PDV-u po subjektu 
-LT1ReportByQuartersInInputOutputMode=Izveštaj po RE kursu
-LT2ReportByQuartersInInputOutputMode=Izveštaj po IRPF kursu
-VATReportByQuartersInDueDebtMode=Izveštaj po nivou prihodovanog i isplaćenog PDV-u po subjektu 
-LT1ReportByQuartersInDueDebtMode=Izveštaj po RE kursu
-LT2ReportByQuartersInDueDebtMode=Izveštaj po IRPF kursu
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Izveštaj po RE kursu
+LT2ReportByQuartersES=Izveštaj po IRPF kursu
 SeeVATReportInInputOutputMode=Prikaži izveštaj <b>%snaplata PDV-a%s</b> za standardnu kalkulaciju
 SeeVATReportInDueDebtMode=Prikaži izveštaj <b>%sprotok PDV-a%s</b> za kalkulaciju kalkulaciju po protoku
 RulesVATInServices=- Za usluge, ovaj izveštaj sadrži prihode ili isplate PDV-a po datumu isplate
-RulesVATInProducts=- Za fizička sredstva, sadrži prihode ili isplate PDV-a po datumu fakture.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Za usluge, ovaj izveštaj sadrži PDV fakture, bez obzira da li su naplaćene ili ne, po datumu fakture.
-RulesVATDueProducts=- Za fizička sredstva, sadrži PDV fakture zasnovane na datumu fakture.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Napomena: za fizička sredstva, bilo bi ispravnije koristiti datum isporuke
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/računu
 NotUsedForGoods=Ne koristi se za robu
 ProposalStats=Statistike ponuda
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=Izaberite odgovarajuću metodu kako biste koristili
 TurnoverPerProductInCommitmentAccountingNotRelevant=Izveštaj obrta po proizvodu nije bitan kada se koristi <b>gotovinsko računovodstvo</b>. Ovaj izveštaj je samo dostupan kada se koristi <b>obavezujuće računovodstvo</b> (pogledajte podešavanja modula računovodstvo).
 CalculationMode=Naćin obračuna
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
index 8d0902d931c..184926050c0 100644
--- a/htdocs/langs/sr_RS/cron.lang
+++ b/htdocs/langs/sr_RS/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Nema prijavljenih operacija
 CronPriority=Prioritet
 CronLabel=Naziv
 CronNbRun=Br. izvršenja
-CronMaxRun=Maksimalni broj izvršenja
+CronMaxRun=Max number launch
 CronEach=Svakih
 JobFinished=Operacija je izvršena
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Od
 CronType=Tip operacije
 CronType_method=Call method of a PHP Class
 CronType_command=Komandna linija
-CronCannotLoadClass=Nemoguće učitati klasu %s ili objekat %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Operacija deaktivirana
 MakeLocalDatabaseDumpShort=Bekap lokalne baze
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index e670e5cab1a..dba4709a064 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching nije završen.
 ErrorLDAPMakeManualTest=.ldif fajl je generisan u folderu %s. Pokušajte da ga učitate ručno iz komandne linije da biste imali više informacija o greškama.
 ErrorCantSaveADoneUserWithZeroPercentage=Nemoguće saluvati akciju sa statusom "nije započet" ukoliko je polje "izvršio" popunjeno.
 ErrorRefAlreadyExists=Ref korišćena za kreaciju već postoji.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Nemoguće obrisati liniju jer je već u upotrebi ili korišćena u drugom objektu.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Greška prilikom dodavanja linije %s Mailman listi
 ErrorFailedToRemoveToMailmanList=Greška prilikom uklanjanja linije %s iz Mailman liste %s ili SPIP baze
 ErrorNewValueCantMatchOldValue=Nova vrednost ne može biti jednaka staroj
 ErrorFailedToValidatePasswordReset=Greška prilikom promene lozinke. Možda je promena već izvršena (ovaj link se može iskoristiti samo jednom). Ukoliko nije, pokušajte ponovo.
-ErrorToConnectToMysqlCheckInstance=Greška prilikom konekcije sa bazom. Proverite da li je Mysql server aktivan (u većini slučajeva, možete ga pokrenuti iz komandne linije sa "sudo /etc/init.d/mysql start").
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Greška prilikom dodavanja kontakta
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Način plaćanja je podešen na %s, ali podešavanja modula Fakture nisu završena i ne definišu koje se informacije prikazuju za ovaj način plaćanja.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Vaša prijava je promenjena. Iz sigurnosnih razloga se morate ponovo ulogovati.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/sr_RS/loan.lang b/htdocs/langs/sr_RS/loan.lang
index 16ded967a18..fc09b956443 100644
--- a/htdocs/langs/sr_RS/loan.lang
+++ b/htdocs/langs/sr_RS/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Konfiguracija modula Krediti
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index dd208c4caf4..aaaac6e20b0 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Rezultat masovnog mailinga
 NbSelected=Br selektiranih
 NbIgnored= Br ignorisanih
 NbSent=Br poslatih
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Trenutni broj targetiranih kontakt mailova
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 703ed194dec..096cf0c9e2e 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametar %s nije definisan
 ErrorUnknown=Nepoznata greška
 ErrorSQL=Greška u SQL-u
 ErrorLogoFileNotFound=Logo fajl '%s' nije pronađen
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Idite u podešavanja Modula da ovo ispravite
 ErrorFailedToSendMail=Greška u slanju mail-a (pošiljalac=%s, primalac=%s)
 ErrorFileNotUploaded=Fajl nije uploadovan. Proverite da li je fajl preveliki, da li ima dovoljno prostora na disku i da li postoji fajl sa istim imenom u ovom folderu.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, PDV stopa nije definisana za zeml
 ErrorNoSocialContributionForSellerCountry=Greška, nema poreskih stopa definisanih za zemlju "%s".
 ErrorFailedToSaveFile=Greška, nemoguće sačuvati fajl.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Nemate prava za tu akciju.
 SetDate=Postavi datum
 SelectDate=Izaberi datum
 SeeAlso=Pogledajte i %s
 SeeHere=Pogledaj ovde
+ClickHere=Klikni ovde
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default boja pozadine
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=ink
 Select=Izaberi
 Choose=Izaberi
 Resize=Promeni veličinu
+ResizeOrCrop=Resize or Crop
 Recenter=Centriraj
 Author=Autor
 User=Korisnik
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default vrednost
 DefaultValues=Default values
 Price=Cena
+PriceCurrency=Price (currency)
 UnitPrice=Jedinična cena
 UnitPriceHT=Jedinična cena (neto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Jedinična cena
 PriceU=J.C.
 PriceUHT=J.C. (neto)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (valuta)
 PriceUTTC=J.C. (bruto)
 Amount=Iznos
 AmountInvoice=Iznos računa
+AmountInvoiced=Amount invoiced
 AmountPayment=Plaćeni iznos
 AmountHTShort=Iznos (neto)
 AmountTTCShort=Iznos (bruto)
@@ -353,6 +359,7 @@ AmountLT2ES=Iznos IRPF
 AmountTotal=Ukupan iznos
 AmountAverage=Prosečan iznos
 PriceQtyMinHT=Cena za min. količinu (neto)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Procenat
 Total=Total
 SubTotal=Zbir
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Stopa poreza
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Prosek
 Sum=Suma
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Završeno
 ActionUncomplete=nepotpuno
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kontakti za ovaj subjekat
 ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekat
 AddressesForCompany=Adrese za ovaj subjekat
@@ -427,6 +437,9 @@ ActionsOnCompany=Događaji vezani za ovaj subjekat
 ActionsOnMember=Događaji vezani za ovog člana
 ActionsOnProduct=Events about this product
 NActionsLate=%s kasni
+ToDo=Na čekanju
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Upit je već zabeležen
 Filter=Filter
 FilterOnInto=Kriterijum pretrage '<strong>%s</strong>' za polja %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Upozorenje, trenutno ste u modu održavanja, samo
 CoreErrorTitle=Sistemska greška
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kreditna kartica
+ValidatePayment=Potvrdi plaćanje
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Polja sa <b>%s</b> su obavezna
 FieldsWithIsForPublic=Polja sa <b>%s</b> su prikazana na javnim listama članova. Ukoliko to ne želite, odčekirajte opciju "javno".
 AccordingToGeoIPDatabase=(po GeoIP konvenciji)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Označi kao naplaćenu
+ClassifyUnbilled=Classify unbilled
 Progress=Napredovanje
-ClickHere=Klikni ovde
 FrontOffice=Front office
 BackOffice=Finansijska služba
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekat
 Projects=Projekti
 Rights=Prava
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Ponedeljak
 Tuesday=Utorak
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Svi
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Dodeljeno
diff --git a/htdocs/langs/sr_RS/margins.lang b/htdocs/langs/sr_RS/margins.lang
index 80e0af92c59..3efba630555 100644
--- a/htdocs/langs/sr_RS/margins.lang
+++ b/htdocs/langs/sr_RS/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Stopa mora biti numerička
 markRateShouldBeLesserThan100=Stopa marže mora biti niža od 100
 ShowMarginInfos=Prikaži informacije marže
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index b00f0d588d7..98832aeeeb7 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Lista potvrđenih javnih članova
 ErrorThisMemberIsNotPublic=Ovaj član nije javni
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Drugi član (ime: <b>%s</b>, login: <b>%s</b>) je već povezan sa subjektom <b>%s</b>. Prvo uklonite ovu vezu jer subjekat može biti povezan samo sa jednim članom (i obrnuto).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Iz sigurnosnih razloga, morate imati dozvole za izmenu svih korisnika kako biste mogli da povežete člana sa korisnikom koji nije Vaš.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Sadržaj Vaše kartice člana
 SetLinkToUser=Link sa Dolibarr korisnikom
 SetLinkToThirdParty=Link sa Dolibarr subjektom
 MembersCards=Članske poslovne kartice
@@ -108,17 +106,33 @@ PublicMemberCard=Javna kartica člana
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Kreiraj pretplatu
 ShowSubscription=Prikaži pretplatu
-SendAnEMailToMember=Pošalji info mail članu
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Sadržaj Vaše kartice člana
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Naslov maila poslatog u okviru auto-registracije korisnika
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Mail poslat u slučaju auto-registracije gosta
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Naslov maila za samostalno učlanjivanje člana
-DescADHERENT_AUTOREGISTER_MAIL=Email za samostalnu pretplatu članova
-DescADHERENT_MAIL_VALID_SUBJECT=Naslov maila za potvrdu člana
-DescADHERENT_MAIL_VALID=Email za potvrdu članova
-DescADHERENT_MAIL_COTIS_SUBJECT=Naslov maila za prijavu
-DescADHERENT_MAIL_COTIS=Email za pretplatu
-DescADHERENT_MAIL_RESIL_SUBJECT=Naslov maila za otkazivanje članarine
-DescADHERENT_MAIL_RESIL=Email za otkazivanje pretplate
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Pošiljalac automatskih mailova
 DescADHERENT_ETIQUETTE_TYPE=Format strane naziva
 DescADHERENT_ETIQUETTE_TEXT=Tekst odštampan na karticama adresa članova
@@ -177,3 +191,8 @@ NoVatOnSubscription=Pretplate bez PDV-a
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod korišćen za liniju pretplate u fakturi: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 3c78637506c..ef18367bf22 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Poruka na strani potvrđene uplate
 MessageKO=Poruka na strani otkazane uplate
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Povezan objekat
 NbOfActiveNotifications=Broj obaveštenja (br. primalaca mailova)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Otpočni upload
 CancelUpload=Otkaži upload
 FileIsTooBig=Fajlovi su preveilki
 PleaseBePatient=Molimo sačekajte...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Zahtev za promenu Vaše Dolibarr lozinke je primljen
 NewKeyIs=Ovo su nove informacije za login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL stranice
 WEBSITE_TITLE=Naslov
 WEBSITE_DESCRIPTION=Opis
 WEBSITE_KEYWORDS=Ključne reči
+LinesToImport=Lines to import
diff --git a/htdocs/langs/sr_RS/paypal.lang b/htdocs/langs/sr_RS/paypal.lang
index 036ba5849ed..bea31cc3b92 100644
--- a/htdocs/langs/sr_RS/paypal.lang
+++ b/htdocs/langs/sr_RS/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Samo PayPal
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Ovo je ID transakcije: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Ubaci URL PayPal uplate prilikom slanja dokumenta putem mail-a
-PredefinedMailContentLink=Možete kliknuti na secure link ispod da biste izvršili uplatu putem PayPal-a (ukoliko to još niste učinili).\n\n%s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Kod greške
 ErrorSeverityCode=Kod ozbiljnosti greške
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index e7628c10155..febbbfe8489 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Proizvod ili Usluga
 ProductsAndServices=Proizvodi i Usluge
 ProductsOrServices=Proizvodi ili Usluge
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Da li ste sigurni da želite da obrišete ovu liniju pr
 ProductSpecial=Specijalno
 QtyMin=Minimalna kol.
 PriceQtyMin=Cena za ovu min. kol. (bez popusta)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=PDV (za ovog dobavljača/proizvod)
 DiscountQtyMin=Default popust za kol.
 NoPriceDefinedForThisSupplier=Nema cene/kol definisane za ovog dobavljača/proizvod
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index c536692b42e..cfe09906b11 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Kontakti projekta
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Svi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Ovaj ekran prikazuje sve projekte za koje imate pravo pregleda.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Ovaj ekran prikazuje sve projekte ili zadatke za koje imate pravo pregleda.
 ProjectsDesc=Ovaj ekran prikazuje sve projekte (Vaš korisnik ima pravo pregleda svih informacija)
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Vidljivi su samo otvoreni projekti (draft i zatvoreni projekti nisu vidljivi)
 ClosedProjectsAreHidden=Zatvoreni projekti nisu vidljivi
 TasksPublicDesc=Ovaj ekran prikazuje sve projekte ili zadatke za koje imate pravo pregleda.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Zadaci na otvorenim projektima
 WorkloadNotDefined=Količina vremena nije definisana
 NewTimeSpent=Provedeno vreme
 MyTimeSpent=Moje vreme
+BillTime=Bill the time spent
 Tasks=Zadaci
 Task=Zadatak
 TaskDateStart=Početak zadatka
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Lista donacija vezanih za ovaj projekat
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Lista događaja vezanih za projekat
 ListTaskTimeUserProject=Lista utrošenog vremena na zadacima ovog projekta
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Aktivnost na projektu danas
 ActivityOnProjectYesterday=Aktivnost na projektu juče
 ActivityOnProjectThisWeek=Aktivnosti na projektu ove nedelje
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktivnosti na projektu ovog meseca
 ActivityOnProjectThisYear=Aktivnosti na projektu ove godine
 ChildOfProjectTask=Naslednik projekta/zadatka
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Ovaj privatni projekat Vam ne pripada
 AffectedTo=Dodeljeno 
 CantRemoveProject=Ovaj projekat ne može biti uklonjen jer ga koriste drugi objekti (fakture, narudžbine, i sl.). Vidite tab reference.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nemoguće promeniti datum zadatka prema novom datumu početka projekta
 ProjectsAndTasksLines=Projekti i zadaci
 ProjectCreatedInDolibarr=Projekat %s je kreiran
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Zadatak %s je kreiran
 TaskModifiedInDolibarr=Zadatak %s je izmenjen
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/sr_RS/propal.lang b/htdocs/langs/sr_RS/propal.lang
index 6ce32361d7a..cf7b725af30 100644
--- a/htdocs/langs/sr_RS/propal.lang
+++ b/htdocs/langs/sr_RS/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Potpisana (za naplatu)
 PropalStatusNotSigned=Nepotpisana (zatvorena)
 PropalStatusBilled=Naplaćena
 PropalStatusDraftShort=Nacrt
+PropalStatusValidatedShort=Potvrđen
 PropalStatusClosedShort=Zatvorena
 PropalStatusSignedShort=Potpisana
 PropalStatusNotSignedShort=Nepotpisana
diff --git a/htdocs/langs/sr_RS/salaries.lang b/htdocs/langs/sr_RS/salaries.lang
index d7a810b3c4d..1fd5089c23b 100644
--- a/htdocs/langs/sr_RS/salaries.lang
+++ b/htdocs/langs/sr_RS/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Ova vrednost može biti korišćena za procenu cene vremena prove
 TJMDescription=Ova vrednost se trenutno koristi samo informativno i ne uzima se u obzir ni za koji obračun.
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index d5e3d857765..8a079b53790 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Izmeni magacin
 MenuNewWarehouse=Novi magacin
 WarehouseSource=Izvorni magacin
 WarehouseSourceNotDefined=Nema definisanog magacina
+AddWarehouse=Create warehouse
 AddOne=Dodaj
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Ciljani magacin
 ValidateSending=Obriši slanje
 CancelSending=Otkaži slanje
@@ -22,6 +24,7 @@ Movements=Prometi
 ErrorWarehouseRefRequired=Referenca magacina je obavezna
 ListOfWarehouses=Lista magacina
 ListOfStockMovements=Lista prometa zaliha
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/sr_RS/trips.lang b/htdocs/langs/sr_RS/trips.lang
index 2d6f030f4b2..e718136db01 100644
--- a/htdocs/langs/sr_RS/trips.lang
+++ b/htdocs/langs/sr_RS/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Prikaži trošak
 NewTrip=Novi trošak
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Broj kilometara
 DeleteTrip=Obriši trošak
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Čeka na odobrenje
 ExpensesArea=Oblast troškova
 ClassifyRefunded=Označi kao "Refundirano"
 ExpenseReportWaitingForApproval=Novi trošak je poslat na odobrenje
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=ID troška
 AnyOtherInThisListCanValidate=Osoba koju treba obavestiti za odobrenje.
 TripSociete=Informacije kompanije
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Prijavili ste još jedan trošak u sličnom vremenskom periodu.
 AucuneLigne=Nema prijavljenih troškova.
 
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index 6f7ecd1d85f..d2873c43fdb 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -69,8 +69,8 @@ InternalUser=Interni korsnik
 ExportDataset_user_1=Korisnici Dolibarr-a i parametri
 DomainUser=Korisnik domena %s
 Reactivate=Reaktiviraj
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Prava su dodeljena jer su nasleđena od jedne od korisnikovih grupa.
 Inherited=Nasleđeno
 UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije vezan za određeni subjekat)
@@ -93,6 +93,7 @@ NameToCreate=Ime subjekta za kreiranje
 YourRole=Vaši profili
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je dostignuta !
 NbOfUsers=Br korisnika
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Samo superadmin može downgrade-ovati superadmina
 HierarchicalResponsible=Supervizor
 HierarchicView=Hijerarhijski prikaz
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index be93158f7bc..867942c51b8 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za procesuiranje
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Bankarski kod subjekta
-NoInvoiceCouldBeWithdrawed=Nema uspešno podugnutih faktura. Proverite da su fakture na kompanijama sa validnim IBAN-om.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Označi kreditirano
 ClassCreditedConfirm=Da li ste sigurni da želite da označite ovaj račun podizanja kao kreditiran na Vašem bankovnom računu ?
 TransData=Datum prenosa
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistike po statusu linija
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 6a6f7091a13..d321ffa7980 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Kontoplan
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Typ av dokument
 Docdate=Datum
 Docref=Referens
-Code_tiers=Tredjeparts
 LabelAccount=Etikett konto
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Betalning av faktura kund
-ThirdPartyAccount=Tredjeparts konto
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskont
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Naturen
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Försäljning
 AccountingJournalType3=Inköp
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 2ce6f1fdb7d..967169857bb 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Fel, kan inte använda alternativet @ för att åt
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fel, kan inte använda alternativet @ om sekvensen (yy) (mm) eller (ÅÅÅÅ) (mm) inte är i mask.
 UMask=Umask parameter för nya filer på Unix / Linux / BSD-filsystemet.
 UMaskExplanation=Denna parameter gör att du kan definiera behörigheter som standard på filer skapade av Dolibarr på servern (under upp till exempel). <br> Det måste vara det oktala värdet (till exempel 0666 innebär läsa och skriva för alla). <br> Denna parameter är meningslöst på en Windows server.
-SeeWikiForAllTeam=Ta en titt på wiki-sidan för fullständig förteckning över alla aktörer och deras organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Fördröjning för caching export svar i sekunder (0 eller tomt för ingen cache)
 DisableLinkToHelpCenter=Dölj länken <b>&quot;Behöver du hjälp eller stöd&quot;</b> på inloggningssidan
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Ändra om priser med bas referensvärde som definieras på
 MassConvert=Starta masskonvertering
 String=String
 TextLong=Lång text
+HtmlText=Html text
 Int=Heltal
 Float=Flyttal
 DateAndTime=Datum och timme
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Länk till ett objekt
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Varning: Din <b>conf.php</b> innehåller direktiv <b>dolibarr_pdf_force_fpdf = 1.</b> Detta innebär att du använder fpdf bibliotek för att generera PDF-filer. Detta bibliotek är gammalt och inte stöder en mängd funktioner (Unicode, bild öppenhet, kyrilliska, arabiska och asiatiska språk, ...), så att du kan uppleva fel under PDF generation. <br> För att lösa detta och ha ett fullt stöd för PDF-generering, ladda ner <a href="http://www.tcpdf.org/" target="_blank">TCPDF bibliotek</a> , sedan kommentera eller ta bort linjen <b>$ dolibarr_pdf_force_fpdf = 1,</b> och lägg istället <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
 LocalTaxDesc=Vissa länder tillämpar 2 eller 3 skatt på varje faktura rad. Om så är fallet, välj typ för andra och tredje skatte- och dess hastighet. Möjlig typ är: <br> 1: lokal skatt tillämpas på produkter och tjänster utan moms (localtax beräknas på belopp utan skatt) <br> 2: lokal skatt tillämpas på produkter och tjänster, inklusive moms (localtax beräknas på belopp + huvud skatt) <br> 3: lokal skatt tillämpas på produkter utan moms (localtax beräknas på belopp utan skatt) <br> 4: lokal skatt tillämpas på produkter inklusive moms (localtax beräknas på belopp + huvud moms) <br> 5: lokal skatt tillämpas på tjänster utan moms (localtax beräknas på belopp utan skatt) <br> 6: lokal skatt tillämpas på tjänster, inklusive moms (localtax beräknas på belopp + moms)
 SMS=SMS
 LinkToTestClickToDial=Skriv in ett telefonnummer att ringa upp för att visa en länk för att prova ClickToDial url för användare <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Användare & grupper
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Marginaler
 Module59000Desc=Modul för att hantera marginaler
 Module60000Name=Provision
 Module60000Desc=Modul för att hantera uppdrag
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resurser
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Läs fakturor
@@ -833,11 +838,11 @@ Permission1251=Kör massiv import av externa data till databasen (data last)
 Permission1321=Export kundfakturor, attribut och betalningar
 Permission1322=Reopen a paid bill
 Permission1421=Export kundorder och attribut
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Skapa/modifera din ledighetsansökan
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Radera ledighets förfrågningar
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Skapa/modifera en ledighetsansökning för samtliga
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admins ledighetsansökan (upprätta och uppdatera balanser)
 Permission23001=Läs Planerad jobb
 Permission23002=Skapa / uppdatera Schemalagt jobb
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Mängd skattestämpel
 DictionaryPaymentConditions=Betalningsvillkor
 DictionaryPaymentModes=Betalningssätten
 DictionaryTypeContact=Kontakt / adresstyper
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Miljöskatt (WEEE)
 DictionaryPaperFormat=Pappersformat
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Moms Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Som standard föreslås moms 0 som kan användas för de fall som föreningar, privatpersoner ou små företag.
-VATIsUsedExampleFR=I Frankrike betyder det företag eller organisationer som har en verklig skattesystemet (förenklad verkliga eller normal verklig). Ett system där mervärdesskatt ska deklareras.
-VATIsNotUsedExampleFR=I Frankrike betyder det föreningar som inte är moms deklarerats eller företag, organisationer eller fria yrken som har valt mikroföretag skattesystemet (mervärdesskatt i franchise) och betalade en franchise moms utan momsdeklaration. Detta val kommer att visa referens &quot;Ej tillämpligt mervärdesskatt - konst-293B av CGI&quot; på fakturorna.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Betyg
 LocalTax1IsNotUsed=Använd inte andra skatte
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver typ
 SummarySystem=Systeminformation sammandrag
 SummaryConst=Lista över alla Dolibarr setup parametrar
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard Menu Manager
 DefaultMenuSmartphoneManager=Smartphone menyhanteraren
 Skin=Hud tema
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster
 DefaultLanguage=Default språk att använda (språkkod)
 EnableMultilangInterface=Aktivera flerspråkigt gränssnitt
 EnableShowLogo=Visa logotypen på vänstra menyn
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Namn
 CompanyAddress=Adress
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
 SystemAreaForAdminOnly=Detta område är tillgänglig för administratören användare. Ingen av de Dolibarr behörigheter kan minska denna gräns.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Du kan välja varje parameter i samband med Dolibarr utseendet här
 AvailableModules=Available app/modules
 ToActivateModule=För att aktivera moduler, gå på Setup-menyn (Hem-> Inställningar-> Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=Filnamn och sökväg
 YouCanUseDOL_DATA_ROOT=Du kan använda DOL_DATA_ROOT / dolibarr.log för en loggfil i Dolibarr &quot;dokument&quot; katalogen. Du kan ställa in en annan väg för att lagra den här filen.
 ErrorUnknownSyslogConstant=Konstant %s är inte en känd syslog konstant
 OnlyWindowsLOG_USER=Endast Windows stöder LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation modul setup
 DonationsReceiptModel=Mall för donation kvitto
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Skatter, sociala eller skattemässiga skatter och dividender modul installations
 OptionVatMode=Mervärdesskatt
-OptionVATDefault=Kontantmetoden
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Periodiseringsprincipen
 OptionVatDefaultDesc=Mervärdesskatt skall betalas: <br> - Om leverans / betalning för varor <br> - Bestämmelser om betalningar för tjänster
 OptionVatDebitOptionDesc=Mervärdesskatt skall betalas: <br> - Om leverans / betalning för varor <br> - På fakturan (debet) för tjänster
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Tid för moms exigibility standard enligt vald alternativ:
 OnDelivery=Vid leverans
 OnPayment=Mot betalning
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Fakturadatum används
 Buy=Köp
 Sell=Sälj
 InvoiceDateUsed=Fakturadatum används
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Försäljning konto. kod
 AccountancyCodeBuy=Köpa konto. kod
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index 6ab3a1435fe..1fb3fb33bb4 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Medlem %s validerade
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Medlem %s raderad
-MemberSubscriptionAddedInDolibarr=Teckning av medlem %s tillades
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Leverans %s validerad
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Du kan också lägga till följande parametrar för att filtre
 AgendaUrlOptions3=<b>Logina =%s</b> ​​att begränsa produktionen till åtgärder som ägs av en användare<b>%s.</b>
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>projekt = PROJECT_ID</b> att begränsa produktionen till åtgärder i samband med projektet <b>PROJECT_ID.</b>
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Upptagen
@@ -109,7 +112,7 @@ ExportCal=Export kalender
 ExtSites=Importera externa kalendrar
 ExtSitesEnableThisTool=Visa externa kalendrar (definierade i globala inställningar) i dagordningen. Påverkar inte externa kalendrar definierat av användare.
 ExtSitesNbOfAgenda=Antal kalendrar
-AgendaExtNb=Kalender nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL att komma åt. Ical-fil
 ExtSiteNoLabel=Ingen beskrivning
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 8ac1d6fd0cc..065a884cf00 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Återbetald
 DeletePayment=Radera betalning
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Leverantörer betalningar
 ReceivedPayments=Mottagna betalningar
 ReceivedCustomersPayments=Inbetalningar från kunder
@@ -91,7 +92,7 @@ PaymentAmount=Betalningsbelopp
 ValidatePayment=Bekräfta betalning
 PaymentHigherThanReminderToPay=Betalning högre än påminnelse att betala
 HelpPaymentHigherThanReminderToPay=Uppmärksamheten är för betalning är en eller flera räkningar högre än resten att betala. <br> Redigera din post, bekräfta något annat och tänka på att skapa en kreditnota det felaktigt erhållna beloppet för varje överskjutande fakturor.
-HelpPaymentHigherThanReminderToPaySupplier=Obs, betalningsbeloppet av en eller flera räkningar är högre än återstående belopp att betala. <br> Redigera din post, annars bekräfta.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Klassificera "betalda"
 ClassifyPaidPartially=Klassificera "betalda delvis"
 ClassifyCanceled=Klassificera "övergivna"
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Konvertera till framtida rabatt
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Skriv in avgifter från kunderna
 EnterPaymentDueToCustomer=Gör betalning till kunden
 DisabledBecauseRemainderToPayIsZero=Inaktiverad pga återstående obetalt är noll
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Utkast (måste valideras)
 BillStatusPaid=Betald
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Omräknat i rabatt
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Övergiven
 BillStatusValidated=Validerad (måste betalas)
 BillStatusStarted=Påbörjad
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Avvaktande
 AmountExpected=Yrkade beloppet
 ExcessReceived=Överskott fått
+ExcessPaid=Excess paid
 EscompteOffered=Rabatterna (betalning innan terminen)
 EscompteOfferedShort=Rabatt
 SendBillRef=Inlämning av faktura %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Rabatt från kreditnota %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Denna typ av krediter kan användas på fakturan innan validering
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Ny fix rabatt
 NewRelativeDiscount=Nya relativa rabatt
+DiscountType=Discount type
 NoteReason=Not/orsak
 ReasonDiscount=Orsak
 DiscountOfferedBy=Beviljats av
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Faktureringsadress
 HelpEscompte=Denna rabatt är en rabatt som kund eftersom betalningen gjordes före sikt.
 HelpAbandonBadCustomer=Detta belopp har övergivits (kund sägs vara en dålig kund) och anses som en exceptionell lös.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 44794c5e7b3..48e23cc431e 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -43,7 +43,8 @@ Individual=Privatperson
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Moderbolaget
 Subsidiaries=Dotterbolag
-ReportByCustomers=Betänkande av kunder
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Rapport från kurs
 CivilityCode=Hövlighet kod
 RegisteredOffice=Säte
@@ -75,10 +76,12 @@ Town=Stad
 Web=Webb
 Poste= Position
 DefaultLang=Språk som standard
-VATIsUsed=Moms används
-VATIsNotUsed=Moms används inte
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Förslag
 OverAllOrders=Beställningar
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane kod)
 ProfId4TN=Prof Id 4 (förbud)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT-nummer
-VATIntraShort=VAT-nummer
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntaxen är giltigt
+VATReturn=VAT return
 ProspectCustomer=Möjlig kund / Kund
 Prospect=Möjlig kund
 CustomerCard=Kundkort
 Customer=Kund
 CustomerRelativeDiscount=Relativ kundrabatt
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relativ rabatt
 CustomerAbsoluteDiscountShort=Absolut rabatt
 CompanyHasRelativeDiscount=Denna kund har en rabatt på <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Denna kund har ingen relativ rabatt som standard
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Denna kund har fortfarande kreditnotor för <b>%s %s</b>
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Denna kund har inga rabatttillgodohavanden
-CustomerAbsoluteDiscountAllUsers=Absolut rabatter (beviljat av alla användare)
-CustomerAbsoluteDiscountMy=Absolut rabatter (beviljat av dig själv)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Ingen
 Supplier=Leverantör
 AddContact=Skapa kontakt
@@ -377,9 +390,9 @@ NoDolibarrAccess=Dolibarr ej nåbar
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakter och egenskaper
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Kontakter / adresser (tredje part eller ej) och attribut
-ImportDataset_company_3=Bankuppgifter
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Prisnivå
 DeliveryAddress=Leveransadress
 AddAddress=Lägg till adress
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Obetalda fakturor
 OutstandingBill=Max för obetald faktura
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Ger nummer med format %syymm-nnnn för kundnummer och %syymm-nnnn för leverantörnummer där YY är år, mm månad och nnnn är en sekvens utan avbrott och utan återgång till 0.
 LeopardNumRefModelDesc=Kund / leverantör-nummer är ledig. Denna kod kan ändras när som helst.
 ManagingDirectors=Företagledares namn (vd, direktör, ordförande ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index a97a1389be8..9b27afcee5e 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Redovisning Doc.
 AmountHTVATRealReceived=Net insamlade
 AmountHTVATRealPaid=Net betalas
-VATToPay=Moms säljer
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF betalningar
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Visa mervärdesskatteskäl
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Den innehåller alla faktiska utbetalningar av fakturor från kunder. <br> - Den bygger på betalningsdagen för dessa fakturor <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Rapport från tredje part IRPF
-LT1ReportByCustomersInInputOutputModeES=Rapport från tredje part RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Rapport från tredje part RE
+LT2ReportByCustomersES=Rapport från tredje part IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Rapport av kunden moms samlas och betalas
-VATReportByCustomersInDueDebtMode=Rapport av kunden moms samlas och betalas
-VATReportByQuartersInInputOutputMode=Rapport från graden av mervärdesskatten och en betald
-LT1ReportByQuartersInInputOutputMode=Rapport från RE hastighet
-LT2ReportByQuartersInInputOutputMode=Betänkande av IRPF hastighet
-VATReportByQuartersInDueDebtMode=Rapport från graden av mervärdesskatten och en betald
-LT1ReportByQuartersInDueDebtMode=Rapport från RE hastighet
-LT2ReportByQuartersInDueDebtMode=Betänkande av IRPF hastighet
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Rapport från RE hastighet
+LT2ReportByQuartersES=Betänkande av IRPF hastighet
 SeeVATReportInInputOutputMode=Se rapporten <b>%sVAT encasement%s</b> en vanlig beräkning
 SeeVATReportInDueDebtMode=Se rapporten <b>%sVAT om flow%s</b> för en beräkning med en option på flödet
 RulesVATInServices=- För tjänster innehåller rapporten de momsregler som faktiskt mottagits eller utfärdats på grundval av betalningsdagen.
-RulesVATInProducts=- För materiella tillgångar, innehåller den för mervärdesskatt fakturor på grundval av fakturadatum.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- För tjänster inkluderar redovisa moms fakturor på grund, har betalats eller inte, baserat på fakturadatum.
-RulesVATDueProducts=- För materiella tillgångar, innehåller den för mervärdesskatt fakturor, baserat på fakturadatum.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Anmärkning: För materiella tillgångar, bör det använda dagen för leverans att vara mer rättvis.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%% / Faktura
 NotUsedForGoods=Inte används på varor
 ProposalStats=Statistik över förslag
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omsättning rapport per produkt, när du använder en <b>kontantredovisningsläge</b> inte är relevant. Denna rapport är endast tillgänglig när du använder <b>engagemang bokföring</b> läge (se inställning av bokföring modul).
 CalculationMode=Beräkning läge
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 2bca7ae203e..22bf3419e63 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Inga jobb registrerade
 CronPriority=Prioritet
 CronLabel=Etikett
 CronNbRun=Nb. lanseringen
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Varje
 JobFinished=Job lanserad och klar
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Från
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Skalkommando
-CronCannotLoadClass=Det går inte att läsa in klassen% s eller objekt% s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 399a7666788..59cc9a8ed17 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchning inte är fullständig.
 ErrorLDAPMakeManualTest=A. LDIF filen har genererats i katalogen %s. Försök att läsa in den manuellt från kommandoraden för att få mer information om fel.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan inte spara en åtgärd med &quot;inte Statut startade&quot; om fältet &quot;görs av&quot; är också fylld.
 ErrorRefAlreadyExists=Ref används för att skapa finns redan.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Kan inte ta bort posten. Den används redan eller ingå i annat föremål.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Det gick inte att lägga till post %s till Mailman
 ErrorFailedToRemoveToMailmanList=Det gick inte att ta bort posten %s till Mailman listan %s eller SPIP bas
 ErrorNewValueCantMatchOldValue=Nytt värde kan inte vara lika med gamla
 ErrorFailedToValidatePasswordReset=Det gick inte att REINIT lösenord. Kan vara reinit var redan gjort (den här länken kan bara användas en gång). Om inte, försök att starta om reinit processen.
-ErrorToConnectToMysqlCheckInstance=Anslut till databasen misslyckas. Kolla Mysql servern är igång (i de flesta fall kan du starta det från kommandoraden med "sudo /etc/init.d/mysql start").
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Det gick inte att lägga till kontakt
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Ett betalningsläge var inställt för att skriva %s, men installationen av modulens faktura fördes inte att definiera informationen som ska visas för den här betalningsläget.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/sv_SE/loan.lang b/htdocs/langs/sv_SE/loan.lang
index c2cd6712825..9c45a41f71f 100644
--- a/htdocs/langs/sv_SE/loan.lang
+++ b/htdocs/langs/sv_SE/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index a560696771a..bd4b056fcde 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 73a98ad4e7b..45e42f96156 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s inte definierad
 ErrorUnknown=Okänt fel
 ErrorSQL=SQL-fel
 ErrorLogoFileNotFound=Logo fil '%s' hittades inte
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Gå till modul inställningarna för att åtgärda detta
 ErrorFailedToSendMail=Det gick inte att skicka e-post (avsändare = %s, mottagare = %s)
 ErrorFileNotUploaded=Filen har inte laddats upp. Kontrollera att storleken inte överskrider högsta tillåtna, att det finns plats på disken och att det inte redan finns en fil med samma namn i den här katalogen.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Fel, ingen moms har definierats för lande
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Fel, kunde inte spara filen.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Ställ in datum
 SelectDate=Välj datum
 SeeAlso=Se även %s
 SeeHere=Se hänvisning
+ClickHere=Klicka här
+Here=Here
 Apply=Tillämpa
 BackgroundColorByDefault=Standard bakgrundsfärg
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Länk
 Select=Välj
 Choose=Välj
 Resize=Ändra storlek
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Författare
 User=Användare
@@ -325,8 +328,10 @@ Default=Standard
 DefaultValue=Standardvärde
 DefaultValues=Default values
 Price=Pris
+PriceCurrency=Price (currency)
 UnitPrice=Pris per enhet
 UnitPriceHT=Pris per enhet (netto)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Pris per enhet
 PriceU=Styckpris
 PriceUHT=St.pris(net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Belopp
 AmountInvoice=Fakturabelopp
+AmountInvoiced=Amount invoiced
 AmountPayment=Betalningsbelopp
 AmountHTShort=Belopp (netto)
 AmountTTCShort=Belopp (inkl. moms)
@@ -353,6 +359,7 @@ AmountLT2ES=Belopp IRPF
 AmountTotal=Summa
 AmountAverage=Genomsnittligt belopp
 PriceQtyMinHT=Pris kvantitet min. (Netto efter skatt)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Procent
 Total=Summa
 SubTotal=Delsumma
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Mervärdesskattesats
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Genomsnittlig
 Sum=Summa
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Färdiga
 ActionUncomplete=Icke klar
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Kontakter till denna tredje part
 ContactsAddressesForCompany=Kontakter / adresser för denna tredje part
 AddressesForCompany=Adresser för denna tredje part
@@ -427,6 +437,9 @@ ActionsOnCompany=Åtgärder om denna tredje part
 ActionsOnMember=Händelser om denna medlem
 ActionsOnProduct=Events about this product
 NActionsLate=%s sent
+ToDo=Att göra
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Begär redan registrerats
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Varning, du är i en underhållsmode, så bara lo
 CoreErrorTitle=Systemfel
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kreditkort
+ValidatePayment=Bekräfta betalning
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fält med <b>%s</b> är obligatoriska
 FieldsWithIsForPublic=Fält med <b>%s</b> visas på offentlig lista över medlemmar. Om du inte vill det, avmarkera "offentlig".
 AccordingToGeoIPDatabase=(Enligt GeoIP omvandling)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Klassificera billed
+ClassifyUnbilled=Classify unbilled
 Progress=Framsteg
-ClickHere=Klicka här
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Projekt
 Projects=Projekt
 Rights=Behörigheter
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Tredje part
 SearchIntoContacts=Kontakter
 SearchIntoMembers=Medlemmar
 SearchIntoUsers=Användare
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Alla
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Påverkas i
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index b0c581fcd42..34017733633 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Betyg måste vara ett numeriskt värde
 markRateShouldBeLesserThan100=Mark takt bör vara lägre än 100
 ShowMarginInfos=Visa marginal information
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 224b94dcb24..e789151733e 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Förteckning över validerade, offentliga medlemmar
 ErrorThisMemberIsNotPublic=Denna medlem är inte offentlig
 ErrorMemberIsAlreadyLinkedToThisThirdParty=En annan ledamot (namn: <b>%s,</b> login: <b>%s)</b> är redan kopplad till en tredje part <b>%s.</b> Ta bort denna länk först, eftersom en tredje part inte kan kopplas till endast en ledamot (och vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av säkerhetsskäl måste du beviljas behörighet att redigera alla användare att kunna koppla en medlem till en användare som inte är din.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Innehållet i ditt medlemskort
 SetLinkToUser=Koppla till en Dolibarr användare
 SetLinkToThirdParty=Koppla till en Dolibarr tredje part
 MembersCards=Medlemmars visitkort
@@ -108,17 +106,33 @@ PublicMemberCard=Medlem offentlig kort
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Skapa prenumeration
 ShowSubscription=Visa prenumeration
-SendAnEMailToMember=Skicka informations-e-post till medlem
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Innehållet i ditt medlemskort
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Ämne för e-post mottagen vid automatisk inskrivning av gäst
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-post mottagen vid automatisk inskrivning av gäst
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-post-ämne för medlems auto-prenumeration
-DescADHERENT_AUTOREGISTER_MAIL=E-post för medlems auto-prenumeration
-DescADHERENT_MAIL_VALID_SUBJECT=E-post-ämne för medlems validering
-DescADHERENT_MAIL_VALID=E-post för medlems validering
-DescADHERENT_MAIL_COTIS_SUBJECT=E-post-ämne för prenumeration
-DescADHERENT_MAIL_COTIS=E-post för prenumeration
-DescADHERENT_MAIL_RESIL_SUBJECT=E-post-ämne för medlems uppsägning
-DescADHERENT_MAIL_RESIL=E-post för medlems uppsägning
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Avsändare E-post för automatisk e-post
 DescADHERENT_ETIQUETTE_TYPE=Utformning av etikettsida
 DescADHERENT_ETIQUETTE_TEXT=Text på medlems adressflik
@@ -177,3 +191,8 @@ NoVatOnSubscription=Ingen moms för prenumeration
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index e1827e2687a..8bc23fa568b 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Meddelande på validerade betalning återvänder sida
 MessageKO=Meddelande om avbokning betalning återvänder sida
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Länkat objekt
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Starta upp
 CancelUpload=Avbryt upp
 FileIsTooBig=Filer är för stor
 PleaseBePatient=Ha tålamod ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=En begäran om att ändra Dolibarr lösenord har mottagits
 NewKeyIs=Det här är din nya nycklar för att logga in
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Beskrivning
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/sv_SE/paypal.lang b/htdocs/langs/sv_SE/paypal.lang
index 732ebd02ca8..bccdafb1b9c 100644
--- a/htdocs/langs/sv_SE/paypal.lang
+++ b/htdocs/langs/sv_SE/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal endast
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=Detta är id transaktion: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Lägg till URL Paypal betalning när du skickar ett dokument per post
-PredefinedMailContentLink=Du kan klicka på den säkra länken nedan för att göra din betalning (PayPal), om det inte redan är gjort.\n\n %s\n\n
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index dc0f90423ac..99be210f9a4 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Produkt eller tjänst
 ProductsAndServices=Produkter och tjänster
 ProductsOrServices=Produkter eller tjänster
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Är du säker på att du vill ta bort denna produktlinj
 ProductSpecial=Särskilda
 QtyMin=Minsta antal
 PriceQtyMin=Pris för detta minsta antal (exkl. rabatt)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Momssats (för denna leverantör / produkt)
 DiscountQtyMin=Standardrabatt för kvantitet
 NoPriceDefinedForThisSupplier=Inget pris / st fastställts för detta leverantör / produkt
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 15b6c11151d..1f5e6c53466 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Projekt kontakter
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Alla projekt
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Denna uppfattning presenterar alla projekt du har rätt att läsa.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa.
 ProjectsDesc=Denna uppfattning presenterar alla projekt (din användarbehörighet tillåta dig att visa allt).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Arbetsbelastning inte definierad
 NewTimeSpent=Tid
 MyTimeSpent=Min tid
+BillTime=Bill the time spent
 Tasks=Uppgifter
 Task=Uppgift
 TaskDateStart=Uppgift startdatum
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Förteckning över åtgärder i samband med projektet
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Aktivitet på projekt den här veckan
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Aktivitet på projekt denna månad
 ActivityOnProjectThisYear=Aktivitet på projekt i år
 ChildOfProjectTask=Barn av projekt / uppdrag
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Inte ägaren av denna privata projekt
 AffectedTo=Påverkas i
 CantRemoveProject=Projektet kan inte tas bort eftersom den refereras till av något annat föremål (faktura, order eller annat). Se Referer fliken.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum
 ProjectsAndTasksLines=Projekt och uppdrag
 ProjectCreatedInDolibarr=Projekt %s skapad
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Uppgift %s skapad
 TaskModifiedInDolibarr=Uppgift %s modifierade
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang
index 638976b14da..0fb1ecb86af 100644
--- a/htdocs/langs/sv_SE/propal.lang
+++ b/htdocs/langs/sv_SE/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Undertecknats (behov fakturering)
 PropalStatusNotSigned=Inte undertecknat (stängt)
 PropalStatusBilled=Fakturerade
 PropalStatusDraftShort=Förslag
+PropalStatusValidatedShort=Validerade
 PropalStatusClosedShort=Stängt
 PropalStatusSignedShort=Signerad
 PropalStatusNotSignedShort=Inte undertecknat
diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index f8a94123cf3..04335dd79a2 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 81ae39de0d9..d83b16508fa 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Ändra lager
 MenuNewWarehouse=Nytt lager
 WarehouseSource=Ursprungslager
 WarehouseSourceNotDefined=Inget lager definierat
+AddWarehouse=Create warehouse
 AddOne=Lägg till en / ett
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Mål lager
 ValidateSending=Radera sändning
 CancelSending=Avbryt sändning
@@ -22,6 +24,7 @@ Movements=Förändringar
 ErrorWarehouseRefRequired=Lagrets referensnamn krävs
 ListOfWarehouses=Lista över lager
 ListOfStockMovements=Lista över lagerförändringar
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/sv_SE/stripe.lang b/htdocs/langs/sv_SE/stripe.lang
index 70f2addc1f4..20a54652777 100644
--- a/htdocs/langs/sv_SE/stripe.lang
+++ b/htdocs/langs/sv_SE/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
index 30c704826f8..1aef65c0fe0 100644
--- a/htdocs/langs/sv_SE/trips.lang
+++ b/htdocs/langs/sv_SE/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Belopp eller kilometer
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 ClassifyRefunded=Klassificerad 'Återbetalas'
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 3191a7d298e..8017b6026b0 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -69,8 +69,8 @@ InternalUser=Intern användare
 ExportDataset_user_1=Dolibarr-användarnas behov och egenskaper
 DomainUser=Domän användare %s
 Reactivate=Återaktivera
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Tillstånd beviljas, eftersom ärvt från en av en användares grupp.
 Inherited=Ärvda
 UserWillBeInternalUser=Skapad användare kommer att vara en intern användare (eftersom inte kopplade till en viss tredje part)
@@ -93,6 +93,7 @@ NameToCreate=Namn på tredje part för att skapa
 YourRole=Din roller
 YourQuotaOfUsersIsReached=Din kvot på aktiva användare är nådd!
 NbOfUsers=Nb av användare
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Endast en SuperAdmin kan nedgradera en SuperAdmin
 HierarchicalResponsible=Handledare
 HierarchicView=Hierarkisk vy
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 630a62570b0..a7bc45fbcdc 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Läsa
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 347464fa363..7224d4b8b05 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=För att kunna behandla
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Tredje part bankkod
-NoInvoiceCouldBeWithdrawed=Ingen faktura withdrawed med framgång. Kontrollera att fakturan på företag med en giltig förbud.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Klassificera krediteras
 ClassCreditedConfirm=Är du säker på att du vill klassificera detta tillbakadragande mottagande som krediteras på ditt bankkonto?
 TransData=Datum Transmission
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistik efter status linjer
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 78d5b8e3f16..fed6af9a6fa 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
index 34ed1126045..9267e55860a 100644
--- a/htdocs/langs/sw_SW/agenda.lang
+++ b/htdocs/langs/sw_SW/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index d3bb1909afa..5898daa72b0 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index c5bc84acaf8..3473667fe55 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 9bf75178bea..cda96a546b8 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index 884e077b96e..d2da7ded67e 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/sw_SW/loan.lang b/htdocs/langs/sw_SW/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/sw_SW/loan.lang
+++ b/htdocs/langs/sw_SW/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 1ba8ff6dc6d..cedcd01066b 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 552154036d3..35d3774700f 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/sw_SW/margins.lang b/htdocs/langs/sw_SW/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/sw_SW/margins.lang
+++ b/htdocs/langs/sw_SW/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index fd0adc4c264..7326f3b9950 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 1585504479e..2afabe43b06 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/sw_SW/paypal.lang b/htdocs/langs/sw_SW/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/sw_SW/paypal.lang
+++ b/htdocs/langs/sw_SW/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 53835bd7f06..b9ebefc91c9 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index c69302deecb..319a6e7e0e2 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/sw_SW/propal.lang b/htdocs/langs/sw_SW/propal.lang
index 5f3c441bb0d..04941e4c650 100644
--- a/htdocs/langs/sw_SW/propal.lang
+++ b/htdocs/langs/sw_SW/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/sw_SW/salaries.lang
+++ b/htdocs/langs/sw_SW/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 4cdc262b847..7fbe2f6b82a 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/sw_SW/trips.lang b/htdocs/langs/sw_SW/trips.lang
index a741a9f6e5f..2ede3bc474e 100644
--- a/htdocs/langs/sw_SW/trips.lang
+++ b/htdocs/langs/sw_SW/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index c87ce3a9b02..8aa5d3749fc 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 0bfacad98ef..d98c15c45c2 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=ผังบัญชี
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=ประเภทของเอกสาร
 Docdate=วันที่
 Docref=การอ้างอิง
-Code_tiers=Thirdparty
 LabelAccount=บัญชีฉลาก
 LabelOperation=Label operation
 Sens=ซองส์
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=การชำระเงินของลูกค้าใบแจ้งหนี้
-ThirdPartyAccount=บัญชี Thirdparty
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=ข้อผิดพลาดที่คุ
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=ธรรมชาติ
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=ขาย
 AccountingJournalType3=การสั่งซื้อสินค้า
 AccountingJournalType4=ธนาคาร
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 2ead1baea34..0990b179628 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=ข้อผิดพลาดไม่สาม
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=ข้อผิดพลาดที่ไม่สามารถใช้ตัวเลือก @ ถ้าลำดับ {yy} {} มิลลิเมตรหรือปปปป {} {} มมไม่ได้อยู่ในหน้ากาก
 UMask=umask พารามิเตอร์สำหรับไฟล์ใหม่ใน Unix / Linux / BSD / ระบบไฟล์ Mac
 UMaskExplanation=พารามิเตอร์นี้จะช่วยให้คุณสามารถกำหนดสิทธิ์ในการตั้งค่าได้โดยเริ่มต้นในไฟล์ที่สร้างขึ้นโดย Dolibarr บนเซิร์ฟเวอร์ (ระหว่างการอัปโหลดตัวอย่าง) <br> มันจะต้องเป็นค่าฐานแปด (ตัวอย่างเช่น 0666 หมายถึงการอ่านและเขียนสำหรับทุกคน) <br> พารามิเตอร์นี้จะไม่ได้ผลในเซิร์ฟเวอร์ Windows
-SeeWikiForAllTeam=ลองดูที่หน้าวิกิพีเดียสำหรับรายชื่อของนักแสดงทุกคนและองค์กรของพวกเขา
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= สำหรับการตอบสนองที่ล่าช้าในการส่งออกในไม่กี่วินาทีแคช (0 หรือที่ว่างเปล่าสำหรับแคชไม่ได้)
 DisableLinkToHelpCenter=ซ่อนลิงค์ <b>"ต้องการความช่วยเหลือหรือการสนับสนุน"</b> ในหน้าเข้าสู่ระบบ
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=การปรับเปลี่ยนราคาค
 MassConvert=เปิดมวลแปลง
 String=เชือก
 TextLong=ข้อความยาว
+HtmlText=Html text
 Int=จำนวนเต็ม
 Float=ลอย
 DateAndTime=วันที่และชั่วโมง
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=เชื่อมโยงไปยังวัตถุ
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=คำเตือน: <b>conf.php</b> ของคุณมี <b>dolibarr_pdf_force_fpdf</b> สั่ง <b>=</b> 1 ซึ่งหมายความว่าคุณใช้ห้องสมุด FPDF ในการสร้างไฟล์ PDF ห้องสมุดนี้จะเก่าและไม่สนับสนุนจำนวนมากของคุณสมบัติ (Unicode โปร่งใสภาพ Cyrillic ภาษาอาหรับและเอเซีย, ... ) ดังนั้นคุณอาจพบข้อผิดพลาดระหว่างการสร้างรูปแบบไฟล์ PDF <br> เพื่อแก้ปัญหานี้และมีการสนับสนุนอย่างเต็มที่จากการสร้างรูปแบบไฟล์ PDF โปรดดาวน์โหลด <a href="http://www.tcpdf.org/" target="_blank">ห้องสมุด TCPDF</a> แล้วแสดงความคิดเห็นหรือลบบรรทัด <b>$ dolibarr_pdf_force_fpdf = 1</b> และเพิ่มแทน <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
 LocalTaxDesc=บางประเทศใช้ 2 หรือ 3 ภาษีในแต่ละบรรทัดใบแจ้งหนี้ หากเป็นกรณีนี้เลือกประเภทภาษีที่สองและสามและอัตรา ชนิดที่เป็นไปได้: <br> 1: ภาษีท้องถิ่นนำไปใช้กับผลิตภัณฑ์และบริการโดยไม่ต้องภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงินที่ไม่เสียภาษี) <br> 2: ภาษีท้องถิ่นนำไปใช้กับผลิตภัณฑ์และบริการรวมทั้งภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงินภาษี + หลัก) <br> 3: ภาษีท้องถิ่นนำไปใช้กับผลิตภัณฑ์โดยไม่ต้องภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงินที่ไม่เสียภาษี) <br> 4: ภาษีท้องถิ่นนำไปใช้บนผลิตภัณฑ์รวมถึงภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงิน + ถังหลัก) <br> 5 ภาษีท้องถิ่นนำไปใช้ในการให้บริการไม่รวมภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงินที่ไม่เสียภาษี) <br> 6: ภาษีท้องถิ่นนำไปใช้ในการให้บริการรวมทั้งภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงิน + ภาษี)
 SMS=SMS
 LinkToTestClickToDial=ป้อนหมายเลขโทรศัพท์เพื่อโทรไปที่จะแสดงการเชื่อมโยงเพื่อทดสอบสมาชิก ClickToDial <strong>สำหรับผู้ใช้% s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=และกลุ่มผู้ใช้
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=อัตรากำไรขั้นต้น
 Module59000Desc=โมดูลการจัดการอัตรากำไรขั้นต้น
 Module60000Name=คณะกรรมการ
 Module60000Desc=โมดูลการจัดการค่าคอมมิชชั่น
+Module62000Name=Incoterm
+Module62000Desc=เพิ่มคุณสมบัติในการจัดการ Incoterm
 Module63000Name=ทรัพยากร
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=อ่านใบแจ้งหนี้ของลูกค้า
@@ -833,11 +838,11 @@ Permission1251=เรียกมวลของการนำเข้าข
 Permission1321=ส่งออกใบแจ้งหนี้ของลูกค้าคุณลักษณะและการชำระเงิน
 Permission1322=Reopen a paid bill
 Permission1421=ส่งออกสั่งซื้อของลูกค้าและคุณลักษณะ
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=สร้าง / แก้ไขการร้องขอการลาของคุณ
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=ลบออกจากการร้องขอ
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=สร้าง / แก้ไขการร้องขอลาสำหรับทุกคน
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=ธุรการร้องขอลา (การติดตั้งและการปรับปรุงความสมดุล)
 Permission23001=อ่านงานที่กำหนดเวลาไว้
 Permission23002=สร้าง / การปรับปรุงกำหนดเวลางาน
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=จำนวนเงินรายได้ของแ
 DictionaryPaymentConditions=เงื่อนไขการชำระเงิน
 DictionaryPaymentModes=โหมดการชำระเงิน
 DictionaryTypeContact=ติดต่อเรา / ที่อยู่ประเภท
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=รูปแบบกระดาษ
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=การบริหารจัดการภาษีมูลค่าเพิ่ม
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=โดยเริ่มต้นภาษีมูลค่าเพิ่มเสนอเป็น 0 ซึ่งสามารถนำมาใช้สำหรับกรณีเช่นสมาคมบุคคลอู บริษัท ขนาดเล็ก
-VATIsUsedExampleFR=ในประเทศฝรั่งเศสก็หมายความว่า บริษัท หรือองค์กรที่มีระบบการคลังที่แท้จริง (ประยุกต์ปกติจริงหรือจริง) ระบบที่มีการประกาศภาษีมูลค่าเพิ่ม
-VATIsNotUsedExampleFR=ในประเทศฝรั่งเศสก็หมายความว่าสมาคมที่ไม่ใช่ภาษีมูลค่าเพิ่มประกาศหรือ บริษัท องค์กรหรือเสรีนิยมอาชีพที่ได้รับการแต่งตั้งองค์กรขนาดเล็กระบบการคลัง (VAT ในแฟรนไชส์​​) และจ่ายเงินภาษีมูลค่าเพิ่มแฟรนไชส์​​โดยไม่มีการประกาศใด ๆ ภาษีมูลค่าเพิ่ม ทางเลือกนี้จะแสดงอ้างอิง "ไม่บังคับภาษีมูลค่าเพิ่ม - ศิลปะ 293B ซีจี" ในใบแจ้งหนี้
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=ประเมิน
 LocalTax1IsNotUsed=อย่าใช้ภาษีที่สอง
@@ -977,7 +983,7 @@ Host=เซิร์ฟเวอร์
 DriverType=ชนิดตัวขับ
 SummarySystem=สรุปข้อมูลระบบ
 SummaryConst=รายชื่อของพารามิเตอร์การตั้งค่า Dolibarr
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= ผู้จัดการเมนูมาตรฐาน
 DefaultMenuSmartphoneManager=ผู้จัดการเมนูมาร์ทโฟน
 Skin=ธีมผิว
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=แบบฟอร์มการค้นหาถา
 DefaultLanguage=ภาษาเริ่มต้นที่จะใช้ (รหัสภาษา)
 EnableMultilangInterface=เปิดใช้งานอินเตอร์เฟซที่พูดได้หลายภาษา
 EnableShowLogo=โลโก้แสดงบนเมนูด้านซ้าย
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=ชื่อ
 CompanyAddress=ที่อยู่
 CompanyZip=ไปรษณีย์
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=ข้อมูลระบบข้อมูลทางด้านเทคนิคอื่น ๆ ที่คุณได้รับในโหมดอ่านอย่างเดียวและมองเห็นสำหรับผู้ดูแลระบบเท่านั้น
 SystemAreaForAdminOnly=บริเวณนี้เป็นที่ใช้ได้สำหรับผู้ใช้ผู้ดูแลระบบเท่านั้น ไม่มีสิทธิ์ Dolibarr สามารถลดขีด จำกัด นี้
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=คุณสามารถเลือกแต่ละพารามิเตอร์ที่เกี่ยวข้องกับ Dolibarr มองและความรู้สึกที่นี่
 AvailableModules=Available app/modules
 ToActivateModule=เพื่อเปิดใช้งานโมดูลไปในพื้นที่การติดตั้ง (หน้าแรก> Setup-> โมดูล)
@@ -1441,6 +1448,9 @@ SyslogFilename=ชื่อแฟ้มและเส้นทาง
 YouCanUseDOL_DATA_ROOT=คุณสามารถใช้ DOL_DATA_ROOT / dolibarr.log สำหรับล็อกไฟล์ใน Dolibarr "เอกสาร" ไดเรกทอรี คุณสามารถตั้งค่าเส้นทางที่แตกต่างกันในการจัดเก็บไฟล์นี้
 ErrorUnknownSyslogConstant=% s คงไม่ได้เป็นที่รู้จักกันอย่างต่อเนื่อง Syslog
 OnlyWindowsLOG_USER=Windows เท่านั้นสนับสนุน LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=บริจาคการติดตั้งโมดูล
 DonationsReceiptModel=แม่แบบที่ได้รับการบริจาค
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=ภาษีภาษีทางสังคมหรือทางการคลังและการติดตั้งโมดูลเงินปันผล
 OptionVatMode=เนื่องจากภาษีมูลค่าเพิ่ม
-OptionVATDefault=เกณฑ์เงินสด
+OptionVATDefault=Standard basis
 OptionVATDebitOption=ตามเกณฑ์คงค้าง
 OptionVatDefaultDesc=ภาษีมูลค่าเพิ่มเนื่องจาก: <br> - ในการจัดส่งสินค้า (วันที่เราใช้ใบแจ้งหนี้) <br> - การชำระเงินสำหรับการให้บริการ
 OptionVatDebitOptionDesc=ภาษีมูลค่าเพิ่มเนื่องจาก: <br> - ในการจัดส่งสินค้า (วันที่เราใช้ใบแจ้งหนี้) <br> - ในใบแจ้งหนี้ (เดบิต) สำหรับการให้บริการ
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=เวลาภาษีมูลค่าเพิ่ม exigibility โดยค่าเริ่มต้นเป็นไปตามตัวเลือกที่เลือก:
 OnDelivery=ในการจัดส่ง
 OnPayment=ในการชำระเงิน
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=วันที่ใบแจ้งหนี้ที
 Buy=ซื้อ
 Sell=ขาย
 InvoiceDateUsed=วันที่ใบแจ้งหนี้ที่ใช้
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=บัญชีการขาย รหัส
 AccountancyCodeBuy=บัญชีซื้อ รหัส
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 9eee4026229..6c0abc7049b 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=สมาชิก s% ผ่านการตรว
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=สมาชิก s% ลบ
-MemberSubscriptionAddedInDolibarr=สมัครสมาชิกสำหรับสมาชิก% s เพิ่ม
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=% s การตรวจสอบการจัดส่ง
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=นอกจากนี้คุณยังสามาร
 AgendaUrlOptions3=<b>Logina =% s</b> ​​ที่จะ จำกัด <b>การส่งออกไปยังการดำเนินการที่เป็นเจ้าของโดยผู้ใช้%</b> s
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>โครงการ = PROJECT_ID</b> ที่จะ จำกัด การส่งออกไปยังการดำเนินการที่เกี่ยวข้องกับโครงการ <b>PROJECT_ID</b>
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=ไม่ว่าง
@@ -109,7 +112,7 @@ ExportCal=ส่งออกปฏิทิน
 ExtSites=นำเข้าปฏิทินภายนอก
 ExtSitesEnableThisTool=แสดงปฏิทินภายนอก (เข้าสู่การตั้งค่าที่กำหนดไว้ทั่วโลก) เข้าสู่วาระการประชุม ไม่ส่งผลกระทบต่อปฏิทินภายนอกที่กำหนดโดยผู้ใช้
 ExtSitesNbOfAgenda=จำนวนปฏิทิน
-AgendaExtNb=ปฏิทิน nb% s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL ที่เข้าถึงไฟล์ .ical
 ExtSiteNoLabel=คำอธิบายไม่มี
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 27250e4df49..aa76ce73987 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -67,6 +67,7 @@ PaidBack=จ่ายคืน
 DeletePayment=ลบการชำระเงิน
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=การชำระเงินที่ผู้ซื้อผู้ขาย
 ReceivedPayments=การชำระเงินที่ได้รับ
 ReceivedCustomersPayments=การชำระเงินที่ได้รับจากลูกค้า
@@ -91,7 +92,7 @@ PaymentAmount=จำนวนเงินที่ชำระ
 ValidatePayment=ตรวจสอบการชำระเงิน
 PaymentHigherThanReminderToPay=การชำระเงินที่สูงกว่าการแจ้งเตือนที่จะต้องจ่าย
 HelpPaymentHigherThanReminderToPay=ความสนใจจำนวนเงินที่ชำระของหนึ่งหรือมากกว่าค่าใช้จ่ายที่สูงกว่าส่วนที่เหลือจะจ่าย <br> แก้ไขรายการของคุณมิฉะนั้นยืนยันและคิดเกี่ยวกับการสร้างใบลดหนี้ส่วนเกินที่ได้รับสำหรับแต่ละใบแจ้งหนี้ชำระเงินส่วนเกิน
-HelpPaymentHigherThanReminderToPaySupplier=ความสนใจจำนวนเงินที่ชำระของหนึ่งหรือมากกว่าค่าใช้จ่ายที่สูงกว่าส่วนที่เหลือจะจ่าย <br> แก้ไขรายการของคุณมิฉะนั้นยืนยัน
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=จำแนก 'ชำระเงิน'
 ClassifyPaidPartially=จำแนก 'ชำระบางส่วน'
 ClassifyCanceled=จำแนก 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=แปลงเป็นส่วนลดในอนาคต
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=ป้อนการชำระเงินที่ได้รับจากลูกค้า
 EnterPaymentDueToCustomer=ชำระเงินเนื่องจากลูกค้า
 DisabledBecauseRemainderToPayIsZero=ปิดใช้งานเนื่องจากค้างชำระที่เหลือเป็นศูนย์
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
 BillStatusPaid=ต้องจ่าย
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=การชำระเงิน (พร้อมสำหรับใบแจ้งหนี้สุดท้าย)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=ถูกปล่อยปละละเลย
 BillStatusValidated=การตรวจสอบ (จะต้องมีการจ่าย)
 BillStatusStarted=เริ่มต้น
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=ที่รอดำเนินการ
 AmountExpected=จำนวนเงินที่อ้างว่า
 ExcessReceived=ส่วนเกินที่ได้รับ
+ExcessPaid=Excess paid
 EscompteOffered=ส่วนลดที่นำเสนอ (ชำระเงินก่อนที่จะยาว)
 EscompteOfferedShort=ส่วนลด
 SendBillRef=ส่งใบแจ้งหนี้% s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=ส่วนลดจากใบลดหนี้% s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=ชนิดของเครดิตนี้สามารถใช้ในใบแจ้งหนี้ก่อนการตรวจสอบของ
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=ส่วนลดใหม่แน่นอน
 NewRelativeDiscount=ส่วนลดญาติใหม่
+DiscountType=Discount type
 NoteReason=หมายเหตุ / เหตุผล
 ReasonDiscount=เหตุผล
 DiscountOfferedBy=ที่ได้รับจาก
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=ที่อยู่บิล
 HelpEscompte=ส่วนลดนี้จะได้รับส่วนลดพิเศษให้กับลูกค้าเนื่องจากการชำระเงินที่ถูกสร้างขึ้นมาก่อนวาระ
 HelpAbandonBadCustomer=เงินจำนวนนี้ถูกทิ้งร้าง (ลูกค้าบอกว่าจะเป็นลูกค้าที่ไม่ดี) และถือเป็นหลวมพิเศษ
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 150763ce584..543cb36f917 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -43,7 +43,8 @@ Individual=เอกชน
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=บริษัท แม่
 Subsidiaries=บริษัท ย่อย
-ReportByCustomers=รายงานจากลูกค้า
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=รายงานอัตรา
 CivilityCode=รหัสสุภาพ
 RegisteredOffice=สำนักงานที่สมัครสมาชิก
@@ -75,10 +76,12 @@ Town=เมือง
 Web=เว็บ
 Poste= ตำแหน่ง
 DefaultLang=ภาษาโดยปริยาย
-VATIsUsed=ภาษีมูลค่าเพิ่มถูกนำมาใช้
-VATIsNotUsed=ภาษีมูลค่าเพิ่มที่ไม่ได้ใช้
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=ข้อเสนอ
 OverAllOrders=คำสั่งซื้อ
@@ -239,7 +242,7 @@ ProfId3TN=ศหมายเลข 3 (รหัส Douane)
 ProfId4TN=ศหมายเลข 4 (บ้าน)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=ภาษีมูลค่าเพิ่มจำนวน
-VATIntraShort=ภาษีมูลค่าเพิ่มจำนวน
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=ไวยากรณ์ที่ถูกต้อง
+VATReturn=VAT return
 ProspectCustomer=Prospect / ลูกค้า
 Prospect=โอกาส
 CustomerCard=บัตรของลูกค้า
 Customer=ลูกค้า
 CustomerRelativeDiscount=ส่วนลดลูกค้าญาติ
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=ส่วนลดญาติ
 CustomerAbsoluteDiscountShort=ส่วนลดแอบโซลูท
 CompanyHasRelativeDiscount=<b>ลูกค้ารายนี้มีส่วนลดเริ่มต้นของ% s %%</b>
 CompanyHasNoRelativeDiscount=ลูกค้ารายนี้ไม่เคยมีใครส่วนลดญาติโดยค่าเริ่มต้น
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=<b>ลูกค้ารายนี้ยังคงมีการบันทึกเครดิตสำหรับ% s%</b> s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=ลูกค้ารายนี้มีเครดิตส่วนลดไม่มี
-CustomerAbsoluteDiscountAllUsers=ส่วนลดแอบโซลูท (ที่ได้รับจากผู้ใช้ทั้งหมด)
-CustomerAbsoluteDiscountMy=ส่วนลดแอบโซลูท (ที่ได้รับจากตัวเอง)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=ไม่
 Supplier=ผู้ผลิต
 AddContact=สร้างรายชื่อผู้ติดต่อ
@@ -377,9 +390,9 @@ NoDolibarrAccess=ไม่สามารถเข้าถึง Dolibarr
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=รายชื่อและคุณสมบัติ
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=รายชื่อ / ที่อยู่ (จาก thirdparties หรือไม่) และคุณลักษณะ
-ImportDataset_company_3=ธนาคารรายละเอียด
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=ระดับราคา
 DeliveryAddress=ที่อยู่จัดส่ง
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=การเรียกเก็บเงินในปัจจุบันที่โดดเด่น
 OutstandingBill=แม็กซ์ สำหรับการเรียกเก็บเงินที่โดดเด่น
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=กลับ Numero ที่มีรูปแบบ% syymm-nnnn รหัสลูกค้าและ% syymm-nnnn รหัสผู้จัดจำหน่ายที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 0 ไม่มี
 LeopardNumRefModelDesc=รหัสที่เป็นอิสระ รหัสนี้สามารถแก้ไขได้ในเวลาใดก็ได้
 ManagingDirectors=ผู้จัดการ (s) ชื่อ (ซีอีโอผู้อำนวยการประธาน ... )
 MergeOriginThirdparty=ซ้ำของบุคคลที่สาม (บุคคลที่สามต้องการลบ)
 MergeThirdparties=ผสานบุคคลที่สาม
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties ได้รับการรวม
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=มีข้อผิดพลาดเมื่อมีการลบ thirdparties กรุณาตรวจสอบการเข้าสู่ระบบ เปลี่ยนแปลงได้รับการหวนกลับ
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 214f4492450..f491347da62 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -31,7 +31,7 @@ Credit=เครดิต
 Piece=บัญชีหมอ
 AmountHTVATRealReceived=สุทธิเก็บรวบรวม
 AmountHTVATRealPaid=จ่ายสุทธิ
-VATToPay=ภาษีมูลค่าเพิ่มขาย
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF การชำระเงิน
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=สังคม / การชำระเงินภาษีการคลัง
 ShowVatPayment=แสดงการชำระเงินภาษีมูลค่าเพิ่ม
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- ซึ่งจะรวมถึงทุกการชำระเงินที่มีประสิทธิภาพของใบแจ้งหนี้ที่ได้รับจากลูกค้า <br> - มันขึ้นอยู่กับวันที่ชำระเงินของใบแจ้งหนี้เหล่านี้ <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=รายงานโดยบุคคลที่สาม IRPF
-LT1ReportByCustomersInInputOutputModeES=รายงานโดยเรื่องของบุคคลที่สาม
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=รายงานโดยเรื่องของบุคคลที่สาม
+LT2ReportByCustomersES=รายงานโดยบุคคลที่สาม IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=รายงานโดยลูกค้าภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
-VATReportByCustomersInDueDebtMode=รายงานโดยลูกค้าภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
-VATReportByQuartersInInputOutputMode=รายงานโดยอัตราภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
-LT1ReportByQuartersInInputOutputMode=รายงานโดยอัตรา RE
-LT2ReportByQuartersInInputOutputMode=รายงานโดยอัตรา IRPF
-VATReportByQuartersInDueDebtMode=รายงานโดยอัตราภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
-LT1ReportByQuartersInDueDebtMode=รายงานโดยอัตรา RE
-LT2ReportByQuartersInDueDebtMode=รายงานโดยอัตรา IRPF
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=รายงานโดยอัตรา RE
+LT2ReportByQuartersES=รายงานโดยอัตรา IRPF
 SeeVATReportInInputOutputMode=<b>ดูรายงาน% sVAT encasement% สำหรับการคำนวณมาตรฐาน</b>
 SeeVATReportInDueDebtMode=ดูรายงาน <b>sVAT% ในกระแส%</b> สำหรับการคำนวณที่มีตัวเลือกในการไหล
 RulesVATInServices=- สำหรับการให้บริการรายงานรวมถึงกฎระเบียบของภาษีมูลค่าเพิ่มที่ได้รับจริงหรือออกบนพื้นฐานของวันที่ชำระเงิน
-RulesVATInProducts=- สินทรัพย์วัสดุจะมีใบแจ้งหนี้ภาษีมูลค่าเพิ่มบนพื้นฐานของวันที่ใบแจ้งหนี้
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- สำหรับการให้บริการรายงานใบแจ้งหนี้รวมภาษีมูลค่าเพิ่มเนื่องจากค่าใช้จ่ายหรือไม่ขึ้นอยู่กับวันที่ใบแจ้งหนี้
-RulesVATDueProducts=- สินทรัพย์วัสดุจะมีใบแจ้งหนี้ภาษีมูลค่าเพิ่มตามวันที่ใบแจ้งหนี้
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=หมายเหตุ: สำหรับสินทรัพย์ก็ควรใช้วันที่ส่งมอบจะเป็นธรรมมากขึ้น
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%% / ใบแจ้งหนี้
 NotUsedForGoods=ไม่ใช้สินค้า
 ProposalStats=สถิติเกี่ยวกับข้อเสนอ
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=<b>รายงานผลประกอบการต่อผลิตภัณฑ์เมื่อใช้โหมดการบัญชีเงินสดไม่เกี่ยวข้อง รายงานนี้จะใช้ได้เฉพาะเมื่อใช้โหมดการบัญชีการสู้รบ</b> (ดูการตั้งค่าของโมดูลการบัญชี)
 CalculationMode=โหมดการคำนวณ
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 559b52644ce..85838088924 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=ไม่มีงานที่ลงทะเบียน
 CronPriority=ลำดับความสำคัญ
 CronLabel=ฉลาก
 CronNbRun=nb ยิง
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=ทุกๆ
 JobFinished=งานเปิดตัวและจบ
 #Page card
@@ -74,9 +74,10 @@ CronFrom=จาก
 CronType=หมวดงาน
 CronType_method=Call method of a PHP Class
 CronType_command=คำสั่งเชลล์
-CronCannotLoadClass=ไม่สามารถโหลดระดับ s% หรือวัตถุ% s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=ปิดการใช้งาน
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index e3dc31a9461..12843075c46 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=การจับคู่ Dolibarr-LDAP ไม่ส
 ErrorLDAPMakeManualTest=ไฟล์ .ldif ได้รับการสร้างขึ้นในไดเรกทอรี% s พยายามที่จะโหลดได้ด้วยตนเองจากบรรทัดคำสั่งที่จะมีข้อมูลเพิ่มเติมเกี่ยวกับข้อผิดพลาด
 ErrorCantSaveADoneUserWithZeroPercentage=ไม่สามารถบันทึกการดำเนินการกับ "statut ไม่ได้เริ่ม" ถ้าเขต "ทำโดย" นอกจากนี้ยังเต็มไป
 ErrorRefAlreadyExists=Ref ใช้สำหรับการสร้างที่มีอยู่แล้ว
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=ไม่สามารถลบบันทึก มันถูกใช้ไปแล้วหรือรวมอยู่ในวัตถุอื่น
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=ไม่สามารถเพิ่มบั
 ErrorFailedToRemoveToMailmanList=ล้มเหลวในการลบบันทึก% s% s รายการบุรุษไปรษณีย์หรือฐานหลักสูตรนานาชาติ
 ErrorNewValueCantMatchOldValue=ค่าใหม่ไม่สามารถจะเท่ากับเก่า
 ErrorFailedToValidatePasswordReset=ล้มเหลวในการ reinit รหัสผ่าน อาจจะ reinit ถูกทำมาแล้ว (ลิงค์นี้สามารถใช้เพียงครั้งเดียว) ถ้าไม่ได้พยายามที่จะเริ่มต้นกระบวนการ reinit
-ErrorToConnectToMysqlCheckInstance=เชื่อมต่อไปยังฐานข้อมูลล้มเหลว ตรวจสอบเซิร์ฟเวอร์ MySQL เป็นที่ทำงาน (ในกรณีส่วนใหญ่คุณสามารถเปิดได้จากบรรทัดคำสั่งด้วย 'sudo /etc/init.d/mysql เริ่มต้น)
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=ล้มเหลวในการเพิ่มรายชื่อ
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=โหมดการชำระเงินถูกกำหนดให้พิมพ์% s แต่การตั้งค่าของโมดูลใบแจ้งหนี้ที่ยังไม่เสร็จสมบูรณ์เพื่อกำหนดข้อมูลที่จะแสดงโหมดการชำระเงินนี้
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/th_TH/loan.lang b/htdocs/langs/th_TH/loan.lang
index bec33d91ae5..02b5af3d549 100644
--- a/htdocs/langs/th_TH/loan.lang
+++ b/htdocs/langs/th_TH/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=การกำหนดค่าของเงินให้กู
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index f63819784b7..572546deb5c 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=ปัจจุบันจำนวนของอีเ
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 1e0d7518774..fbae64fc0d7 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=พารามิเตอร์% s ไม่ได้
 ErrorUnknown=ข้อผิดพลาดที่ไม่รู้จัก
 ErrorSQL=ข้อผิดพลาด SQL
 ErrorLogoFileNotFound=ไฟล์โลโก้ '% s' ไม่พบ
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=ไปยังโมดูลการติดตั้งการแก้ไขปัญหานี้
 ErrorFailedToSendMail=ล้มเหลวในการส่งอีเมล (ส่ง =% s รับ =% s)
 ErrorFileNotUploaded=ไฟล์ที่อัปโหลดไม่ได้ ตรวจสอบขนาดที่ไม่เกินสูงสุดที่อนุญาตที่พื้นที่ว่างที่มีอยู่บนดิสก์และนั่นก็คือไม่ได้อยู่แล้วไฟล์ที่มีชื่อเดียวกันในไดเรกทอรีนี้
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=ข้อผิดพลาดอัตร
 ErrorNoSocialContributionForSellerCountry=ข้อผิดพลาดที่ไม่มีทางสังคม / ประเภทภาษีทางการคลังที่กำหนดไว้สำหรับประเทศ '% s'
 ErrorFailedToSaveFile=ข้อผิดพลาดล้มเหลวที่จะบันทึกไฟล์
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=วันที่ตั้ง
 SelectDate=เลือกวันที่
 SeeAlso=ดูยัง% s
 SeeHere=ดูที่นี่
+ClickHere=คลิกที่นี่
+Here=Here
 Apply=ใช้
 BackgroundColorByDefault=สีพื้นหลังเริ่มต้น
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=ลิงค์
 Select=เลือก
 Choose=เลือก
 Resize=การปรับขนาด
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=ผู้เขียน
 User=ผู้ใช้งาน
@@ -325,8 +328,10 @@ Default=ผิดนัด
 DefaultValue=ค่ามาตรฐาน
 DefaultValues=Default values
 Price=ราคา
+PriceCurrency=Price (currency)
 UnitPrice=ราคาต่อหน่วย
 UnitPriceHT=ราคาต่อหน่วย (สุทธิ)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=ราคาต่อหน่วย
 PriceU=UP
 PriceUHT=UP (สุทธิ)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=UP (รวมภาษี).
 Amount=จำนวน
 AmountInvoice=จำนวนใบแจ้งหนี้
+AmountInvoiced=Amount invoiced
 AmountPayment=จำนวนเงินที่ชำระ
 AmountHTShort=จำนวนเงิน (สุทธิ)
 AmountTTCShort=จํานวนเงิน (รวมภาษี).
@@ -353,6 +359,7 @@ AmountLT2ES=จำนวน IRPF
 AmountTotal=จำนวนเงินรวม
 AmountAverage=จำนวนเงินเฉลี่ย
 PriceQtyMinHT=ปริมาณราคาต่ำสุด (สุทธิจากภาษี)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=ร้อยละ
 Total=ทั้งหมด
 SubTotal=ไม่ทั้งหมด
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=อัตราภาษี
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=เฉลี่ย
 Sum=รวม
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=เสร็จสิ้น
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=สำหรับรายชื่อของบุคคลที่สามนี้
 ContactsAddressesForCompany=รายชื่อ / ที่อยู่สำหรับบุคคลที่สามนี้
 AddressesForCompany=สำหรับที่อยู่ของบุคคลที่สามนี้
@@ -427,6 +437,9 @@ ActionsOnCompany=เหตุการณ์ที่เกิดขึ้นเ
 ActionsOnMember=เหตุการณ์ที่เกิดขึ้นเกี่ยวกับสมาชิกในนี้
 ActionsOnProduct=Events about this product
 NActionsLate=% s ปลาย
+ToDo=ที่จะทำ
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=ขอบันทึกไว้แล้ว
 Filter=กรอง
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=<b>คำเตือนคุณอยู่ใ
 CoreErrorTitle=ผิดพลาดของระบบ
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=เครดิตการ์ด
+ValidatePayment=ตรวจสอบการชำระเงิน
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=<b>เขตข้อมูลที่มี% s</b> มีผลบังคับใช้
 FieldsWithIsForPublic=<b>เขตข้อมูลที่มี% s</b> จะปรากฏอยู่ในรายชื่อของประชาชนสมาชิก ถ้าคุณไม่อยากให้เรื่องนี้, ตรวจสอบการปิดกล่อง "สาธารณะ"
 AccordingToGeoIPDatabase=(ตาม GeoIP แปลง)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=แบ่งประเภทเรียกเก็บเงิน
+ClassifyUnbilled=Classify unbilled
 Progress=ความคืบหน้า
-ClickHere=คลิกที่นี่
 FrontOffice=Front office
 BackOffice=สำนักงานกลับ
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=โครงการ
 Projects=โครงการ
 Rights=สิทธิ์
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=วันจันทร์
 Tuesday=วันอังคาร
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=บุคคลที่สาม
 SearchIntoContacts=รายชื่อผู้ติดต่อ
 SearchIntoMembers=สมาชิก
 SearchIntoUsers=ผู้ใช้
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=ทุกคน
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=ได้รับมอบหมายให้
diff --git a/htdocs/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang
index d436bad8ac6..f1939d829d6 100644
--- a/htdocs/langs/th_TH/margins.lang
+++ b/htdocs/langs/th_TH/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=อัตราจะต้องเป็นค่าตั
 markRateShouldBeLesserThan100=อัตรามาร์คควรจะต่ำกว่า 100
 ShowMarginInfos=แสดงขอบข่าวสาร
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index 5427d6c2a86..07154b23248 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=ตรวจสอบรายชื่อของ
 ErrorThisMemberIsNotPublic=สมาชิกคนนี้ไม่ได้เป็นของประชาชน
 ErrorMemberIsAlreadyLinkedToThisThirdParty=สมาชิกอีกคนหนึ่ง <b>(ชื่อ:% s, เข้าสู่ระบบ:% s) จะเชื่อมโยงกับบุคคลที่สาม%</b> s ลบลิงค์นี้ก่อนเพราะบุคคลที่สามไม่สามารถเชื่อมโยงไปยังสมาชิกเท่านั้น (และในทางกลับกัน)
 ErrorUserPermissionAllowsToLinksToItselfOnly=ด้วยเหตุผลด้านความปลอดภัยคุณต้องได้รับสิทธิ์ในการแก้ไขผู้ใช้ทุกคนที่จะสามารถที่จะเชื่อมโยงสมาชิกให้กับผู้ใช้ที่ไม่ได้เป็นของคุณ
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=เนื้อหาของบัตรสมาชิกของคุณ
 SetLinkToUser=เชื่อมโยงไปยังผู้ใช้ Dolibarr
 SetLinkToThirdParty=เชื่อมโยงไปยัง Dolibarr ของบุคคลที่สาม
 MembersCards=สมาชิกบัตรธุรกิจ
@@ -108,17 +106,33 @@ PublicMemberCard=สมาชิกบัตรประชาชน
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=สร้างการสมัครสมาชิก
 ShowSubscription=แสดงการสมัครสมาชิก
-SendAnEMailToMember=ส่งอีเมลข้อมูลให้กับสมาชิก
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=เนื้อหาของบัตรสมาชิกของคุณ
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=เรื่องของ e-mail ที่ได้รับในกรณีที่มีการจารึกอัตโนมัติของผู้เข้าพัก
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail ที่ได้รับในกรณีที่มีการจารึกอัตโนมัติของผู้เข้าพัก
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=เรื่องอีเมลของสมาชิก autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=อีเมลของสมาชิก autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=เรื่องอีเมลสำหรับการตรวจสอบสมาชิก
-DescADHERENT_MAIL_VALID=อีเมลสำหรับการตรวจสอบสมาชิก
-DescADHERENT_MAIL_COTIS_SUBJECT=เรื่องอีเมลสำหรับการสมัครสมาชิก
-DescADHERENT_MAIL_COTIS=อีเมลสำหรับการสมัครสมาชิก
-DescADHERENT_MAIL_RESIL_SUBJECT=เรื่องอีเมลของสมาชิก resiliation
-DescADHERENT_MAIL_RESIL=อีเมลของสมาชิก resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=ส่งอีเมลสำหรับอีเมลอัตโนมัติ
 DescADHERENT_ETIQUETTE_TYPE=รูปแบบของหน้าป้าย
 DescADHERENT_ETIQUETTE_TEXT=ข้อความที่พิมพ์อยู่บนแผ่นสมาชิก
@@ -177,3 +191,8 @@ NoVatOnSubscription=ไม่มี TVA สำหรับการสมัค
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ผลิตภัณฑ์ที่ใช้สำหรับสายการสมัครสมาชิกเข้าไปในใบแจ้งหนี้:% s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 74a5be2447e..d8b61b8c455 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=ข้อความในหน้ากลับมาตรวจสอบการชำระเงิน
 MessageKO=ข้อความในหน้าผลตอบแทนการชำระเงินยกเลิก
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=วัตถุที่เชื่อมโยง
 NbOfActiveNotifications=จำนวนการแจ้งเตือน (nb ของอีเมลผู้รับ)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=เริ่มอัพโหลด
 CancelUpload=ยกเลิกการอัปโหลด
 FileIsTooBig=ไฟล์ที่มีขนาดใหญ่เกินไป
 PleaseBePatient=กรุณาเป็นผู้ป่วย ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=ขอให้เปลี่ยนรหัสผ่านของคุณ Dolibarr ได้รับการตอบรับ
 NewKeyIs=นี่คือกุญแจใหม่ของคุณเข้าสู่ระบบ
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=ชื่อเรื่อง
 WEBSITE_DESCRIPTION=ลักษณะ
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/th_TH/paypal.lang b/htdocs/langs/th_TH/paypal.lang
index fc22aa087ea..c24e0e83bb8 100644
--- a/htdocs/langs/th_TH/paypal.lang
+++ b/htdocs/langs/th_TH/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal เท่านั้น
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=<b>นี่คือรหัสของรายการ:% s</b>
 PAYPAL_ADD_PAYMENT_URL=เพิ่ม URL ของการชำระเงิน Paypal เมื่อคุณส่งเอกสารทางไปรษณีย์
-PredefinedMailContentLink=คุณสามารถคลิกที่ลิงค์ด้านล่างเพื่อความปลอดภัยในการชำระเงินของคุณ (PayPal) หากยังไม่ได้ทำมาแล้ว % s
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 84bcfc60a70..c6a5a6cb2e9 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=สินค้าหรือบริการ
 ProductsAndServices=สินค้าและบริการ
 ProductsOrServices=ผลิตภัณฑ์หรือบริการ
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=คุณแน่ใจหรือว่าต้อ
 ProductSpecial=พิเศษ
 QtyMin=จำนวนขั้นต่ำ
 PriceQtyMin=ราคาสำหรับนาทีนี้ จำนวน (w / o ส่วนลด)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=ภาษีมูลค่าเพิ่ม Rate (สำหรับผู้จัดจำหน่าย / ผลิตภัณฑ์นี้)
 DiscountQtyMin=เริ่มต้นส่วนลดสำหรับจำนวน
 NoPriceDefinedForThisSupplier=ไม่มีราคา / จำนวนที่กำหนดไว้สำหรับผู้จัดหาสินค้านี้ / ผลิตภัณฑ์
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 79aba76ab18..54311c11568 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=รายชื่อโครงการ
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=ทุกโครงการ
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=มุมมองนี้จะนำเสนอโครงการทั้งหมดที่คุณได้รับอนุญาตให้อ่าน
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=มุมมองนี้นำเสนอทุกโครงการและงานที่คุณได้รับอนุญาตในการอ่าน
 ProjectsDesc=มุมมองนี้นำเสนอทุกโครงการ (สิทธิ์ผู้ใช้ของคุณอนุญาตให้คุณสามารถดูทุกอย่าง)
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=เฉพาะโครงการที่เปิดจะมองเห็นได้ (โครงการในร่างหรือสถานะปิดจะมองไม่เห็น)
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=มุมมองนี้นำเสนอทุกโครงการและงานที่คุณได้รับอนุญาตในการอ่าน
@@ -55,6 +55,7 @@ TasksOnOpenedProject=งานเกี่ยวกับโครงการ
 WorkloadNotDefined=ภาระงานที่ไม่ได้กำหนดไว้
 NewTimeSpent=เวลาที่ใช้
 MyTimeSpent=เวลาของการใช้จ่าย
+BillTime=Bill the time spent
 Tasks=งาน
 Task=งาน
 TaskDateStart=วันที่เริ่มต้นงาน
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=รายชื่อของการบริ
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=รายการของเหตุการณ์ที่เกี่ยวข้องกับโครงการ
 ListTaskTimeUserProject=รายชื่อของเวลาที่ใช้ในงานของโครงการ
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=กิจกรรมในโครงการในวันนี้
 ActivityOnProjectYesterday=กิจกรรมในโครงการเมื่อวานนี้
 ActivityOnProjectThisWeek=กิจกรรมในโครงการสัปดาห์นี้
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=กิจกรรมในโครงการใ
 ActivityOnProjectThisYear=กิจกรรมในโครงการในปีนี้
 ChildOfProjectTask=เด็กของโครงการ / งาน
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=ไม่ได้เป็นเจ้าของโครงการนี​​้ส่วนตัว
 AffectedTo=จัดสรรให้กับ
 CantRemoveProject=โครงการนี​​้ไม่สามารถลบออกได้ในขณะที่มันถูกอ้างอิงโดยวัตถุอื่น ๆ บางคน (ใบแจ้งหนี้การสั่งซื้อหรืออื่น ๆ ) ดูแท็บ referers
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=เป็นไปไม่ได้ที่จะเปลี่ยนวันงานตามโครงการใหม่วันที่เริ่มต้น
 ProjectsAndTasksLines=โครงการและงาน
 ProjectCreatedInDolibarr=โครงการสร้าง% s
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=งาน% s สร้าง
 TaskModifiedInDolibarr=งาน% s การแก้ไข
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/th_TH/propal.lang b/htdocs/langs/th_TH/propal.lang
index 40eed3226e4..fed3ca797ae 100644
--- a/htdocs/langs/th_TH/propal.lang
+++ b/htdocs/langs/th_TH/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=ลงนาม (ความต้องการของ
 PropalStatusNotSigned=ไม่ได้ลงชื่อ (ปิด)
 PropalStatusBilled=การเรียกเก็บเงิน
 PropalStatusDraftShort=ร่าง
+PropalStatusValidatedShort=ผ่านการตรวจสอบ
 PropalStatusClosedShort=ปิด
 PropalStatusSignedShort=ลงนาม
 PropalStatusNotSignedShort=ไม่ได้ลงนาม
diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
index e7b14afaedd..0e8786f7eb8 100644
--- a/htdocs/langs/th_TH/salaries.lang
+++ b/htdocs/langs/th_TH/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=ค่านี้อาจจะใช้ในการคำ
 TJMDescription=ค่านี้เป็นในปัจจุบันเป็นข้อมูลเท่านั้นและไม่ได้ใช้ในการคำนวณใด ๆ
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 3bcac9056ba..a83afa1606c 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=แก้ไขคลังสินค้า
 MenuNewWarehouse=คลังสินค้าใหม่
 WarehouseSource=คลังสินค้าที่มา
 WarehouseSourceNotDefined=ไม่มีคลังสินค้าที่กำหนดไว้
+AddWarehouse=Create warehouse
 AddOne=เพิ่มอีกหนึ่ง
+DefaultWarehouse=Default warehouse
 WarehouseTarget=คลังสินค้าเป้าหมาย
 ValidateSending=ลบส่ง
 CancelSending=ยกเลิกการส่ง
@@ -22,6 +24,7 @@ Movements=การเคลื่อนไหว
 ErrorWarehouseRefRequired=ชื่ออ้างอิงคลังสินค้าจะต้อง
 ListOfWarehouses=รายชื่อของคลังสินค้า
 ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/th_TH/stripe.lang b/htdocs/langs/th_TH/stripe.lang
index a51c3a2867a..babeb47abef 100644
--- a/htdocs/langs/th_TH/stripe.lang
+++ b/htdocs/langs/th_TH/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang
index 16ef973d7a2..743f7725c21 100644
--- a/htdocs/langs/th_TH/trips.lang
+++ b/htdocs/langs/th_TH/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=แสดงรายงานค่าใช้จ่าย
 NewTrip=รายงานค่าใช้จ่ายใหม่
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=จำนวนเงินหรือกิโลเมตร
 DeleteTrip=ลบรายงานค่าใช้จ่าย
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=รอการอนุมัติ
 ExpensesArea=ค่าใช้จ่ายในพื้นที่รายงาน
 ClassifyRefunded=จำแนก 'คืนเงิน'
 ExpenseReportWaitingForApproval=รายงานค่าใช้จ่ายใหม่ได้รับการส่งเพื่อขออนุมัติ
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=รายงานค่าใช้จ่าย Id
 AnyOtherInThisListCanValidate=คนที่จะแจ้งให้สำหรับการตรวจสอบ
 TripSociete=ข้อมูล บริษัท
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=คุณได้ประกาศรายงานค่าใช้จ่ายอื่นเข้ามาในช่วงวันที่ที่คล้ายกัน
 AucuneLigne=มีรายงานค่าใช้จ่ายไม่มีการประกาศความเป็นส่วนตัว
 
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 437bb6d1970..f1499a52500 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -69,8 +69,8 @@ InternalUser=ผู้ใช้งานภายใน
 ExportDataset_user_1=ผู้ใช้ Dolibarr และคุณสมบัติ
 DomainUser=โดเมนของผู้ใช้% s
 Reactivate=ฟื้นฟู
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=ได้รับอนุญาตเพราะรับมาจากหนึ่งในกลุ่มของผู้ใช้
 Inherited=ที่สืบทอด
 UserWillBeInternalUser=ผู้ใช้ที่สร้างจะเป็นผู้ใช้งานภายใน (เพราะไม่เชื่อมโยงกับบุคคลที่สามโดยเฉพาะ)
@@ -93,6 +93,7 @@ NameToCreate=ชื่อของบุคคลที่สามในกา
 YourRole=บทบาทของคุณ
 YourQuotaOfUsersIsReached=โควต้าของคุณของผู้ใช้ที่ใช้งานถึง!
 NbOfUsers=nb ของผู้ใช้
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=เพียง superadmin สามารถปรับลด superadmin
 HierarchicalResponsible=ผู้ดูแล
 HierarchicView=มุมมองลำดับชั้น
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index e3abd9fef71..b4f831cca59 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=อ่าน
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 0f0ef6753b7..a6a19e78f95 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=ในการประมวลผล
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=รหัสธนาคารของบุคคลที่สาม
-NoInvoiceCouldBeWithdrawed=ใบแจ้งหนี้ไม่มี withdrawed กับความสำเร็จ ตรวจสอบใบแจ้งหนี้ที่อยู่ใน บริษัท ที่มีบ้านที่ถูกต้อง
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=จำแนกเครดิต
 ClassCreditedConfirm=คุณแน่ใจว่าคุณต้องการที่จะจำแนกได้รับการถอนนี้เป็นเครดิตในบัญชีธนาคารของคุณ?
 TransData=วันที่ส่ง
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=สถิติตามสถานะของสาย
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index b060670cf7b..5d979fe8d29 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -17,7 +17,7 @@ DefaultForProduct=Ürün için varsayılan
 CantSuggest=Öneri yok
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Hesap uzmanı modülü yapılandırması
-Journalization=Journalization
+Journalization=Günlükleme
 Journaux=Günlükler
 JournalFinancial=Mali günlükler
 BackToChartofaccounts=Hesap planı cirosu
@@ -25,12 +25,12 @@ Chartofaccounts=Hesap planı
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Fatura etiketi
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Diğer Bilgiler
-DeleteCptCategory=Remove accounting account from group
+DeleteCptCategory=Muhasebe hesabını gruptan kaldırın
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
-JournalizationInLedgerStatus=Status of journalization
+JournalizationInLedgerStatus=Günlükleme durumu
 AlreadyInGeneralLedger=Already journalized in ledgers
 NotYetInGeneralLedger=Not yet journalized in ledgers
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
@@ -43,33 +43,33 @@ MainAccountForSuppliersNotDefined=Main accounting account for suppliers not defi
 MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
 MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
 
-AccountancyArea=Accountancy area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=Muhasebe alanı
+AccountancyAreaDescIntro=Muhasebe modülünün kullanımı birkaç adımda tamamlanır:
+AccountancyAreaDescActionOnce=Aşağıdaki eylemler genellikle yalnızca bir kere veya yılda bir kez gerçekleştirilir...
+AccountancyAreaDescActionOnceBis=Günlükleme yaparken (Günlüklere ve Genel deftere kayıt girme) size doğru varsayılan muhasebe hesabı önererek zamandan tasarruf etmenizi sağlamak için sonraki adımlar tamamlanmalıdır.
+AccountancyAreaDescActionFreq=Aşağıdaki eylemler çok büyük şirketler için genellikle her ay, her hafta veya her gün gerçekleştirilir...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
-AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+AccountancyAreaDescJournalSetup=ADIM %s: "%s" menüsünü kullanarak günlük listenizin içeriğini oluşturun veya kontrol edin.
+AccountancyAreaDescChartModel=ADIM %s: "%s" menüsünü kullanarak hesap planı için bir model oluşturun.
+AccountancyAreaDescChart=ADIM %s: "%s" menüsünü kullanarak hesap planınızın içeriğini oluşturun veya kontrol edin.
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescVat=ADIM %s: "%s" menüsünü kullanarak her bir KDV Oranı için muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescExpenseReport=ADIM %s: "%s" menüsünü kullanarak her bir harcama raporu türü için varsayılan muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescSal=ADIM %s: "%s" menüsünü kullanarak maaş ödemeleri için varsayılan muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescContrib=ADIM %s: "%s" menüsünü kullanarak özel harcamalar (çeşitli vergiler) için varsayılan muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescDonation=ADIM %s: "%s" menüsünü kullanarak bağış için varsayılan muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescMisc=ADIM %s: "%s" menüsünü kullanarak çeşitli işlemler için zorunlu olan varsayılan hesabı ve varsayılan muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescLoan=ADIM %s: "%s" menüsünü kullanarak krediler için varsayılan muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescBank=ADIM %s: "%s" menüsünü kullanarak muhasebe hesaplarını ve her banka ve finansal hesap için günlük kodunu tanımlayın.
+AccountancyAreaDescProd=ADIM %s: "%s" menüsünü kullanarak ürünler/hizmetler için muhasebe hesaplarını tanımlayın.
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=ADIM %s: Mevcut %s satırları ve muhasebe hesabı arasındaki bağlamanın tamamlanıp tamamlanmadığını kontrol edin, böylece defterdeki işlemler günlüğe tek tıklamayla uygulama tarafından kaydedilebilecektir. Eksik bağları tamamlayın. Bunun için "%s" menü girişini kullanın.
+AccountancyAreaDescWriteRecords=ADIM %s: İşlemleri Defter'e yazın. Bunun için <strong>%s</strong> menüsüne gidin ve <strong>%s</strong> butonuna tıklayın.
+AccountancyAreaDescAnalyze=ADIM %s: İşlemler ekleyin ya da mevcut işlemleri düzenleyin ve raporlar üretin ve dışa aktarın.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=ADIM %s: Dönemi kapatın, böylece ileride bir değişiklik yapamayız.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Kurulumda zorunlu bir adım tamamlanmadı (muhasebe kodu günlüğü tüm banka hesapları için tanımlı değil)
 Selectchartofaccounts=Etkin hesap planı seç
 ChangeAndLoad=Change and load
 Addanaccount=Muhasebe hesabı ekle
@@ -79,18 +79,18 @@ SubledgerAccount=Subledger Account
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Önerilen muhasebe hesabı
-MenuDefaultAccounts=Default accounts
+MenuDefaultAccounts=Varsayılan hesaplar
 MenuBankAccounts=Banka hesapları
-MenuVatAccounts=Vat accounts
+MenuVatAccounts=KDV hesapları
 MenuTaxAccounts=Vergi hesabı
 MenuExpenseReportAccounts=Gider raporu hesapları
 MenuLoanAccounts=Kredi hesapları
-MenuProductsAccounts=Product accounts
-ProductsBinding=Products accounts
+MenuProductsAccounts=Ürün hesapları
+ProductsBinding=Ürün hesapları
 Ventilation=Hesaba bağlama
 CustomersVentilation=Müşteri faturası bağlama
 SuppliersVentilation=Tedarikçi faturası bağlama
-ExpenseReportsVentilation=Expense report binding
+ExpenseReportsVentilation=Gider raporu bağlama
 CreateMvts=Yeni işlem oluştur
 UpdateMvts=İşlemi değiştir
 ValidTransaction=Validate transaction
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılan hizmetler için varsayılan muhasebe ko
 Doctype=Belge türü
 Docdate=Tarih
 Docref=Referans
-Code_tiers=Üçüncü taraf
 LabelAccount=Hesap etiketi
 LabelOperation=Label operation
 Sens=Sens (borsa haberleri yayınlama günlüğü)
@@ -169,18 +168,17 @@ DelYear=Silinecek yıl
 DelJournal=Silinecek günlük
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Büyük defter kaydını sil
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Gider raporları günlüğü
 DescFinanceJournal=Banka hesabından yapılan tüm ödeme türlerini içeren finans günlüğü
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Müşteri faturası ödemesi
-ThirdPartyAccount=Üçüncü taraf hesabı
+ThirdPartyAccount=Third party account
 NewAccountingMvt=Yeni İşlem
 NumMvts=İşlem hareket sayısı
 ListeMvts=Hareketler Listesi
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesab
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Toplu kategori uygula
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Niteliği
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Satışlar
 AccountingJournalType3=Alışlar
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Envanter
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -269,7 +271,7 @@ OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
+PredefinedGroups=Önceden tanımlanmış gruplar
 WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
@@ -280,13 +282,15 @@ Calculated=Hesaplanmış
 Formula=Formül
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+SomeMandatoryStepsOfSetupWereNotDone=Kurulumun bazı zorunlu adımları tamamlanmadı, lütfen onları tamamlayın.
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Ayarlanan dışaaktarım biçimi bu sayfada desteklenmiyor
 BookeppingLineAlreayExists=Satırlar zaten muhasebede bulunmaktadır
 NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
+Binded=Bağlanmış satırlar
+ToBind=Bağlanacak satırlar
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 3f1e7867212..d9ed8870052 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Dernek
 Version=Sürüm
-Publisher=Publisher
+Publisher=Yayımcı
 VersionProgram=Program sürümü
 VersionLastInstall=İlk kurulum sürümü
 VersionLastUpgrade=Son yükseltme sürümü
@@ -206,7 +206,7 @@ CompatibleUpTo=%ssürümü ile uyumlu
 NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
-Updated=Updated
+Updated=Güncellendi
 Nouveauté=Novelty
 AchatTelechargement=Satın Al / Yükle
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
@@ -262,17 +262,17 @@ NoticePeriod=Bildirim dönemi
 NewByMonth=New by month
 Emails=E-postalar
 EMailsSetup=E-posta kurulumları
-EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
+EMailsDesc=Bu sayfa, e-mail gönderimleri için PHP parametrelerinizin üzerine yazmanıza izin verir. Unix/Linux İşletim Sistemlerindeki çoğu durumda, PHP kurulumunuz doğrudur ve bu parametreler işe yaramaz.
 EmailSenderProfiles=Emails sender profiles
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Sunucu (php.ini de varsayılan: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Php.ini SMTP / SMTPS Host <b>(Varsayılan:% s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Unix gibi sistemlerde PHP ye tanıtılmamıştır)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Sunucu (Unix gibi sistemlerde PHP ye tanıtılmamıştır)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
+MAIN_MAIL_EMAIL_FROM=Otomatik e-mailler için gönderen E-posta adresi (php.ini dosyasında varsayılan: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Gönderilen bütün epostaların bir gizli karbon-kopyasını sistemli olarak gönder
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_FORCE_SENDTO=Tüm e-mailleri şu adreslere gönder (gerçek alıcıların yerine, test amaçlı)
 MAIN_MAIL_SENDMODE=E-posta göndermek için kullanılan yöntem
 MAIN_MAIL_SMTPS_ID=Doğrulama gerektirdiğinde SMTP Kimliği
 MAIN_MAIL_SMTPS_PW=Doğrulama gerektirdiğinde SMTP Parolası
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Hata, {yy} ya da {yyyy} dizisi maske olarak tanım
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Hata, eğer {yy}{mm} ya da {yyyy}{mm} dizisi maske olarak tanımlanmamışsa @ seçeneği kullanılamaz.
 UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
 UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
-SeeWikiForAllTeam=Tüm oyuncular ve kuruluşlarının tam listesi için wiki sayfalarına bir göz atın
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
 DisableLinkToHelpCenter=oturum açma sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
 DisableLinkToHelp=Çevrimiçi yardım bağlantısını gizle "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Buna göre tanımlanan temel referans değerli fiyatları
 MassConvert=Toplu dönüştürmeyi başlat
 String=Dizi
 TextLong=Uzun metin
+HtmlText=Html text
 Int=Tam sayı
 Float=Kayan
 DateAndTime=Tarih ve saat
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Tablodan onay kutuları
 ExtrafieldLink=Bir nesneye bağlantı
 ComputedFormula=Hesaplanmış alan
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Bazı ülkelerde her fatura satırına 2 ya da 3 tane vergi uygulanır. Böyle bir durum varsa, ikinci ve üçüncü vergi türünü ve oranını seçin. Olası türler:<br>1 : ürün ve hizmetlere uygulanan kdv siz yerel vergi (yerel vergi tutar üzerinden kdv siz olarak hesaplanır))&lt;br>2 : ürün ve hizmetlere kdv dahil olarak hesaplanan yerel vergi (yerel vergi tutar + ana vergi üzerinden hesaplanır)<br>3 : ürünlere uygulanan kdv siz yerel vergi (yerel vergi tutar üzerinden kdv hariç hesaplanır)<br>4 : yerel vergi ürünlerde kdv dahil uygulanır (kdv tutar + ana kdv üzerinden hesaplanır)<br>5 : yerel vergi ürünlerde kdv siz olarak uygulanır (yerel vergi tutar üzerinden kdv siz olarak hesaplanır)<br>6 : yerel vergi hizmetlere kdv dahil uygulanır (yeel vergi tutar + vergi üzerinden hesaplanır)
 SMS=SMS
 LinkToTestClickToDial=Kullanıcı <strong>%s</strong> için ClickTodial url denemesi yapmak üzere gösterilecek bağlantıyı aramak için bir telefon numarası gir
@@ -447,9 +448,10 @@ EnableAndSetupModuleCron=Eğer bu yinelenen faturanın otomatik olarak oluşturu
 ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
-Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+Use3StepsApproval=Varsayılan olarak, Satın Alma Siparişlerinin 2 farklı kullanıcı tarafından oluşturulması ve onaylanması gerekir (bir adım/kullanıcı oluşturacak ve bir adım/kullanıcı onaylayacak. Kullanıcının hem oluşturma hem de onaylama izni varsa, bir adım/kullanıcı yeterli olacaktır). Miktar belirli bir değerin üzerindeyse bu seçenekle üçüncü bir adım/kullanıcı onayı vermeyi isteyebilirsiniz (böylece 3 adım zorunlu olacaktır: 1=doğrulama, 2=ilk onay ve 3=miktar yeterli ise ikinci onay).<br>Tek onay (2 adım) yeterli ise bunu boş olarak ayarlayın, ikinci bir onay (3 adım) her zaman gerekiyorsa çok düşük bir değere ayarlayın (0.1).
 UseDoubleApproval=Tutar (vergi öncesi) bu tutardan yüksekse 3 aşamalı bir onaylama kullanın...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Açıklamayı görmek için tıkla
 DependsOn=This module need the module(s)
 RequiredBy=Bu modül, modül (ler) için zorunludur
@@ -466,8 +468,9 @@ ProductDocumentTemplates=Ürün belgesi oluşturmak için belge şablonları
 FreeLegalTextOnExpenseReports=Gider raporlarında ücretsiz yasal metni
 WatermarkOnDraftExpenseReports=Taslak gider raporlarındaki filigran
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
+FilesAttachedToEmail=Dosya ekle
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Kullanıcılar & gruplar
 Module0Desc=Kullanıcı / Çalışan ve Grup Yönetimi
@@ -552,7 +555,7 @@ Module520Desc=Borçların yönetimi
 Module600Name=İş etkinliklerine ilişkin bildirimler
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
-Module610Name=Product Variants
+Module610Name=Ürün Değişkenleri
 Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
@@ -619,6 +622,8 @@ Module59000Name=Kar Oranları
 Module59000Desc=Kar Oranı yönetimi modülü
 Module60000Name=Komisyonlar
 Module60000Desc=Komisyon yönetimi modülü
+Module62000Name=Uluslararası ticari terimleri
+Module62000Desc=Uluslararası ticari terimleri yönetmek için özellik ekle
 Module63000Name=Kaynaklar
 Module63000Desc=Kaynakları yönetin (yazıcılar, arabalar, odalar, ...) böylece etkinliklerde paylaşabilirsiniz
 Permission11=Müşteri faturalarını oku
@@ -833,11 +838,11 @@ Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalış
 Permission1321=Müşteri faturalarını, özniteliklerin ve ödemelerini dışaaktar
 Permission1322=Reopen a paid bill
 Permission1421=Müşteri siparişleri ve özniteliklerini dışaaktar
-Permission20001=İzin isteklerini oku (senin ve astlarının)
-Permission20002=Kendi izin isteklerini oluştur/düzenle
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=İzin isteği sil
-Permission20004=Bütün izin isteklerini oku (kullanıcı astınız olmasa bile)
-Permission20005=Herkes için izin isteği oluştur/düzenle
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Yönetici izin istekleri (ayarla ve bakiye güncelle)
 Permission23001=Planlı iş oku
 Permission23002=Planlı iş oluştur/güncelle
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Damga vergisi tutarı
 DictionaryPaymentConditions=Ödeme koşulları
 DictionaryPaymentModes=Ödeme türleri
 DictionaryTypeContact=Kişi/Adres türleri
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Kağıt biçimleri
 DictionaryFormatCards=Kart formatları
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=KDV Yönetimi
 VATIsUsedDesc=Adaylar, faturalar, siparişler, v.b oluşturulurrken KDV oranı varsayılan olarak etkin standart kuralı izler:<br>Eğer satıcı KDV ne tabii değilse varsayılan KDV 0 olur, kural sonu.<br>Eğer (satıcı ülkesi=alıcı ülkesi)yse, varsayılan KDV satıcı ülkesindeki ürünün KDV dir. Kural sonu.<br>Eğer satıcı ve alıcı Avrupa Birliğindeyse ve mallar taşıma ürünleriyse (araba, gemi, uçak) varsayılan KDV 0 dır (KDV alıcı tarafından kendi ülkesindeki gümrüğe ödenir, satıcıya değil). Kural sonu.<br>Eğer satıcı ve alıcı Avrupa Birliğinde ise ve alıcı bir firma değilse, varsayılan KDV satılan ürünün KDV dir. Kural sonu.<br>Eğer satıcı ve alıcı Avrupa Birliğindeyse ve alıcı bir firmaysa varsayılan KDV 0 dır. Kural sonu.<br>Yoksa önerilen KDV=0 dır. Kural sonu.
 VATIsNotUsedDesc=Dernekler, şahıslar ve küçük firmalar durumunda varsayılan olarak kullanılması önerilen KDV 0 dır.
-VATIsUsedExampleFR=Fransa’da, şirketler veya kuruluşlar, gerçek usulde vergi sistemine tabiidir (Basitleştirilmiş gerçek ya da normal gerçek). KDV nin beyanı usülüne dayalı bir sistemdir.
-VATIsNotUsedExampleFR=Fransa’da, KDV ne tabii olmayan dernekler, şirketler, kuruluşlar veya serbest meslek sahipleri küçük işletme vergi sistemini seçmiş demektir ve herhangi bir KDV beyanı olmadan KDV ödeme hakkına sahiptir. Bu seçimle faturalarında “KDV uygulanmaz- art-293B of CGI” ibaresini belirtmelidirler.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Oran
 LocalTax1IsNotUsed=İkinci vergiyi kullanma
@@ -977,7 +983,7 @@ Host=Sunucu
 DriverType=Sürücü türü
 SummarySystem=Sistem bilgileri özeti
 SummaryConst=Tüm Dolibarr kurulum parametreleri listesi
-MenuCompanySetup=Şirket/Kuruluş
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standart menü yöneticisi
 DefaultMenuSmartphoneManager=Akıllı telefon (Smartphone) menü yöneticisi
 Skin=Dış görünüm teması
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Kullanılan varsayılan dil (dil kodu)
 EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir
 EnableShowLogo=Logoyu sol menüde göster
-CompanyInfo=Şirket/Kuruluş bilgisi
-CompanyIds=Şirket/Kuruluş kimlikleri
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Adı
 CompanyAddress=Adresi
 CompanyZip=Posta Kodu
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Kurulum parametreleri sadece <b>yönetici olan kullanıcılar</
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
 SystemAreaForAdminOnly=Bu alan yalnız yönetici kullanıcılar için kullanılabilir. Hiçbir Dolibarr izini bu sınırı azaltamaz.
 CompanyFundationDesc=Bu sayfada yönetmek istediğiniz şirket veya dernekle ilgili bilinen bütün bilgileri düzenleyebilirsiniz. (Bunun için sayfanın en altındaki “Değiştir” ya da "Kaydet" düğmesine basın).
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Dolibarr ile ilgili her bir parametreyi seçebilirsiniz
 AvailableModules=Mevcut uygulama/modüller
 ToActivateModule=Modülleri etkinleştirmek için, ayarlar alanına gidin (Giriş->Ayarlar>Modüller).
@@ -1098,10 +1105,10 @@ ShowProfIdInAddress=Belgelerde uzmanlık kimliğini adresleri ile birlikte göst
 ShowVATIntaInAddress=Belgelerde adresli KDV Intra numaralarını gizle
 TranslationUncomplete=Kısmi çeviri
 MAIN_DISABLE_METEO=Meteo görünümünü engelle
-MeteoStdMod=Standard mode
+MeteoStdMod=Standart mod
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
+MeteoPercentageModEnabled=Yüzde modu etkin
 MeteoUseMod=Click to use %s
 TestLoginToAPI=API  oturum açma denemesi
 ProxyDesc=Dolibarr’ın bazı özelliklerinin çalışması için internet erişimi olması gerekir. Bunun için burada parametreleri tanımlayın. Dolibarr sunucusu bir proxy sunucu arkasında ise, bu parametreler üzerinden Internet erişiminin nasıl olacağını Dolibarr’a söyler.
@@ -1441,6 +1448,9 @@ SyslogFilename=Dosya adı ve yolu
 YouCanUseDOL_DATA_ROOT=Dolibarr’daki “belgeler” dizinindeki bir log (günlük) dosyası için DOL_DATA_ROOT/dolibarr.log u kullanabilirsiniz. Bu dosyayı saklamak için farklı bir yol (path) kullanabilirsiniz.
 ErrorUnknownSyslogConstant=%s Değişmezi bilinen bir Syslog değişmezi değildir
 OnlyWindowsLOG_USER=Windows yalnızca LOG_USER'ı destekler
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Bağış modülü kurulumu
 DonationsReceiptModel=Bağış makbuzu şablonu
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Menü başlatılamadı
 ##### Tax #####
 TaxSetup=Vergiler, sosyal ya da mali vergiler ve kar payları modül ayarları
 OptionVatMode=KDV nedeniyle
-OptionVATDefault=Nakit temelli
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Tahakkuk temelli
 OptionVatDefaultDesc=KDV nedeniyle: <br> - malların tesliminde ( fatura tarihini kullanırız) <br>- hizmet ödemelerinde (borç)
 OptionVatDebitOptionDesc=KDV nedeniyle: <br> - malların tesliminde ( fatura tarihini kullanırız) <br> - hizmet faturalarında (borç)
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Seçilen seçeneğe göre KDV uygunluk süresi:
 OnDelivery=Teslimatta
 OnPayment=Ödemede
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Kullanılan fatura tarihi
 Buy=Satınal
 Sell=Sat
 InvoiceDateUsed=Kullanılan fatura tarihi
-YourCompanyDoesNotUseVAT=Şirketiniz KDV kullanmıyor olarak tanımlanmış (Giriş - Ayarlar - Firma/Dernek), bu nedenle için hiçbir KDV ayar seçeneği yoktur.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Muhasebe Kodu
 AccountancyCodeSell=Satış hesap. kodu
 AccountancyCodeBuy=Alış hesap. kodu
@@ -1718,6 +1730,7 @@ MailToSendContract=Bir sözleşme göndermek için
 MailToThirdparty=Üçüncü taraf sayfasından eposta göndermek için
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Liste görünümünde varsayılana göre göster
 YouUseLastStableVersion=En son kararlı sürümü kullanıyorsunuz
 TitleExampleForMajorRelease=Bu ana sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
@@ -1763,10 +1776,14 @@ WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s
 MAIN_PDF_MARGIN_LEFT=PDF'deki sol boşluk
 MAIN_PDF_MARGIN_RIGHT=PDF'deki sağ boşluk
 MAIN_PDF_MARGIN_TOP=PDF'deki üst boşluk
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=PDF'deki alt kenar boşluğu
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 8075d2b9bfe..272ea750778 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Doğrulanan üye %s
 MemberModifiedInDolibarr=Üye %sdeğiştirildi 
 MemberResiliatedInDolibarr=%s üyeliği bitirilmiştir
 MemberDeletedInDolibarr=Silinen üyelik %s
-MemberSubscriptionAddedInDolibarr=Abonelik eklenen üye %s
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Sevkiyat %s doğrulandı
 ShipmentClassifyClosedInDolibarr=%s sevkiyatı faturalandı olarak sınıflandırıldı
 ShipmentUnClassifyCloseddInDolibarr=%s sevkiyatı yeniden açıldı olarak sınıflandırıldı
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Süzgeç çıktısına ayrıca aşağıdaki parametreleri ekle
 AgendaUrlOptions3=<b>kullanıcı girişi=%s</b>,  bir <b>%s</b> kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir.
 AgendaUrlOptionsNotAdmin=Çıktıyı <b>%s</b> kullanıcısına ait olmayan etkinliklere sınırlamak için <b>logina=!%s</b>.
 AgendaUrlOptions4=Çıktıyı <b>%s</b> kullanıcısına (sahip ve diğerleri) atanmış etkinliklere sınırlamak için <b>logint=%s</b>.
-AgendaUrlOptionsProject=<b>proje=PROJECT_ID</b>, bu <b>PROJECT_ID</b> projesi ile ilişkilendirilmiş eylemlerin çıkışını çıkışını sınırlamak içindir.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster
 AgendaHideBirthdayEvents=Kişilerin doğum günlerini gizle
 Busy=Meşgul
@@ -109,7 +112,7 @@ ExportCal=Takvim dışaaktar
 ExtSites=Dış takvimleri içeaktar
 ExtSitesEnableThisTool=Gündemde dış takvimleri (genel ayarlarda tanımlanan) göster. Kullanıcılar tarafından tanımlanan dış takvimleri etkilemez.
 ExtSitesNbOfAgenda=Takvimlerin sayısı
-AgendaExtNb=Takvim sayısı %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=.ical dosyasına erişmek için URL
 ExtSiteNoLabel=Tanımlama yok
 VisibleTimeRange=Görünür zaman aralığı
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index d1775db3d61..baa5a2a0751 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Geri ödenen
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Tedarikçi ödemeleri
 ReceivedPayments=Alınan ödemeler
 ReceivedCustomersPayments=Müşterilerden alınan ödemeler
@@ -91,7 +92,7 @@ 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.<br> 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.<br>Girişinizi düzeltin, aksi durumda onaylayın.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Sınıflandırma ‘Ödendi’
 ClassifyPaidPartially=Sınıflandırma ‘Kısmen ödendi’
 ClassifyCanceled=’Terkedildi’ olarak sınıflandır
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Gelecekteki indirime dönüştür
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Müşteriden alınan ödeme girin
 EnterPaymentDueToCustomer=Müşteri nedeniyle ödeme yap
 DisabledBecauseRemainderToPayIsZero=Ödenmemiş kalan sıfır olduğundan devre dışı
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Oluşturulan faturaların durumu
 BillStatusDraft=Taslak (doğrulanma gerektirir)
 BillStatusPaid=Ödenmiş
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Ödenmiş (son fatura için hazır)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Terkedilmiş
 BillStatusValidated=Doğrulanmış (ödenmesi gerekir)
 BillStatusStarted=Başlamış
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Bekleyen
 AmountExpected=İstenen tutar
 ExcessReceived=Fazla alınan
+ExcessPaid=Excess paid
 EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
 EscompteOfferedShort=İndirim
 SendBillRef=%s faturasının gönderilmesi
@@ -283,16 +286,20 @@ Deposit=Peşinat
 Deposits=Peşinatlar
 DiscountFromCreditNote=İade faturası %s ten indirim
 DiscountFromDeposit=%s faturasından peşin ödemeler
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Bu tür alacak fatura onaylanmadan önce faturada kullanılabilir
 CreditNoteDepositUse=Bu türde alacakları kullanmadan önce fatura doğrulanmış olmalıdır
 NewGlobalDiscount=Yeni mutlak indirim
 NewRelativeDiscount=Yeni göreceli indirim
+DiscountType=Discount type
 NoteReason=Not/Nedeni
 ReasonDiscount=Neden
 DiscountOfferedBy=Veren
 DiscountStillRemaining=Mevcut İndirimler
 DiscountAlreadyCounted=Harcanan indirimler
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Fatura adresi
 HelpEscompte=Bu indirim, vadesinden önce ödeme yapıldığından dolayı müşteriye verilir.
 HelpAbandonBadCustomer=Bu tutardan vazgeçilmiştir (müşteri kötü bir müşteri olarak kabul edildiğinden dolayı) ve istisnai bir kayıp olarak kabul edilir.
@@ -341,16 +348,16 @@ NextDateToExecution=Sonraki fatura oluşturulacak tarih
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Son oluşturma tarihi
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Oluturulan ençok fatura sayısı
-NbOfGenerationDone=Hali hazırda  oluşturulmuş fatura sayısı
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Ulaşılan ençok sayıdaki oluşturma
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Faturaları otomatik olarak doğrula
 GeneratedFromRecurringInvoice=Şablondan oluşturulan yinelenen fatura %s
 DateIsNotEnough=Henüz tarihe ulaşılmadı
 InvoiceGeneratedFromTemplate=Fatura %s yinelenen fatura şablonundan %s oluşturuldu
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+WarningInvoiceDateTooFarInFuture=Uyarı, fatura tarihi şu anki tarihten çok uzak
 ViewAvailableGlobalDiscounts=View available discounts
 # PaymentConditions
 Statut=Durumu
@@ -370,12 +377,12 @@ PaymentConditionShortPT_ORDER=Sipariş
 PaymentConditionPT_ORDER=Siparişle
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% peşin, 50%% teslimatta
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
+PaymentConditionShort10D=10 gün
+PaymentCondition10D=10 gün
 PaymentConditionShort10DENDMONTH=10 days of month-end
 PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
+PaymentConditionShort14D=14 gün
+PaymentCondition14D=14 gün
 PaymentConditionShort14DENDMONTH=14 days of month-end
 PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Sabit tutar
@@ -519,5 +526,9 @@ ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template inv
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
 BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
+DoNotGenerateDoc=Belge dosyası üretme
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 2e1682a1457..76b5b5684af 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -29,7 +29,7 @@ AliasNameShort=Rumuz
 Companies=Firmalar
 CountryIsInEEC=Ülke, Avrupa Ekonomik Topluluğu içindedir
 ThirdPartyName=Üçüncü parti adı
-ThirdPartyEmail=Third party email
+ThirdPartyEmail=Üçüncü parti e-postası
 ThirdParty=Üçüncü parti
 ThirdParties=Üçüncü partiler
 ThirdPartyProspects=Adaylar
@@ -43,7 +43,8 @@ Individual=Özel şahıs
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Ana firma
 Subsidiaries=Bağlı firmalar
-ReportByCustomers=Müşteriye göre rapor
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Orana göre rapor
 CivilityCode=Hitap kodu
 RegisteredOffice=Kayıtlı Ofisi
@@ -75,10 +76,12 @@ Town=İlçesi
 Web=Web
 Poste= Durumu
 DefaultLang=Varsayılan dili
-VATIsUsed=KDV kullanılır
-VATIsNotUsed=KDV kullanılmaz
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Adresi üçüncü parti adresiyle doldurun
 ThirdpartyNotCustomerNotSupplierSoNoRef=Üçüncü taraf ne müşteri ne de tedarikçidir, bağlanacak uygun bir öğe yok.
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Ödeme banka hesabı
 OverAllProposals=Teklifler
 OverAllOrders=Siparişler
@@ -239,7 +242,7 @@ ProfId3TN=Prof No 3 (Gümrük kodu)
 ProfId4TN=Prof No 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Vergi numarası
-VATIntraShort=Vergi numarası
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Sözdizimi geçerli
+VATReturn=VAT return
 ProspectCustomer=Aday/Müşteri
 Prospect=Aday
 CustomerCard=Müşteri Kartı
 Customer=Müşteri
 CustomerRelativeDiscount=Göreceli müşteri indirimi
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Göreceli indirim
 CustomerAbsoluteDiscountShort=Mutlak indirim
 CompanyHasRelativeDiscount=Bu müşterinin varsayılan bir <b>%s%%</b> indirimi var
 CompanyHasNoRelativeDiscount=Bu müşterinin varsayılan hiçbir göreceli indirimi yok
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=Bu müşterinin <b>%s</b>%s için mevcut indirimi var (kredi notları veya peşinat)
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Bu müşterinin hala <b>%s</b> %s için iade faturaları var
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Bu müşterinin hiçbir indirim alacağı yoktur
-CustomerAbsoluteDiscountAllUsers=Mutlak indirimler (tüm kullanıcılar tarafından verilen)
-CustomerAbsoluteDiscountMy=Mutlak indirimler (kendiniz tarafından verilen)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Hiçbiri
 Supplier=Tedarikçi
 AddContact=Kişi oluştur
@@ -377,9 +390,9 @@ NoDolibarrAccess=Dolibarr erişimi yok
 ExportDataset_company_1=Üçüncü partiler (Şirketler/Dernekler/Şahıslar) ve özellikleri
 ExportDataset_company_2=Kişiler ve özellikleri
 ImportDataset_company_1=Üçüncü partiler (Şirketler/Vakıflar/Fiziki şahıslar) ve özellikleri
-ImportDataset_company_2=Kişiler/Adresler (üçüncü taraflara ait ya da değil) ve öznitelikleri
-ImportDataset_company_3=Banka ayrıntıları
-ImportDataset_company_4=Üçüncü partiler/Satış temsilcileri (satış temsilcileri firma kullanıcılarını etkiler)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Fiyat düzeyi
 DeliveryAddress=Teslimat adresi
 AddAddress=Adres ekle
@@ -406,15 +419,16 @@ ProductsIntoElements=%s içindeki ürünler/hizmetler listesi
 CurrentOutstandingBill=Geçerli bekleyen fatura
 OutstandingBill=Ödenmemiş fatura için ençok tutar
 OutstandingBillReached=Ödenmemiş fatura için ulaşılan ençok tutar
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Sayı biçimini müşteri için %syymm-nnn, tedarikçi için %syymm-nnn gösterir, yy yıl, mm ay ve nnnn ise 0 olmayan bir dizidir
 LeopardNumRefModelDesc=Müşteri/tedarikçi kodu serbesttir. Bu kod herhangi bir zamanda değiştirilebilir.
 ManagingDirectors=Yönetici(lerin) adı (CEO, müdür, başkan...)
 MergeOriginThirdparty=Çifte üçüncü parti (silmek istediğiniz üçüncü parti)
 MergeThirdparties=Üçüncü partileri birleştir
 ConfirmMergeThirdparties=Bu üçüncü tarafı mevcut olanla birleştirmek istediğinize emin misiniz? Tüm bağlı nesneler (faturalar, siparişler, ...) mevcut üçüncü tarafa taşınacak, sonra üçüncü taraf silinecek.
-ThirdpartiesMergeSuccess=Üçüncü taraflar birleştirilmiştir
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Satış temsilcisinin kullanıcı adı
 SaleRepresentativeFirstname=Satış temsilcisinin adı
 SaleRepresentativeLastname=Satış temsilcisinin soyadı
-ErrorThirdpartiesMerge=Üçüncü taraf silinirken bir hata oluştu. Lütfen kayıtları inceleyin. Değişiklikler geri alındı.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=Yinelenen kod üzerinde yeni müşteri veya tedarikçi kodu önerildi
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index d2cc3625948..b5507c16f42 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Faturalama | Ödeme
 TaxModuleSetupToModifyRules=Hesaplama kurallarını değiştirmek için <a href="%s">Vergi modülü ayarları</a> na git
 TaxModuleSetupToModifyRulesLT=Hesaplama kurallarını değiştirmek için <a href="%s">Firma ayarları</a>na git
 OptionMode=Muhasebe seçeneği
@@ -31,7 +31,7 @@ Credit=Alacak
 Piece=Muhasebe Belg.
 AmountHTVATRealReceived=Net alınan
 AmountHTVATRealPaid=Net ödenen
-VATToPay=KDV satışlar
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Ödemeleri
 VATPayment=Satış vergisi ödemesi
 VATPayments=Satış vergisi ödemeleri
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=İade
 SocialContributionsPayments=Sosyal/mali vergi ödemeleri
 ShowVatPayment=KDV ödemesi göster
@@ -157,30 +158,34 @@ RulesResultDue=- Ödenmemiş faturaları, giderleri ve KDV ni, ödenmiş ya da 
 RulesResultInOut=- Faturalarda, giderlerde, KDV inde ve maaşlarda yapılan gerçek ödemeleri içerir. <br>- Faturaların, giderleri, KDV nin ve maaşların ödeme tarihleri baz alınır. Bağışlar için bağış tarihi.
 RulesCADue=- ödenmiş ya da ödenmemiş olsun müşterilere ait faturaları içerir. <br>- Bu faturaların doğrulama tarihi baz alınır.<br>
 RulesCAIn=- Müşterilerden alınan tüm geçerli fatura ödemelerini içerir.<br>- Bu faturaların ödenme tarihleri baz alınır<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Üçüncü parti IRPF Raporu
-LT1ReportByCustomersInInputOutputModeES=RE Üçüncü partiye göre rapor
-VATReport=KDV raporu
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=RE Üçüncü partiye göre rapor
+LT2ReportByCustomersES=Üçüncü parti IRPF Raporu
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Müşteriye göre alınan ve ödenen KDV raporu
-VATReportByCustomersInDueDebtMode=Müşteriye göre alınan ve ödenen KDV raporu
-VATReportByQuartersInInputOutputMode=Orana göre alınan ve ödenen KDV raporu
-LT1ReportByQuartersInInputOutputMode=RE orana göre rapor
-LT2ReportByQuartersInInputOutputMode=IRPF orana göre rapor
-VATReportByQuartersInDueDebtMode=Orana göre alınan ve ödenen KDV raporu
-LT1ReportByQuartersInDueDebtMode=RE Orana göre rapor
-LT2ReportByQuartersInDueDebtMode=IRPF Orana göre rapor
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=RE Orana göre rapor
+LT2ReportByQuartersES=IRPF Orana göre rapor
 SeeVATReportInInputOutputMode=Standart bir hesaplama için <b>%sKDV kapsamı%s</b> raporuna bak
 SeeVATReportInDueDebtMode=Akış seçenekli bir hesaplama için <b>%sKDV akışı%s</b> raporuna bak
 RulesVATInServices=- Hizmetler için, rapor ödeme tarihine dayalı olarak gerçekte alınan ya da verilen KDV düzenlemelerini içerir.
-RulesVATInProducts=- Maddi varlıklar için, fatura tarihi baz alınarak fatura KDV lerini içerir.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Hizmetler için, ödenmiş ya da ödenmemiş fatura tarihini baz alan rapor fatura KDV lerini içerir.
-RulesVATDueProducts=- Maddi varlıklar için, fatura tarihi baz alınarak fatura KDV lerini içerir.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Not: maddi varlıklar için, daha adil olması açısından teslim tarihi kullanılmalı.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/fatura
 NotUsedForGoods=Ürünler için kullanılmaz
 ProposalStats=Teklif istatistikleri
@@ -198,7 +203,7 @@ InvoiceRef=Fatura ref.
 CodeNotDef=Tanımlanmamış
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Ödeme koşulu tarihi nesnenin tarihinden düşük olamaz.
-Pcg_version=Chart of accounts models
+Pcg_version=Hesap planı modelleri
 Pcg_type=Pcg türü
 Pcg_subtype=Pcg alt türü
 InvoiceLinesToDispatch=Gönderilecek fatura kalemleri
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=Aynı hesaplama kuralını uygulamak ve tedarikçini
 TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın).
 CalculationMode=Hesaplama modu
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Hata: Banka hesabı bulunamadı
 FiscalPeriod=Muhasebe dönemi
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 1284af29ed1..5ea3af2b33c 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Kayıtlı iş yok
 CronPriority=Öncelik
 CronLabel=Açıklama
 CronNbRun=Başlatma sayısı
-CronMaxRun=Maksimum başlatma sayısı
+CronMaxRun=Max number launch
 CronEach=Her
 JobFinished=İş başlatıldı ve bitirildi
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Gönderen
 CronType=İş türü
 CronType_method=Call method of a PHP Class
 CronType_command=Kabuk komutu
-CronCannotLoadClass=%s sınıfı ya da %s nesnesi yüklenemiyor
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Yönetici Ayarları - Planlı işler" menüsüne git.
 JobDisabled=İş engellendi
 MakeLocalDatabaseDumpShort=Yerel veritabanı yedeklemesi
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Dikkat: Performans amaçlı olarak etkinleştirilmiş işlerin bir sonraki yürütme tarihi ne olursa olsun, işleriniz çalıştırılmadan önce maksimum %s saat ertelenebilir.
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 322d239eb3d..23496d5e784 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP eşleşmesi tamamlanmamış.
 ErrorLDAPMakeManualTest=A. Ldif dosyası %s dizininde oluşturuldu. Hatalar hakkında daha fazla bilgi almak için komut satırından elle yüklemeyi deneyin.
 ErrorCantSaveADoneUserWithZeroPercentage="Başlamış durumdaki" bir eylem, "yapan" alanı dolu olsa bile kaydedilemez.
 ErrorRefAlreadyExists=Oluşturulması için kullanılan referans zaten var.
-ErrorPleaseTypeBankTransactionReportName=Lütfen raporun girildiği banka hesap özeti adını yazın (Biçim YYYYAA veya YYYYAAGG)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Bazı alt kayıtları olduğundan kayıt silinemedi.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Kayıt silinemiyor. Zaten kullanılıyor veya başka bir nesne tarafından içeriliyor.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Mailman listesine ya da SPIP tabanına kayıt ekle
 ErrorFailedToRemoveToMailmanList=%s kaydının Mailman %s listesine ya da SPIP tabanına taşınmasında hata
 ErrorNewValueCantMatchOldValue=Yeni değer eskisine eşit olamaz
 ErrorFailedToValidatePasswordReset=Parola yenilenemiyor. Belki yenileme zaten yapılmış olabilir (bu bağlantı yalnızca bir kez kullanılabilir). Aksi durumda yenileme işlemi tekrar başlatın.
-ErrorToConnectToMysqlCheckInstance=Veritabanına bağlanılamadı. Mysql sunucusunun çalıştığını denetleyin (çoğu durumda, komut satırından 'sudo /etc/init.d/mysql start' komutuyla başlatabilirsiniz).
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Kişi eklenmesinde hata
 ErrorDateMustBeBeforeToday=Tarih bugünden büyük olamaz
 ErrorPaymentModeDefinedToWithoutSetup=Bir ödeme biçimi %s türüne ayarlanmış, ancak fatura modülü ayarı bu ödeme biçimi için tanımlanan bilgiyi gösterecek tamamlanmamış.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak eposta adresi de kullanılabilir.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Saatlik ücretleri tanımlanmadığında baze
 WarningYourLoginWasModifiedPleaseLogin=Kullanıcı adınız değiştirilmiştir. Güvenlik nedeniyle sonraki eyleminiz için yeni kullanıcı adınızla giriş yapmalısınız.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/tr_TR/loan.lang b/htdocs/langs/tr_TR/loan.lang
index 781c4e15e52..d43b8c60ca5 100644
--- a/htdocs/langs/tr_TR/loan.lang
+++ b/htdocs/langs/tr_TR/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Kredi modülünün yapılandırılması
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Varsayılan muhasebe hesabı sermayesi
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Varsayılan muhasebe hesabı faiz oranı
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Varsayılan muhasebe hesabı sigortası
-CreateCalcSchedule=Kredi programı Oluştur/Düzenle
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index beba1969c61..0e4a9db4ce4 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -71,13 +71,14 @@ EMailSentForNElements=Eposta gönderilen öğeler: %s.
 XTargetsAdded=<b>%s</b> alıcılar listesine eklendi
 OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
+GroupEmails=Grup e-postaları
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Toplu Eposta gönderimi sonuçu
 NbSelected=Seçilen sayısı
 NbIgnored=Yoksayılan sayısı
 NbSent=Gönderilen sayısı
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Mevcut hedef kişi eposta sayısı
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Alıcılar (gelişmiş seçim)
-AdvTgtTitle=Hedef üçüncü tarafları veya kişileri/adresleri önceden seçmek için giriş alanlarını doldurun
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Bunları %% sihirli karakter olarak kullanın. Örneğin; <b>jean, joe, jim</b> gibi tüm öğeleri bulmak için bunları <b>j%%</b> girebilirsiniz, aynı zamanda ayraç olarak ; kullanabilirsiniz, bu değer hariç için ! kullanabilirsiniz. Örneğin; <b>jean;joe;jim%%;!jimo;!jima%</b> dizgesi hedefi şu olacaktır: jim ile başlayan ancak jimo ile başlamayan ve jima ile başlayan her şeyi değil
 AdvTgtSearchIntHelp=Tam sayı veya kayan değer seçmek için aralık kullanın
 AdvTgtMinVal=En düşük değer
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 7a4bb06be1f..12147d314d2 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=%s Parametresi tanımlı değil
 ErrorUnknown=Bilinmeyen hata
 ErrorSQL=SQL Hatası
 ErrorLogoFileNotFound='%s' Logo dosyası bulunamadı
-ErrorGoToGlobalSetup=Bunu düzeltmek için 'Firma/Kuruluş' kurulumuna gidin
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Bunu düzeltmek için Modül Kurulumuna git
 ErrorFailedToSendMail=Posta gönderilemedi (gönderen)
 ErrorFileNotUploaded=Dosya gönderilemedi. Boyutun izin verilen ençok dosya boyutunu aşmadığını denetleyin, bu dizinde yeterli boş alan olmalı ve aynı isimde başka bir dosya olmamalı.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Hata, ülke '%s' için herhangi bir KDV or
 ErrorNoSocialContributionForSellerCountry=Hata, '%s' ülkesi için sosyal/mali vergi tipi tanımlanmamış.
 ErrorFailedToSaveFile=Hata, dosya kaydedilemedi.
 ErrorCannotAddThisParentWarehouse=Zaten şu anki deponun bir alt deposu olan bir üst depo eklemeye çalışıyorsunuz
-MaxNbOfRecordPerPage=Sayfa başına maksimum kayıt sayısı
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=Bunu yapmak için yetkiniz yok.
 SetDate=Ayar tarihi
 SelectDate=Bir tarih seç
 SeeAlso=Buna da bakın %s
 SeeHere=Buraya bak
+ClickHere=Buraya tıkla
+Here=Here
 Apply=Uygula
 BackgroundColorByDefault=Varsayılan arkaplan rengi
 FileRenamed=Dosya adı değiştirilmesi başarılı
@@ -185,6 +187,7 @@ ToLink=Bağlantı
 Select=Seç
 Choose=Seç
 Resize=Yeniden boyutlandır
+ResizeOrCrop=Resize or Crop
 Recenter=Yeniden ortala
 Author=Yazan
 User=Kullanıcı
@@ -325,8 +328,10 @@ Default=Varsayılan
 DefaultValue=Varsayılan değer
 DefaultValues=Varsayılan değerler
 Price=Fiyat
+PriceCurrency=Price (currency)
 UnitPrice=Birim fiyat
 UnitPriceHT=Birim fiyat (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=B.F. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=B.F (para birimi)
 PriceUTTC=B.F. (vergi dahil)
 Amount=Tutar
 AmountInvoice=Fatura tutarı
+AmountInvoiced=Amount invoiced
 AmountPayment=Ödeme tutarı
 AmountHTShort=Tutar (net)
 AmountTTCShort=Tutar (KDV dahil)
@@ -353,6 +359,7 @@ AmountLT2ES=IRPF Tutarı
 AmountTotal=Toplam tutar
 AmountAverage=Ortalama tutar
 PriceQtyMinHT=En düşük miktar fiyatı (KDV hariç)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Yüzde
 Total=Toplam
 SubTotal=Aratoplam
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=KDV Oranı
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Varsayılan vergi oranı
 Average=Ortalama
 Sum=Toplam
@@ -419,7 +428,8 @@ ActionRunningShort=Devam etmekte
 ActionDoneShort=Bitti
 ActionUncomplete=Tamamlanmamış
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Şirket/Kuruluş
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Bu üçüncü partinin kişileri
 ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri
 AddressesForCompany=Bu üçüncü partinin adresleri
@@ -427,6 +437,9 @@ ActionsOnCompany=Bu üçüncü parti hakkındaki etkinlikler
 ActionsOnMember=Bu üye hakkındaki etkinlikler
 ActionsOnProduct=Bu ürünle ilgili etkinlikler
 NActionsLate=%s son
+ToDo=Yapılacaklar
+Completed=Completed
+Running=Devam etmekte
 RequestAlreadyDone=İstek zaten kayıtlı
 Filter=Süzgeç
 FilterOnInto=%s alanı içinde arama ölçütü '<strong>%s</strong>'
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Uyarı, bakım modundasınız, şu anda uygulamay
 CoreErrorTitle=Sistem hatası
 CoreErrorMessage=Üzgünüz, bir hata oluştu. Günlükleri kontrol etmek için sistem yöneticinize başvurun veya daha fazla bilgi almak için $dolibarr_main_prod=1 devre dışı bırakın.
 CreditCard=Kredi kartı
+ValidatePayment=Ödeme doğrula
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=<b>%s</b> olan alanları zorunludur
 FieldsWithIsForPublic=Üyelerin genel listelerinde <b>%s</b> olan alanlar gösterilir. Bunu istemiyorsanız, “genel” kutusundan işareti kaldırın.
 AccordingToGeoIPDatabase=(GeoIP dönüşümüne göre)
@@ -805,11 +820,11 @@ NoRecordSelected=Seçilen kayıt yok
 MassFilesArea=Toplu işlemler tarafından yapılan dosyalar için alan
 ShowTempMassFilesArea=Toplu işlemler tarafından yapılan dosyalar alanını göster
 ConfirmMassDeletion=Toplu silme onayı
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
+ConfirmMassDeletionQuestion=Seçilen %s kaydı silmek istediğinizden emin misiniz?
 RelatedObjects=İlgili Nesneler
 ClassifyBilled=Faturalandı olarak sınıflandır
+ClassifyUnbilled=Classify unbilled
 Progress=İlerleme
-ClickHere=Buraya tıkla
 FrontOffice=Ön ofis
 BackOffice=Arka ofis
 View=İzle
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Proje
 Projects=Projeler
 Rights=İzinler
+LineNb=Line no.
+IncotermLabel=Uluslararası Ticaret Terimleri
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
@@ -890,7 +907,7 @@ Select2MoreCharacters=ya da daha fazla harf
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Daha fazla sonuç yükleniyor...
 Select2SearchInProgress=Arama sürmekte...
-SearchIntoThirdparties=Üçüncü taraflar
+SearchIntoThirdparties=Üçüncü partiler
 SearchIntoContacts=Kişiler
 SearchIntoMembers=Üyeler
 SearchIntoUsers=Kullanıcılar
@@ -914,5 +931,13 @@ CommentPage=Comments space
 CommentAdded=Yorum eklendi
 CommentDeleted=Yorum silindi
 Everybody=Herkes
-PayedBy=Payed by
-PayedTo=Payed to
+PayedBy=Ödeyen
+PayedTo=Ödenen
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Görevlendirilen
diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
index f0ab4734ed8..dc9ddf09e15 100644
--- a/htdocs/langs/tr_TR/margins.lang
+++ b/htdocs/langs/tr_TR/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Kar oran sayısal bir değer olmalı
 markRateShouldBeLesserThan100=Yayınlanmış kar oranı 100 den daha düşük olmalı
 ShowMarginInfos=Kar oranı bilgisi göster
 CheckMargins=Kar oranı ayrıntıları
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index b590cf0be76..449a3ff7b0d 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Doğrulanmış genel üyelerin listesi
 ErrorThisMemberIsNotPublic=Bu üye genel değil
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Başka bir üye  (adı: <b>%s</b>, kullanıcı: <b>%s</b>) zaten bir üçüncü partiyle <b>%s</b> bağlantılı.Önce bu bağlantıyı kaldırın, çünkü bir üçüncü partı yalnızca bir üyeye bağlantılı olamaz (ya da tersi).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Güvenlik nedeniyle, bir üyenin kendinizin dışında bir kullanıcıya bağlı olabilmesi için tüm kullanıcıları düzenleme iznine sahip olmanız gerekir.
-ThisIsContentOfYourCard=Merhaba.<br><br>Bu, hakkınızda elde ettiğimiz bilgilerin hatırlatmasıdır. Eğer yanlış görünen bir şey varsa bizimle iletişime geçmekten çekinmeyin.<br><br>
-CardContent=Üye kartınızın içeriği
 SetLinkToUser=Bir Dolibarr kullanıcısına bağlantı
 SetLinkToThirdParty=Bir Dolibarr üçüncü partisine bağlantı
 MembersCards=Üye kartvizitleri
@@ -57,11 +55,11 @@ NewCotisation=Yeni katkı payı
 PaymentSubscription=Yeni katkı payı ödeme
 SubscriptionEndDate=Abonelik bitiş tarihi
 MembersTypeSetup=Üye türü kurulumu
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
+MemberTypeModified=Üye türü değiştirildi
+DeleteAMemberType=Bir üye türünü sil
+ConfirmDeleteMemberType=Bu üye türünü silmek istediğinizden emin misiniz?
+MemberTypeDeleted=Üye türü silindi
+MemberTypeCanNotBeDeleted=Üye türü silinemiyor
 NewSubscription=Yeni abonelik
 NewSubscriptionDesc=Bu form aboneliğinizi derneğe yeni bir üye olarak kaydetmenize olanak verir. Abonelik yenilemek istiyorsanız (Zaten üyeyseniz), dernek yönetimine %s epostası ile başvurun.
 Subscription=Abonelik
@@ -108,17 +106,33 @@ PublicMemberCard=Genel üyelik kartı
 SubscriptionNotRecorded=Üyelik kaydedilmedi
 AddSubscription=Abonelik oluştur
 ShowSubscription=Abonelik göster
-SendAnEMailToMember=Üyelere bilgi e-postası gönder
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Üye kartınızın içeriği
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Bir ziyaretçinin oto-kayıt yapması durumunda alınacak e-postanın konusu
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Bir ziyaretçinin oto-kayıt yapması durumunda alınacak e-posta
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Üye oto-abonelik Eposta konusu
-DescADHERENT_AUTOREGISTER_MAIL=Üye oto-aboneliği Epostası
-DescADHERENT_MAIL_VALID_SUBJECT=Üye doğrulama Epostası konusu
-DescADHERENT_MAIL_VALID=Üye doğrulama Epostası
-DescADHERENT_MAIL_COTIS_SUBJECT=AbonelikEpostası konusu
-DescADHERENT_MAIL_COTIS=Abonelik Epostası
-DescADHERENT_MAIL_RESIL_SUBJECT=Üyelik sonlandırma Epostası konusu
-DescADHERENT_MAIL_RESIL=Üyelik sonlandırma Epostası
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Otomatik epostalar için Eposta gönderen
 DescADHERENT_ETIQUETTE_TYPE=Etiket sayfası biçimi
 DescADHERENT_ETIQUETTE_TEXT=Üye adres sayfalarına yazılan metin
@@ -176,4 +190,9 @@ VATToUseForSubscriptions=Abonelikler için kullanılacak KDV oranı
 NoVatOnSubscription=Abonelikler için KDV yok
 MEMBER_PAYONLINE_SENDEMAIL=Dolibarr bir abonelik için doğrulanmış bir ödemenin onayını aldığında uyarı epostası olarak kullanılacak eposta (Örneğin: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Faturada abonelik kalemi olarak kullanılan ürün: %s
-NameOrCompany=Name or company
+NameOrCompany=İsim veya şirket
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index da7295a709c..d54ac847d91 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -29,7 +29,7 @@ BuildDocumentation=Dökümantasyon oluşturun
 ModuleIsNotActive=This module was not activated yet. Go into %s to make it live or click here:
 ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
 DescriptionLong=Uzun açıklama
-EditorName=Name of editor
+EditorName=Editörün adı
 EditorUrl=Editörün URL'si
 DescriptorFile=Modülün tanımlayıcı dosyası
 ClassFile=PHP DAO CRUD sınıfı için dosya
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=Dosya henüz oluşturulmadı
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Eksik dosyaları oluştur
 SpecificationFile=File with business rules
 LanguageFile=Dil için dosya
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -60,7 +62,7 @@ ReadmeFile=Benioku dosyası
 ChangeLog=ChangeLog dosyası
 TestClassFile=PHP Unit Test sınıfı için dosya
 SqlFile=Sql dosyası
-PageForLib=File for PHP libraries
+PageForLib=PHP kütüphaneleri için dosya
 SqlFileExtraFields=Tamamlayıcı nitelikler için Sql dosyası
 SqlFileKey=Anahtarlar için Sql dosyası
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
@@ -70,8 +72,8 @@ DirScanned=Taranan dizin
 NoTrigger=No trigger
 NoWidget=No widget
 GoToApiExplorer=Go to API explorer
-ListOfMenusEntries=List of menu entries
-ListOfPermissionsDefined=List of defined permissions
+ListOfMenusEntries=Menü girişlerinin listesi
+ListOfPermissionsDefined=Tanımlanan izinlerin listesi
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only. Using a negative value means field is not shown by default on list but can be selected for viewing)
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list ? (Examples: 1 or 0)
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 2c171da2dbe..2cb36fdfde6 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Bağlantı kesildi. Giriş sayfasına git...
 MessageForm=Online ödeme formundaki mesaj
 MessageOK=Doğrulama sayfası mesajı
 MessageKO=İptal edilen ödeme sayfası mesajı
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Fatura tarihi yılı
 PreviousYearOfInvoice=Fatura tarihinden önceki yıl
@@ -78,8 +80,8 @@ LinkedObject=Bağlantılı nesne
 NbOfActiveNotifications=Bildirim sayısı (alıcı epostaları sayısı)
 PredefinedMailTest=__(Hello)__\nBu, __EMAIL__ adresine gönderilen bir test mailidir.\nİki satır bir satırbaşı ile birbirinden ayrılır.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nBu bir <b>test</b> mailidir (test kelimesi kalın olmalıdır). <br> İki satır bir satırbaşı ile birbirinden ayrılır. <br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nBurada faturayı bulacaksınız __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\n__REF__ faturasının ödenmemiş olarak göründüğünü belirtmek isteriz. Bu nedenle hatırlatma amaçlı olarak ilgili fatura ekte tekrar bilginize sunulmuştur.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nBurada ticari teklifi bulacaksınız __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nBurada fiyat talebini bulacaksınız __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nBurada siparişi bulacaksınız __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Yüklemeyi başlat
 CancelUpload=Yüklemeyi iptal et
 FileIsTooBig=Dosyalar çok büyük
 PleaseBePatient=Lütfen sabırlı olun...
+NewPassword=New password
 ResetPassword=Şifreyi sıfırla
 RequestToResetPasswordReceived=Dolibarr parolanızı değiştirmek için bir istek alınmıştır
 NewKeyIs=Oturum açmak için yeni anahtarınız
@@ -227,9 +230,9 @@ Chart=Çizelge
 PassEncoding=Şifre kodlama
 PermissionsAdd=İzinler eklendi
 PermissionsDelete=İzinler kaldırıldı
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
+YourPasswordMustHaveAtLeastXChars=Şifreniz en az <strong>%s</strong> karakter içermelidir
+YourPasswordHasBeenReset=Şifreniz başarılı bir şekilde sıfırlandı
+ApplicantIpAddress=Başvuru sahibinin IP adresi
 ##### Export #####
 ExportsArea=Dışaaktar alanı
 AvailableFormats=Varolan biçimler
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=Sayfanın URL si
 WEBSITE_TITLE=Unvan
 WEBSITE_DESCRIPTION=Açıklama
 WEBSITE_KEYWORDS=Anahtar kelimeler
+LinesToImport=Lines to import
diff --git a/htdocs/langs/tr_TR/paypal.lang b/htdocs/langs/tr_TR/paypal.lang
index 3718ac20007..76257673ed0 100644
--- a/htdocs/langs/tr_TR/paypal.lang
+++ b/htdocs/langs/tr_TR/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=Yalnızca PayPal
 ONLINE_PAYMENT_CSS_URL=Online ödeme sayfasındaki CSS stil sayfasının isteğe bağlı URL'si
 ThisIsTransactionId=Bu işlem kimliğidir: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Posta yoluyla bir belge gönderdiğinizde, Paypal ödeme url'sini ekleyin
-PredefinedMailContentLink=Ödemenizi via PayPal\n\n%s\n\n ile yapmak için aşağıdaki güvenli bağlantıya tıklayabilirsiniz
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=Şu anda %s "sandbox" modundasınız
 NewOnlinePaymentReceived=Yeni online ödeme alındı
 NewOnlinePaymentFailed=Yeni online ödeme denendi ancak başarısız oldu
@@ -30,3 +30,6 @@ ErrorCode=Hata Kodu
 ErrorSeverityCode=Hata Önem Kodu
 OnlinePaymentSystem=Online ödeme sistemi
 PaypalLiveEnabled=Paypal canlı etkin (aksi takdirde test/sanal alan modu)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 9c980e97fe0..c79cf9037dd 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -22,11 +22,12 @@ MassBarcodeInit=Toplu barkod başlatma
 MassBarcodeInitDesc=Bu sayfa, barkod tanımlanmamış nesneler üzerinde barkod başlatmak için kullanılabilir. Önce barkod modülü kurulumunun tamamlandığını denetleyin.
 ProductAccountancyBuyCode=Muhasebe kodu (satın alma)
 ProductAccountancySellCode=Muhasebe kodu (satış)
-ProductAccountancySellIntraCode=Accounting code (sale intra-community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancySellIntraCode=Muhasebe kodu (topluluk içi satış)
+ProductAccountancySellExportCode=Muhasebe kodu (satış ihracatı)
 ProductOrService=Ürün veya Hizmet
 ProductsAndServices=Ürünler ve Hizmetler
 ProductsOrServices=Ürünler veya hizmetler
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Sadece satılık ürünler
 ProductsOnPurchaseOnly=Sadece satın alınabilir ürünler
 ProductsNotOnSell=Satılık olmayan ve satın alınabilir olmayan ürünler
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Bu ürün hatını silmek istediğinizden emin misiniz?
 ProductSpecial=Özel
 QtyMin=Enaz Mik
 PriceQtyMin=Bu enaz mik. için fiyat (indirimsiz)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=KDV Oranı (bu tedarikçi/ürün için)
 DiscountQtyMin=Mik için varsayılan indirim
 NoPriceDefinedForThisSupplier=Bu tedarikçi/ürün için fiyat/miktar tanımlanmamış
@@ -143,7 +145,7 @@ RowMaterial=İlk malzeme
 CloneProduct=Ürün veya hizmet klonla
 ConfirmCloneProduct=<b>%s</b> ürünü ve siparişi klonlamak istediğinizden emin misiniz?
 CloneContentProduct=Ürünün/hizmet bütün temel bilgilerini klonla
-ClonePricesProduct=Clone prices
+ClonePricesProduct=Fiyatları çoğalt
 CloneCompositionProduct=Paketlenmiş ürünü/hizmeti kopyala
 CloneCombinationsProduct=Ürün varyantlarını kopyala
 ProductIsUsed=Bu ürün kullanılır.
@@ -153,7 +155,7 @@ BuyingPrices=Alış fiyatları
 CustomerPrices=Müşteri fiyatları
 SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürünlerin ya da hizmetlerin)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Gümrük/Emtia/HS kodu
 CountryOrigin=Menşei ülke
 Nature=Niteliği
 ShortLabel=Kısa etiket
@@ -196,15 +198,15 @@ CurrentProductPrice=Geçerli fiyat
 AlwaysUseNewPrice=Ürün/hizmet için her zaman geçerli fiyatı kullan
 AlwaysUseFixedPrice=Sabit fiyatı kullan
 PriceByQuantity=Miktara göre değişen fiyatlar
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=Fiyatları miktara göre devre dışı bırak
 PriceByQuantityRange=Miktar aralığı
 MultipriceRules=Fiyat seviyesi kuralları
 UseMultipriceRules=Birinci fiyata göre kendiliğinden fiyat hesaplaması için fiyat seviyesi kurallarını (ürün modülü ayarlarında tanımlanan) kullan
 PercentVariationOver=%s üzerindeki %% değişim
 PercentDiscountOver=%s üzerindeki %% indirim
 KeepEmptyForAutoCalculation=Bunun ürünlerin ağırlık veya hacimlerinden otomatik olarak hesaplanması için boş bırakın.
-VariantRefExample=Example: COL
-VariantLabelExample=Example: Color
+VariantRefExample=Örnek: RENK
+VariantLabelExample=Örnek: Renk
 ### composition fabrication
 Build=Üret
 ProductsMultiPrice=Her fiyat düzeyi için ürünler ve fiyatlar
@@ -274,7 +276,7 @@ WarningSelectOneDocument=Lütfen enaz bir belge seçin
 DefaultUnitToShow=Birim
 NbOfQtyInProposals=Teklifteki Mik
 ClinkOnALinkOfColumn=Ayrıntılı görüntüsünü almak istediğiniz %s sütunundaki bağlantıya tıklayın...
-ProductsOrServicesTranslations=Products or services translation
+ProductsOrServicesTranslations=Ürünler veya hizmetler çevirisi
 TranslatedLabel=Çevrilmiş etiket
 TranslatedDescription=Çevirilmiş açıklama
 TranslatedNote=çevirilmiş notlar
@@ -288,8 +290,8 @@ ConfirmDeleteProductBuyPrice=Bu satınalma fiyatını silmek istediğinizden emi
 SubProduct=Alt ürün
 ProductSheet=Ürün belgesi
 ServiceSheet=Hizmet belgesi
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+PossibleValues=Olası değerler
+GoOnMenuToCreateVairants=Nitelik varyantlarını hazırlamak için (renk, boyut gibi...) %s - %smenüsüne gidin
 
 #Attributes
 VariantAttributes=Değişken öznitelikleri
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 1e3d21c2d2d..89a80553718 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Proje ilgilileri
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Tüm projeler
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir.
 TasksOnProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir.
 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).
 TasksOnProjectsDesc=Bu görünüm tüm projelerdeki tüm görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Yalnızca açık projeler görünür (taslak ya da kapalı durumdaki projeler görünmez)
 ClosedProjectsAreHidden=Kapalı projeler görünmez.
 TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri içerir.
@@ -40,7 +40,7 @@ ShowTask=Görev göster
 SetProject=Proje ayarla
 NoProject=Tanımlı ya da sahip olunan hiçbir proje yok
 NbOfProjects=Proje sayısı
-NbOfTasks=Nb of tasks
+NbOfTasks=Görev sayısı
 TimeSpent=Harcanan süre
 TimeSpentByYou=Tarafınızdan harcanan süre
 TimeSpentByUser=Kullanıcı tarafından harcanan süre
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Açık projelerdeki görevler
 WorkloadNotDefined=İşyükü tanımlanmamış
 NewTimeSpent=Harcanan süre
 MyTimeSpent=Harcadığım sürelerim
+BillTime=Bill the time spent
 Tasks=Görevler
 Task=Görev
 TaskDateStart=Görev başlama tarihi
@@ -84,13 +85,14 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
-ListShippingAssociatedProject=List of shippings associated with the project
+ListShippingAssociatedProject=Projeyle ilişkili nakliyelerin listesi
 ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
 ListExpenseReportsAssociatedProject=Bu proje ile ilişkili gider raporları listesi
 ListDonationsAssociatedProject=Bu proje ile ilişkilendirilmiş bağış listesi
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi
 ListTaskTimeUserProject=Projelere harcanan sürelerin listesi
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Projedeki bugünkü etkinlik
 ActivityOnProjectYesterday=Projedeki dünkü etkinlik
 ActivityOnProjectThisWeek=Projede bu haftaki etkinlik
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Projede bu ayki etkinlik
 ActivityOnProjectThisYear=Projede bu yılki etkinlik
 ChildOfProjectTask=Alt proje/görev
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Bu özel projenin sahibi değil
 AffectedTo=Tahsis edilen
 CantRemoveProject=Bu proje kaldırılamıyor çünkü Bazı diğer nesneler tarafından başvurulUYOR (fatura, sipariş veya diğerleri). Başvuru sekmesine bakın.
@@ -112,7 +115,7 @@ ProjectContact=Proje ilgilileri
 TaskContact=Task contacts
 ActionsOnProject=Proje etkinlikleri
 YouAreNotContactOfProject=Bu özel projenin bir ilgilisi değilsiniz
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=Kullanıcı bu özel projenin bağlantısı değil
 DeleteATimeSpent=Harcana süre sil
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Bana atanmamış görevleri de göster
@@ -121,7 +124,7 @@ TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Bu üçüncü parti atanmış projeler
 NoTasks=Bu proje için hiçbir görev yok
 LinkedToAnotherCompany=Diğer üçüncü partiye bağlantılı
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=Görev kullanıcıya atanmadı. Görevi şimdi atamak için '<strong>%s</strong>' düğmesini kullanın.
 ErrorTimeSpentIsEmpty=Harcanan süre boş
 ThisWillAlsoRemoveTasks=Bu eylem aynı zamanda projenin tüm görevlerini (şu andaki <b>%s</b> görevleri) ve tüm harcanan süre girişlernii siler .
 IfNeedToUseOhterObjectKeepEmpty=Eğer bazı nesneler başka bir üçüncü partiye aitse  (fatura, sipariş, ...), oluşturulması  için bu projeye bağlanmalıdır, projenin birden çok üçüncü partiye bağlı olması için bunu boş bırakın.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Görev tarihini yeni proje başlama tarihine göre kaydırmak olası değil
 ProjectsAndTasksLines=Projeler ve görevler
 ProjectCreatedInDolibarr=%s projesi oluşturuldu
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=%s görev oluşturuldu
 TaskModifiedInDolibarr=%s görev değiştirildi
@@ -180,14 +184,14 @@ ResourceNotAssignedToTheTask=Bu göreve atanmamış
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Görevi bana ata
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
+AssignTaskToUser=Görevi %s kullanıcısına ata
+SelectTaskToAssign=Atanacak görevi seçin...
 AssignTask=Ata
 ProjectOverview=Genel bakış
 ManageTasks=Görev ve süre izlemek için projeleri kullan
 ManageOpportunitiesStatus=Adayları/fırsatları izlemek için projeleri kullan
 ProjectNbProjectByMonth=Aylık oluşturulan proje sayısı
-ProjectNbTaskByMonth=Nb of created tasks by month
+ProjectNbTaskByMonth=Aylık oluşturulan görevlerin sayısı
 ProjectOppAmountOfProjectsByMonth=Aylık fırsat tutarı
 ProjectWeightedOppAmountOfProjectsByMonth=Aylık fırsat ağırlıklı tutarı
 ProjectOpenedProjectByOppStatus=Fırsat durumuna göre açık proje/aday
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Son %s proje
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 274c6823f7f..cc27a5b30a7 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=İmzalı(faturalanacak)
 PropalStatusNotSigned=İmzalanmamış (kapalı)
 PropalStatusBilled=Faturalanmış
 PropalStatusDraftShort=Taslak
+PropalStatusValidatedShort=Doğrulandı
 PropalStatusClosedShort=Kapalı
 PropalStatusSignedShort=İmzalı
 PropalStatusNotSignedShort=İmzalanmamış
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 99a711809b3..aaab59f1b7e 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=Bu değer, eğer proje modülü kullanılıyorsa kullanıcılar t
 TJMDescription=Bu değer yalnızca bilgi amaçlı olup hiçbir hesaplamada kulanılmaz
 LastSalaries=Son %s maaş ödemeleri
 AllSalaries=Tüm maaş ödemeleri
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index c7e85f85f13..1ab928d8fed 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Depo değiştir
 MenuNewWarehouse=Yeni depo
 WarehouseSource=Kaynak depo
 WarehouseSourceNotDefined=Tanımlı depo yok,
+AddWarehouse=Create warehouse
 AddOne=Bir tane ekle
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Hedef depo
 ValidateSending=Gönderim sil
 CancelSending=Gönderim iptal et
@@ -22,6 +24,7 @@ Movements=Hareketler
 ErrorWarehouseRefRequired=Depo referans adı gereklidir
 ListOfWarehouses=Depo listesi
 ListOfStockMovements=Stok hareketleri listesi
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Eylem ID'si %d
 ListMouvementStockProject=List of stock movements associated to project
@@ -181,8 +184,8 @@ INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Stoksız ürün ekleme
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Teorik adet
+TheoricalValue=Teorik adet
 LastPA=Last BP
 CurrentPA=Curent BP
 RealQty=Gerçek Miktar
diff --git a/htdocs/langs/tr_TR/stripe.lang b/htdocs/langs/tr_TR/stripe.lang
index 17e5f973200..d2ba655139d 100644
--- a/htdocs/langs/tr_TR/stripe.lang
+++ b/htdocs/langs/tr_TR/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=Yeni Stripe ödemesi alındı
 NewStripePaymentFailed=Yeni Stripe ödemesi denendi ancak başarısız oldu
 STRIPE_TEST_SECRET_KEY=Gizli test anahtarı
 STRIPE_TEST_PUBLISHABLE_KEY=Yayımlanabilir test anahtarı
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Gizli canlı anahtar
 STRIPE_LIVE_PUBLISHABLE_KEY=Yayınlanabilir canlı anahtar
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe canlı etkin (aksi takdirde test/sanal alan modu)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index b275cac1900..c116f74d591 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Gider raporu göster
 NewTrip=Yeni gider raporu
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Tutar ya da kilometre
 DeleteTrip=Gider raporu sil
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Onay bekliyor
 ExpensesArea=Gider raporları alanı
 ClassifyRefunded=Sınıflandırma 'İade edildi'
 ExpenseReportWaitingForApproval=Onay için yeni bir gider raporu sunulmuştur
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Gider raporu kimliği
 AnyOtherInThisListCanValidate=Doğrulama için bilgilendirilecek kişi
 TripSociete=Firma bilgisi
@@ -54,19 +54,19 @@ EX_FUE=Fuel CV
 EX_HOT=Otel
 EX_PAR=Parking CV
 EX_TOL=Toll CV
-EX_TAX=Various Taxes
+EX_TAX=Çeşitli Vergiler
 EX_IND=Indemnity transportation subscription
 EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
+EX_SUO=Ofis malzemeleri
+EX_CAR=Araba kiralama
 EX_DOC=Documentation
 EX_CUR=Customers receiving
 EX_OTR=Other receiving
 EX_POS=Postage
 EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
+EX_EMM=Çalışanların yemeği
+EX_GUM=Misafir yemeği
+EX_BRE=Kahvaltı
 EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Varsayılan aralık numarası
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Benzer bir tarih aralığı için başka bir gider raporu bildirdiniz.
 AucuneLigne=Bildirilen hiç gider raporu yok
 
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 1ee660a7b89..b511e5b188f 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -6,7 +6,7 @@ Permission=İzin
 Permissions=İzinler
 EditPassword=Parola düzenle
 SendNewPassword=Yeniden parola oluştur ve gönder
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Şifreyi sıfırlamak için bağlantı gönder
 ReinitPassword=Yeniden parola oluştur
 PasswordChangedTo=Şifre buna değiştirildi: %s
 SubjectNewPassword=%s için yeni parolanız
@@ -44,9 +44,9 @@ NewGroup=Yeni grup
 CreateGroup=Grup oluştur
 RemoveFromGroup=Gruptan kaldır
 PasswordChangedAndSentTo=Parola değiştirildi ve <b>%s</b> e gönderildi.
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=<b>%s</b> için şifre değiştirme isteği
 PasswordChangeRequestSent=Parola değiştirildi ve <b>%s</b> e gönderildi.
-ConfirmPasswordReset=Confirm password reset
+ConfirmPasswordReset=Şifre sıfırlamayı onayla
 MenuUsersAndGroups=Kullanıcılar ve Gruplar
 LastGroupsCreated=Oluşturulan son %s grup
 LastUsersCreated=Oluşturulan son %s kullanıcı
@@ -69,8 +69,8 @@ InternalUser=İç kullanıcı
 ExportDataset_user_1=Dolibarr kullanıcıları ve özellikleri
 DomainUser=Etki alanı kullanıcısı %s
 Reactivate=Yeniden etkinleştir
-CreateInternalUserDesc=Bu form, firmanız/kuruluşunuz için iç bir kullanıcı oluşturmanıza olanak tanır. Bir iç kullanıcı oluşturmak için (müşteri, tedarikçi, ...), üçüncü parti kişi kartından 'Dolibarr Kullanıcısı Oluştur' butonunu kullanın.
-InternalExternalDesc=  Bir <b>iç</b> kullanıcı firmanızın/kuruluşunuzun parçasıdır. <br>Bir <b>dış</b> kullanıcı müşteri, tedarikçi veya bir başkasıdır. <br><br>Her iki durumda da,  izinler Dolibarr’daki hakları tanımlar, aynı zamanda dış kullanıcı iç kullanıcıdan farklı bir menü yöeticisine sahiptir (Giriş - Ayarlar - Ekran'a bakın)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti.
 Inherited=İntikal eden
 UserWillBeInternalUser=Oluşturulacak kullanıcı bir iç kullanıcı olacaktır (çünkü belirli bir üçüncü parti ile bağlantılı değildir)
@@ -93,6 +93,7 @@ NameToCreate=Oluşturulacak Üçüncü Parti Adı
 YourRole=Sizin rolünüz
 YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı!
 NbOfUsers=Kullanıcı sayısı
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir
 HierarchicalResponsible=Yönetici
 HierarchicView=Sıradüzeni görünümü
@@ -100,7 +101,7 @@ UseTypeFieldToChange=Değiştirmek için Alan türünü kullan
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Oturum açmak için OpenID kullan
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Haftalık beklenen çalışma saatleri
 ColorUser=Kullanıcı rengi
 DisabledInMonoUserMode=Bakım modunda devre dışıdır
 UserAccountancyCode=User accounting code
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 8a58fe86108..2c47c7ec858 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -4,20 +4,22 @@ WebsiteSetupDesc=Burada istediğiniz sayıda farklı websitesi oluşturun. Sonra
 DeleteWebsite=Websitesi sil
 ConfirmDeleteWebsite=Bu websitesini silmek istediğinizden emin misiniz? Bütün sayfaları ve içeriği silinecektir.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Sayfa adı/rumuz
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=Dış CSS dosyası URL si
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
-HtmlHeaderPage=HTML header (specific to this page only)
+WEBSITE_ROBOT=Robot dosyası (robots.txt)
+WEBSITE_HTACCESS=Web sitesinin .htaccess dosyası
+HtmlHeaderPage=HTML başlığı (yalnızca bu sayfaya özgü)
 PageNameAliasHelp=Sayfanın adı veya takma adı.<br>Bu takma ad, web sitesi bir web sunucusunun (Apacke, Nginx gibi ...) Sanal host'undan çalıştırıldığında bir SEO URL'si oluşturmak için de kullanılır. Bu takma adı düzenlemek için "<strong>%s</strong>" düşmesini kullanın.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Medya kütüphanesi
 EditCss=Stil/CSS veya HTML başlığı düzenle
 EditMenu=Menü düzenle
-EditMedias=Edit medias
+EditMedias=Medyaları düzenle
 EditPageMeta=Meta Düzenle
 AddWebsite=Add website
 Webpage=Web sayfası/kapsayıcı
@@ -34,33 +36,49 @@ ViewPageInNewTab=Siteyi yeni sekmede izle
 SetAsHomePage=Giriş Sayfası olarak ayarla
 RealURL=Gerçek URL
 ViewWebsiteInProduction=Web sitesini giriş URL si kullanarak izle
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=%s yeni bir sekmede görüntüle.<br><br>%s harici bir web sunucusu (Apache, Nginx, IIS gibi) tarafından sunulacaktır. Şu dizine işaret etmeden önce bu sunucuyu kurmanız ve ayarlamanız gerekir:<br><strong>%s</strong><br>Harici sunucu tarafından sunulan URL:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Okundu
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=Harici web sunucusu tarafından sunulan sanal host URL'si tanımlanmamış
 NoPageYet=Henüz hiç sayfa yok
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Sayfa/kapsayıcı kopyala
 CloneSite=Siteyi kopyala
 SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
+ParentPageId=Üst sayfa kimliği
+WebsiteId=Web Sitesi Kimliği
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
 OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
-IDOfPage=Id of page
-Banner=Bandeau
+IDOfPage=Sayfanın kimliği
+Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
-AddWebsiteAccount=Create web site account
+WebsiteAccount=Web sitesi hesabı
+WebsiteAccounts=Web sitesi hesapları
+AddWebsiteAccount=Web sitesi hesabı oluştur
 BackToListOfThirdParty=Back to list for Third Party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
+DisableSiteFirst=Önce web sitesini devre dışı bırak
+MyContainerTitle=Web sitemin başlığı
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 4b9f6b4f66d..31f4b4a099f 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Otomatik ödeme talimatı
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Otomatik ödeme talimatı
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=İşlenecek
 WithdrawalsReceipts=Otomatik ödeme talimatları
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Üçüncü parti banka kodu
-NoInvoiceCouldBeWithdrawed=Hiçbir fatura için para çekme işlemi başarılamadı. Firma faturalarının geçerli bir BAN'ı olduğunu kontrol edin.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Alacak olarak sınıflandır
 ClassCreditedConfirm=Bu para çekme makbuzunu bankanıza alacak olarak sınıflandırmak istediğinizden emin misiniz?
 TransData=Havale tarihi
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Durum satırlarına göre istatistkler
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index a123c9e50f3..679789d5648 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Умови платежу
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index 09274878849..8165bd76c61 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 5ec44cf8c31..2c265e1eaaa 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Повернення платежу
 DeletePayment=Видалити платіж
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Платежі Постачальникам
 ReceivedPayments=Отримані платежі
 ReceivedCustomersPayments=Платежі, отримані від покупців
@@ -91,7 +92,7 @@ PaymentAmount=Сума платежу
 ValidatePayment=Підтвердити платіж
 PaymentHigherThanReminderToPay=Платіж більший, ніж в нагадуванні про оплату
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Класифікувати як 'Сплачений'
 ClassifyPaidPartially=Класифікувати як 'Сплачений частково'
 ClassifyCanceled=Класифікувати як 'Анулюваний'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Перетворити в майбутню знижку
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Ввести платіж, отриманий від покупця
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Відключено, тому що оплата, що залишилася є нульовою
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (має бути підтверджений)
 BillStatusPaid=Сплачений
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Сплачений (готовий для завершального рахунка-фактури)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Анулюваний
 BillStatusValidated=Підтверджений (необхідно сплатити)
 BillStatusStarted=Розпочатий
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=В очікуванні
 AmountExpected=Заявлена сума
 ExcessReceived=Отриманий надлишок
+ExcessPaid=Excess paid
 EscompteOffered=Надана знижка (за достроковий платіж)
 EscompteOfferedShort=Знижка
 SendBillRef=Представлення рахунку %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Знижка з кредитового авізо %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Такий тип кредиту може бути використаний по рахунку-фактурі до його підтвердження
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Примітка / Підстава
 ReasonDiscount=Підстава
 DiscountOfferedBy=Надана
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Адреса виставляння
 HelpEscompte=Ця знижка надана Покупцеві за достроковий платіж.
 HelpAbandonBadCustomer=Від цієї суми відмовився Покупець (вважається поганим клієнтом) і вона вважається надзвичайною втратою.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index af63bb152f8..a7ce42e687f 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Пропозиції
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Відносна знижка
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Банківські реквізити
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index be56961be82..c9013ece43c 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 6eddebfdccf..87dc53e8b69 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Продавець
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/uk_UA/loan.lang b/htdocs/langs/uk_UA/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/uk_UA/loan.lang
+++ b/htdocs/langs/uk_UA/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 7976aa0f121..4c3148f9be6 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index a99f8a5f291..40fe34fe6f0 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Параметр %s не було визначено
 ErrorUnknown=Невідома помилка
 ErrorSQL=Помилка SQL
 ErrorLogoFileNotFound=Файл логотипу '%s' не знайдено
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Перейти до Модулю налаштувань, щоб це виправити
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=Файл не завантажений. Переконайтеся, що розмір не перевищує максимально допустимий, що достатньо вільного місця на диску і що не існує вже файл з таким же ім'ям в цій директорії.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Застосувати
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Сума
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Сума платежу
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Фільтер
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Кредитна картка
+ValidatePayment=Підтвердити платіж
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Прогрес
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Призначено
diff --git a/htdocs/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/uk_UA/margins.lang
+++ b/htdocs/langs/uk_UA/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 57b45f276e7..94504d0d931 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 1585504479e..2afabe43b06 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/uk_UA/paypal.lang b/htdocs/langs/uk_UA/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/uk_UA/paypal.lang
+++ b/htdocs/langs/uk_UA/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 5ed4979e0a3..e754fb3fe1d 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index ec57b412105..4546e94baee 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/uk_UA/propal.lang b/htdocs/langs/uk_UA/propal.lang
index 9e9f46a90de..8fb9824409c 100644
--- a/htdocs/langs/uk_UA/propal.lang
+++ b/htdocs/langs/uk_UA/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Виставлений
 PropalStatusDraftShort=Проект
+PropalStatusValidatedShort=Підтверджений
 PropalStatusClosedShort=Зачинено
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 425848912ea..d1e7a5256dc 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/uk_UA/stripe.lang b/htdocs/langs/uk_UA/stripe.lang
index 3d58848cfa5..9fb2fa45113 100644
--- a/htdocs/langs/uk_UA/stripe.lang
+++ b/htdocs/langs/uk_UA/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang
index 1bbc8ef5f80..4ca65cbf75b 100644
--- a/htdocs/langs/uk_UA/trips.lang
+++ b/htdocs/langs/uk_UA/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index c87ce3a9b02..8aa5d3749fc 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 6b4e2ada84a..39c5cb2fee2 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Читати
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index c4189507f60..c37db78c215 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Nature
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 78d5b8e3f16..fed6af9a6fa 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
@@ -833,11 +838,11 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=VAT Management
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=On delivery
 OnPayment=On payment
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 34ed1126045..9267e55860a 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -109,7 +112,7 @@ ExportCal=Export calendar
 ExtSites=Import external calendars
 ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index d3bb1909afa..5898daa72b0 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index c5bc84acaf8..3473667fe55 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -43,7 +43,8 @@ Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByCustomers=Report by customers
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
@@ -75,10 +76,12 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -377,9 +390,9 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 9bf75178bea..cda96a546b8 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -31,7 +31,7 @@ Credit=Credit
 Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 884e077b96e..d2da7ded67e 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index cff89a71d98..ec036b28bc5 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/uz_UZ/loan.lang b/htdocs/langs/uz_UZ/loan.lang
index d00b11738be..9aae3869cc3 100644
--- a/htdocs/langs/uz_UZ/loan.lang
+++ b/htdocs/langs/uz_UZ/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 1ba8ff6dc6d..cedcd01066b 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index bd2dbf210a1..f4aeb71d880 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+ClickHere=Click here
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=Select
 Choose=Choose
 Resize=Resize
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Author
 User=User
@@ -325,8 +328,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
 Progress=Progress
-ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Project
 Projects=Projects
 Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Third parties
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index 8633d910657..9f590ef3718 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index fd0adc4c264..7326f3b9950 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Content of your member card
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
 MembersCards=Members business cards
@@ -108,17 +106,33 @@ PublicMemberCard=Member public card
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 1585504479e..2afabe43b06 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Start upload
 CancelUpload=Cancel upload
 FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/uz_UZ/paypal.lang b/htdocs/langs/uz_UZ/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/uz_UZ/paypal.lang
+++ b/htdocs/langs/uz_UZ/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 53835bd7f06..b9ebefc91c9 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index c69302deecb..319a6e7e0e2 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on 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).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 5f3c441bb0d..04941e4c650 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 4cdc262b847..7fbe2f6b82a 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
 AddOne=Add one
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
 ValidateSending=Delete sending
 CancelSending=Cancel sending
@@ -22,6 +24,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index a741a9f6e5f..2ede3bc474e 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index c87ce3a9b02..8aa5d3749fc 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -69,8 +69,8 @@ InternalUser=Internal user
 ExportDataset_user_1=Dolibarr's users and properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -93,6 +93,7 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index fea14e8d3fb..3defcec975a 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 87c9be2af9c..a9a25fa1ad2 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=Biểu đồ tài khoản
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Loại văn bản
 Docdate=Ngày
 Docref=Tài liệu tham khảo
-Code_tiers=Của bên thứ ba
 LabelAccount=Tài khoản Label
 LabelOperation=Label operation
 Sens=Sens
@@ -169,18 +168,17 @@ DelYear=Year to delete
 DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Thanh toán hóa đơn của khách hàng
-ThirdPartyAccount=Tài khoản của bên thứ ba
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản k
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=Tự nhiên
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Bán
 AccountingJournalType3=Mua
 AccountingJournalType4=Ngân hàng
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 1bfbb6335db..63aab5d71f6 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu cơ s
 MassConvert=Thực hiện chuyển đổi hàng loạt
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Hộp đánh dấu từ bảng
 ExtrafieldLink=Liên kết với một đối tượng
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=Người dùng & nhóm
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=Lợi nhuận
 Module59000Desc=Module quản lý lợi nhuận
 Module60000Name=Hoa hồng
 Module60000Desc=Module quản lý hoa hồng
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=Tài nguyên
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Xem hóa đơn khách hàng
@@ -833,11 +838,11 @@ Permission1251=Chạy nhập dữ liệu khối cho dữ liệu bên ngoài vào
 Permission1321=Xuất dữ liệu Hóa đơn khách hàng, các thuộc tính và thanh toán
 Permission1322=Reopen a paid bill
 Permission1421=Xuất dữ liệu Đơn hàng và các thuộc tính
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Tạo / chỉnh sửa các yêu cầu nghỉ phép của bạn
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Xóa yêu cầu nghỉ phép
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Tạo / chỉnh sửa các yêu cầu nghỉ phép cho tất cả mọi người
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Xem công việc theo lịch trình
 Permission23002=Tạo/cập nhật công việc theo lịch trình
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Số tiền phiếu doanh thu
 DictionaryPaymentConditions=Điều khoản thanh toán
 DictionaryPaymentModes=Phương thức thanh toán
 DictionaryTypeContact=Loại Liên lạc/Địa chỉ
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Định dạng giấy
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=Quản lý thuế VAT
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Tỷ suất
 LocalTax1IsNotUsed=Do not use second tax
@@ -977,7 +983,7 @@ Host=Máy chủ
 DriverType=Driver type
 SummarySystem=Tóm tắt thông tin hệ thống
 SummaryConst=Danh sách của tất cả các thông số cài đặt Dolibarr
-MenuCompanySetup=Company/Organisation
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= Quản lý menu chuẩn
 DefaultMenuSmartphoneManager=Quản lý menu smartphone
 Skin=Chủ đề giao diện
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=Forrm tìm kiếm cố định trên menu bên trái
 DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ)
 EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ
 EnableShowLogo=Hiển thị logo trên menu bên trái
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=Tên
 CompanyAddress=Địa chỉ
 CompanyZip=Zip
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên.
 SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số phân quyền Dolibarr có thể làm giảm giới hạn này.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=Bạn có thể chọn từng thông số liên quan đến Dolibarr nhìn và cảm thấy ở đây
 AvailableModules=Available app/modules
 ToActivateModule=Để kích hoạt mô-đun, đi vào Cài đặt Khu vực (Nhà-> Cài đặt-> Modules).
@@ -1441,6 +1448,9 @@ SyslogFilename=Tên tập tin và đường dẫn
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Cài đặt module Tài trợ
 DonationsReceiptModel=Mẫu biên nhận Tài trợ
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
-OptionVATDefault=Dựa trên tiền mặt
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Dựa trên cộng dồn
 OptionVatDefaultDesc=Thuế GTGT là do: <br> - Giao hàng đối với hàng hóa (chúng ta sử dụng ngày hóa đơn) <br> - Về chi trả dịch vụ
 OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=Ngày giao hàng
 OnPayment=Ngày thanh toán
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=Ngày hóa đơn được dùng
 Buy=Mua
 Sell=Bán
 InvoiceDateUsed=Ngày hóa đơn được dùng
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Mã kế toán bán hàng
 AccountancyCodeBuy=Mã kế toán mua hàng
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index 51a4b3615ab..afd4dc6659a 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=Shipment %s validated
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=Bạn cũng có thể thêm các thông số sau đây để l
 AgendaUrlOptions3=<b>Logina =%s</b> ​​để hạn chế sản lượng để hành động thuộc sở hữu của một người dùng <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>dự án = PROJECT_ID</b> để hạn chế sản lượng để hành động liên quan đến dự án <b>PROJECT_ID.</b>
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Bận
@@ -109,7 +112,7 @@ ExportCal=Lịch xuất khẩu
 ExtSites=Nhập lịch bên ngoài
 ExtSitesEnableThisTool=Hiển thị lịch bên ngoài (được định nghĩa vào thiết lập toàn cầu) vào chương trình nghị sự. Không ảnh hưởng đến lịch bên ngoài được xác định bởi người sử dụng.
 ExtSitesNbOfAgenda=Số lịch
-AgendaExtNb=Lịch nb %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL để truy cập tập tin .ical
 ExtSiteNoLabel=Không có Mô tả
 VisibleTimeRange=Visible time range
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 7842ee432d9..7eacd6ac884 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Đã trả lại
 DeletePayment=Xóa thanh toán
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Nhà cung cấp thanh toán
 ReceivedPayments=Đã nhận thanh toán
 ReceivedCustomersPayments=Thanh toán đã nhận được từ khách hàng
@@ -91,7 +92,7 @@ PaymentAmount=Số tiền thanh toán
 ValidatePayment=Xác nhận thanh toán
 PaymentHigherThanReminderToPay=Thanh toán cao hơn so với đề nghị trả
 HelpPaymentHigherThanReminderToPay=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả. <br> Chỉnh sửa mục nhập của bạn, nếu không xác nhận và suy nghĩ về việc tạo ra một giấy báo có của phần dư nhận được cho mỗi hoá đơn đã nộp dư.
-HelpPaymentHigherThanReminderToPaySupplier=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả tiền. <br> Sửa mục nhập của bạn, nếu không xác nhận.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Phân loại 'Đã trả'
 ClassifyPaidPartially=Phân loại 'Đã trả một phần'
 ClassifyCanceled=Phân loại 'Đã loại bỏ'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Chuyển đổi thành giảm giá trong tương lai
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Nhập thanh toán đã nhận được từ khách hàng
 EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng
 DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì phần chưa thanh toán còn lại là bằng 0
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Dự thảo (cần được xác nhận)
 BillStatusPaid=Đã trả
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Đã trả (sẵn sàng cho hóa đơn cuối cùng)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Đã loại bỏ
 BillStatusValidated=Đã xác nhận (cần được thanh toán)
 BillStatusStarted=Đã bắt đầu
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Chờ xử lý
 AmountExpected=Số tiền đã đòi
 ExcessReceived=Số dư đã nhận
+ExcessPaid=Excess paid
 EscompteOffered=Giảm giá được tặng (thanh toán trước hạn)
 EscompteOfferedShort=Giảm giá
 SendBillRef=Nộp hóa đơn %s
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Giảm giá từ giấy báo có %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Đây là loại giấy báo có được sử dụng trên hóa đơn trước khi xác nhận
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Tạo giảm giá theo số tiền
 NewRelativeDiscount=Tạo giảm giá theo %
+DiscountType=Discount type
 NoteReason=Ghi chú/Lý do
 ReasonDiscount=Lý do
 DiscountOfferedBy=Được cấp bởi
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Địa chỉ ra hóa đơn
 HelpEscompte=Giảm giá này được cấp cho các khách hàng bởi vì thanh toán của nó đã được thực hiện trước thời hạn.
 HelpAbandonBadCustomer=Số tiền này đã bị loại bỏ (khách hàng được cho là một khách hàng xấu) và được coi là một ngoại lệ .
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Ngày tạo cuối
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Số tạo hóa đơn tối đa
-NbOfGenerationDone=Nố tạo hóa đơn đã được thực hiện
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Xác nhận hóa đơn tự động
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s hóa đơn được tạo
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 38b2e7585f1..19f909b9e62 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -43,7 +43,8 @@ Individual=Cá nhân
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Công ty mẹ
 Subsidiaries=Các chi nhánh
-ReportByCustomers=Báo cáo theo khách hàng
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=Báo cáo theo tỷ lệ
 CivilityCode=Mã Civility
 RegisteredOffice=Trụ sở đăng ký
@@ -75,10 +76,12 @@ Town=Thành phố
 Web=Web
 Poste= Chức vụ
 DefaultLang=Ngôn ngữ mặc định
-VATIsUsed=Thuế VAT được dùng
-VATIsNotUsed=Thuế VAT không được dùng
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Đơn hàng đề xuất
 OverAllOrders=Đơn hàng
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Số VAT
-VATIntraShort=Số VAT
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Cú pháp hợp lệ
+VATReturn=VAT return
 ProspectCustomer=KH tiềm năng/khách hàng
 Prospect=KH tiềm năng
 CustomerCard=Thẻ khách hàng
 Customer=Khách hàng
 CustomerRelativeDiscount=Giảm giá theo số tiền
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=Giảm giá theo %
 CustomerAbsoluteDiscountShort=Giảm giá theo số tiền
 CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định là <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Khách hàng này không có mặc định giảm giá theo %
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Khách hàng này vẫn có ghi nợ cho <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Khách hàng này không có sẵn nợ chiết khấu
-CustomerAbsoluteDiscountAllUsers=Giảm giá theo % (gán cho tất cả người dùng)
-CustomerAbsoluteDiscountMy=Giảm giá theo số tiền (gán cho chính bạn)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=Không
 Supplier=Nhà cung cấp
 AddContact=Tạo liên lạc
@@ -377,9 +390,9 @@ NoDolibarrAccess=Không truy cập Dolibarr
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Liên lạc và các thuộc tính
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=Liên lạc/địa chỉ (của bên thứ ba hay không) và các thuộc tính
-ImportDataset_company_3=Chi tiết ngân hàng
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Mức giá
 DeliveryAddress=Địa chỉ giao hàng
 AddAddress=Thêm địa chỉ
@@ -406,15 +419,16 @@ ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Công nợ hiện tại
 OutstandingBill=Công nợ tối đa
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Mã này tự do. Mã này có thể được sửa đổi bất cứ lúc nào.
 ManagingDirectors=Tên quản lý (CEO, giám đốc, chủ tịch...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 36059081808..14bbf5fef75 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -31,7 +31,7 @@ Credit=Tín dụng
 Piece=Kế toán Doc.
 AmountHTVATRealReceived=Net thu
 AmountHTVATRealPaid=Net trả
-VATToPay=Bán VAT
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF Thanh toán
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Hiện nộp thuế GTGT
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Nó bao gồm tất cả các khoản thanh toán có hiệu quả các hóa đơn nhận được từ khách hàng. <br> - Nó được dựa trên ngày thanh toán các hoá đơn <br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=Báo cáo của bên thứ ba IRPF
-LT1ReportByCustomersInInputOutputModeES=Báo cáo của bên thứ ba RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Báo cáo của bên thứ ba RE
+LT2ReportByCustomersES=Báo cáo của bên thứ ba IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả
-VATReportByCustomersInDueDebtMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả
-VATReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ thuế GTGT thu, nộp
-LT1ReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ RE
-LT2ReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ IRPF
-VATReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ thuế GTGT thu, nộp
-LT1ReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ RE
-LT2ReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ IRPF
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Báo cáo của tỷ lệ RE
+LT2ReportByQuartersES=Báo cáo của tỷ lệ IRPF
 SeeVATReportInInputOutputMode=Xem báo cáo <b>%sVAT vỏ bọc%s</b> cho một tính toán tiêu chuẩn
 SeeVATReportInDueDebtMode=Xem báo cáo <b>%sVAT trên dòng%s</b> cho một tính toán với một tùy chọn trên dòng chảy
 RulesVATInServices=- Đối với dịch vụ, báo cáo bao gồm các quy định thuế GTGT thực sự nhận được hoặc ban hành trên cơ sở ngày thanh toán.
-RulesVATInProducts=- Đối với tài sản vật chất, nó bao gồm các hoá đơn GTGT trên cơ sở ngày hóa đơn.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- Đối với dịch vụ, báo cáo bao gồm hóa đơn GTGT do, trả tiền hay không, dựa trên ngày hóa đơn.
-RulesVATDueProducts=- Đối với tài sản vật chất, nó bao gồm các hoá đơn GTGT, dựa trên ngày hóa đơn.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Lưu ý: Đối với tài sản vật chất, nó sẽ sử dụng ngày giao hàng để được công bằng hơn.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%% / Hóa đơn
 NotUsedForGoods=Không được sử dụng đối với hàng hóa
 ProposalStats=Thống kê về các đề xuất
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo doanh thu mỗi sản phẩm, khi sử dụng chế độ <b>kế toán tiền mặt</b> là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ <b>kế toán tham gia</b> (xem thiết lập của module kế toán).
 CalculationMode=Chế độ tính toán
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 49767fb2ab7..658f3aa5921 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=Không có công ăn việc làm đăng ký
 CronPriority=Ưu tiên
 CronLabel=Nhãn
 CronNbRun=Nb. ra mắt
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Mỗi
 JobFinished=Việc đưa ra và hoàn thành
 #Page card
@@ -74,9 +74,10 @@ CronFrom=Từ
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell lệnh
-CronCannotLoadClass=Không thể tải lớp% s hoặc đối tượng% s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 1fe0e6743b4..ce730a6912c 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP phù hợp là không đầy đủ.
 ErrorLDAPMakeManualTest=Một tập tin .ldif đã được tạo ra trong thư mục% s. Hãy thử để tải nó bằng tay từ dòng lệnh để có thêm thông tin về lỗi.
 ErrorCantSaveADoneUserWithZeroPercentage=Không thể lưu một hành động với "statut không bắt đầu" nếu trường "được thực hiện bởi" cũng được làm đầy.
 ErrorRefAlreadyExists=Tài liệu tham khảo dùng để tạo đã tồn tại.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Không thể xóa kỷ lục. Nó đã được sử dụng hoặc đưa vào đối tượng khác.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Không thể để thêm biểu ghi% s vào danh s
 ErrorFailedToRemoveToMailmanList=Không thể loại bỏ kỷ lục% s vào danh sách Mailman% s hoặc cơ sở SPIP
 ErrorNewValueCantMatchOldValue=Giá trị mới không thể bằng cũ
 ErrorFailedToValidatePasswordReset=Không thể reinit mật khẩu. Có thể là reinit đã được thực hiện (liên kết này có thể được sử dụng một lần duy nhất). Nếu không, hãy thử khởi động lại quá trình reinit.
-ErrorToConnectToMysqlCheckInstance=Kết nối với cơ sở dữ liệu bị lỗi. Kiểm tra Mysql máy chủ đang chạy (trong hầu hết trường hợp, bạn có thể khởi chạy nó từ dòng lệnh với 'sudo /etc/init.d/mysql bắt đầu').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Không thể thêm số điện thoại
 ErrorDateMustBeBeforeToday=The date cannot be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Một phương thức thanh toán đã được thiết lập để gõ% s nhưng thiết lập các mô-đun hóa đơn không được hoàn thành để xác định thông tin để hiển thị cho phương thức thanh toán này.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/vi_VN/loan.lang b/htdocs/langs/vi_VN/loan.lang
index f9942912bf4..12c942466c0 100644
--- a/htdocs/langs/vi_VN/loan.lang
+++ b/htdocs/langs/vi_VN/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 710ec74db2b..15b91627dca 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 364c8eac911..861be482a89 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Thông số %s chưa được khai báo
 ErrorUnknown=Lỗi không xác định
 ErrorSQL=Lỗi SQL
 ErrorLogoFileNotFound=Không tìm thấy tệp logo '%s'
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=Đến phần thiết lập Module để sửa lỗi này
 ErrorFailedToSendMail=Lỗi gửi mail (người gửi=%s, người nhận=%s)
 ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có một tập tin đã có cùng tên trong thư mục này.
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Lỗi, không xác định tỉ lệ VAT c
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Lỗi, lưu tập tin thất bại
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Thiết lập ngày
 SelectDate=Chọn một ngày
 SeeAlso=Xem thêm %s
 SeeHere=Xem ở đây
+ClickHere=Click vào đây
+Here=Here
 Apply=Áp dụng
 BackgroundColorByDefault=Màu nền mặc định
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Liên kết
 Select=Chọn
 Choose=Lựa
 Resize=Đổi kích thước
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=Quyền
 User=Người dùng
@@ -325,8 +328,10 @@ Default=Mặc định
 DefaultValue=Giá trị mặc định
 DefaultValues=Default values
 Price=Giá
+PriceCurrency=Price (currency)
 UnitPrice=Đơn giá
 UnitPriceHT=Đơn giá (chưa thuế)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Đơn giá
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Số tiền
 AmountInvoice=Số tiền hóa đơn
+AmountInvoiced=Amount invoiced
 AmountPayment=Số tiền thanh toán
 AmountHTShort=Số tiền (chưa thuế)
 AmountTTCShort=Số tiền (gồm thuế)
@@ -353,6 +359,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Tổng số tiền
 AmountAverage=Số tiền trung bình
 PriceQtyMinHT=Giá cho số lượng tối thiểu (gồm thuế).
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Phần trăm
 Total=Tổng
 SubTotal=Tổng phụ
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Thuế suất
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Trung bình
 Sum=Tính tổng
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=Đã hoàn tất
 ActionUncomplete=Không hoàn tất
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=Liên lạc cho bên thứ ba này
 ContactsAddressesForCompany=Liên lạc/địa chỉ cho bên thứ ba này
 AddressesForCompany=Địa chỉ cho bên thứ ba này
@@ -427,6 +437,9 @@ ActionsOnCompany=Sự kiện về bên thứ ba này
 ActionsOnMember=Sự kiện về thành viên này
 ActionsOnProduct=Events about this product
 NActionsLate=%s cuối
+ToDo=Việc cần làm
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Yêu cầu đã được ghi nhận
 Filter=Bộ lọc
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang trong chế độ bảo
 CoreErrorTitle=Lỗi hệ thống
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Thẻ tín dụng
+ValidatePayment=Xác nhận thanh toán
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Các trường với <b>%s</b> là bắt buộc
 FieldsWithIsForPublic=Các trường với <b>%s</b> được hiển thị trên danh sách công khai của các thành viên. Nếu bạn không muốn điều này, đánh dấu vào hộp "công khai".
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=Xác định đã ra hóa đơn
+ClassifyUnbilled=Classify unbilled
 Progress=Tiến trình
-ClickHere=Click vào đây
 FrontOffice=Front office
 BackOffice=Trở lại văn phòng
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=Dự án
 Projects=Các dự án
 Rights=Phân quyền
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=Thứ Hai
 Tuesday=Thứ Ba
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=Bên thứ ba
 SearchIntoContacts=Liên lạc
 SearchIntoMembers=Thành viên
 SearchIntoUsers=Người dùng
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=Mọi người
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Giao cho
diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang
index f4c10fdb03b..10efb77e2ba 100644
--- a/htdocs/langs/vi_VN/margins.lang
+++ b/htdocs/langs/vi_VN/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Tỷ giá phải là một giá trị số
 markRateShouldBeLesserThan100=Đánh dấu suất phải thấp hơn 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 27742e8610b..e9d6d14660c 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=Danh sách thành viên công khai hợp lệ
 ErrorThisMemberIsNotPublic=Thành viên này không được công khai
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Một thành viên khác <b>(tên:% s,</b> đăng <b>nhập:% s)</b> đã được liên kết với một bên thứ <b>ba% s.</b> Hủy bỏ liên kết này đầu tiên bởi vì một bên thứ ba không thể được liên kết với chỉ một thành viên (và ngược lại).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Vì lý do bảo mật, bạn phải được cấp phép để chỉnh sửa tất cả người dùng để có thể liên kết một thành viên cho một người dùng mà không phải là của bạn.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=Nội dung của thẻ thành viên của bạn
 SetLinkToUser=Liên kết đến một người sử dụng Dolibarr
 SetLinkToThirdParty=Liên kết đến một Dolibarr bên thứ ba
 MembersCards=Thành viên danh thiếp
@@ -108,17 +106,33 @@ PublicMemberCard=Thẻ thành viên công cộng
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Tạo mô tả
 ShowSubscription=Hiện mô tả
-SendAnEMailToMember=Gửi email thông tin cho các thành viên
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Nội dung của thẻ thành viên của bạn
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Chủ đề của e-mail nhận được trong trường hợp tự động ghi của khách
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail nhận được trong trường hợp tự động ghi của khách
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Tiêu đề thư điện tử cho thành viên autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=Thư điện tử của thành viên autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=Tiêu đề thư điện tử để xác nhận thành viên
-DescADHERENT_MAIL_VALID=Thư điện tử để xác nhận thành viên
-DescADHERENT_MAIL_COTIS_SUBJECT=Tiêu đề thư điện tử cho mô tả
-DescADHERENT_MAIL_COTIS=Thư điện tử cho mô tả
-DescADHERENT_MAIL_RESIL_SUBJECT=Tiêu đề thư điện tử cho thành viên resiliation
-DescADHERENT_MAIL_RESIL=Thư điện tử của thành viên resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=Tên người gửi thư điện tử cho email tự động
 DescADHERENT_ETIQUETTE_TYPE=Định dạng của trang nhãn
 DescADHERENT_ETIQUETTE_TEXT=Văn bản in trên tờ địa chỉ thành viên
@@ -177,3 +191,8 @@ NoVatOnSubscription=Không TVA cho mô tả
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 3cd0f1420c9..43142e234d5 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=Đối tượng liên quan
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=Bắt đầu tải lên
 CancelUpload=Hủy bỏ tải lên
 FileIsTooBig=Tập tin là quá lớn
 PleaseBePatient=Xin hãy kiên nhẫn ...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=Một yêu cầu thay đổi mật khẩu Dolibarr của bạn đã được nhận
 NewKeyIs=Đây là chìa khóa mới để đăng nhập
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Tiêu đề
 WEBSITE_DESCRIPTION=Mô tả
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/vi_VN/paypal.lang b/htdocs/langs/vi_VN/paypal.lang
index 39f35e08587..600245dc658 100644
--- a/htdocs/langs/vi_VN/paypal.lang
+++ b/htdocs/langs/vi_VN/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 547ebcf03e3..8f87aa0020d 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Sản phẩm hoặc dịch vụ
 ProductsAndServices=Sản phẩm và dịch vụ
 ProductsOrServices=Sản phẩm hoặc dịch vụ
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=Bạn Bạn có chắc chắn muốn xóa dòng sản p
 ProductSpecial=Đặc biệt
 QtyMin=Số lượng tối thiểu
 PriceQtyMin=Giá cho tối SL thiểu này (chưa giảm giá)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=Tỷ lệ thuế GTGT (cho nhà cung cấp/sản phẩm)
 DiscountQtyMin=Giảm giá mặc định cho số lượng
 NoPriceDefinedForThisSupplier=Không có giá/số lượng đã xác định cho nhà cung cấp/sản phẩm
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index e36be7089f9..24f54e275bf 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Liên lạc dự án
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Tất cả dự án
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=Phần xem này hiển thị tất cả các dự án mà bạn được phép đọc.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc.
 ProjectsDesc=Phần xem này hiển thị tất cả các dự án (quyền người dùng cấp cho bạn được phép xem mọi thứ).
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc.
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Khối lượng công việc chưa xác định
 NewTimeSpent=Thời gian đã qua
 MyTimeSpent=Thời gian đã qua của tôi
+BillTime=Bill the time spent
 Tasks=Tác vụ
 Task=Tác vụ
 TaskDateStart=Tác vụ bắt đầu ngày
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=Danh sách hiến tặng liên quan đến dự 
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=Danh sách các hoạt động được gắn với dự án
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Hoạt động của dự án trong tuần này
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=Hoạt động của dự án trong tháng này
 ActivityOnProjectThisYear=Hoạt động của dự án trong năm này
 ChildOfProjectTask=Dự án/tác vụ con
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Không phải chủ dự án cá nhân này
 AffectedTo=Được phân bổ đến
 CantRemoveProject=Dự án này không thể bị xóa bỏ vì nó được tham chiếu đến các đối tượng khác (hóa đơn, đơn hàng hoặc các phần khác). Xem thêm các tham chiếu tab.
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Không thể dịch chuyển ngày của tác vụ theo ngày bắt đầu của dự án mới
 ProjectsAndTasksLines=Các dự án và tác vụ
 ProjectCreatedInDolibarr=Dự án %s đã được tạo
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Tác vụ %s được tạo
 TaskModifiedInDolibarr=Tác vụ %s đã chỉnh sửa
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index af49331558e..72ef27b32b6 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=Đã ký (cần ra hóa đơn)
 PropalStatusNotSigned=Không ký (đã đóng)
 PropalStatusBilled=Đã ra hóa đơn
 PropalStatusDraftShort=Dự thảo
+PropalStatusValidatedShort=Đã xác nhận
 PropalStatusClosedShort=Đã đóng
 PropalStatusSignedShort=Đã ký
 PropalStatusNotSignedShort=Không ký
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index 7c169853984..941078203cf 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index dd004bedf91..be7204a1b9a 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=Sửa kho
 MenuNewWarehouse=Kho mới
 WarehouseSource=Nguồn kho
 WarehouseSourceNotDefined=Không có kho được xác định,
+AddWarehouse=Create warehouse
 AddOne=Thêm một
+DefaultWarehouse=Default warehouse
 WarehouseTarget=Kho tiêu
 ValidateSending=Xóa gửi
 CancelSending=Hủy bỏ việc gửi
@@ -22,6 +24,7 @@ Movements=Danh sách chuyển kho
 ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết
 ListOfWarehouses=Danh sách kho
 ListOfStockMovements=Danh sách chuyển động kho
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/vi_VN/stripe.lang b/htdocs/langs/vi_VN/stripe.lang
index 98b08de8bc4..606c311d600 100644
--- a/htdocs/langs/vi_VN/stripe.lang
+++ b/htdocs/langs/vi_VN/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang
index 74d10d5006b..0c12ab62641 100644
--- a/htdocs/langs/vi_VN/trips.lang
+++ b/htdocs/langs/vi_VN/trips.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - trips
 ShowExpenseReport=Show expense report
-Trips=Expense reports
+Trips=Báo cáo chi tiêu
 TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
@@ -12,7 +12,7 @@ ShowTrip=Show expense report
 NewTrip=New expense report
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Số tiền hoặc km
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 ClassifyRefunded=Phân loại 'hoàn trả'
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 7c0bcd21135..be591fd585c 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -69,8 +69,8 @@ InternalUser=Người dùng bên trong
 ExportDataset_user_1=Người sử dụng và các đặc tính của Dolibarr
 DomainUser=Domain người dùng %s
 Reactivate=Kích hoạt lại
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Quyền được cấp bởi vì được thừa hưởng từ một trong những nhóm của người dùng.
 Inherited=Được thừa kế
 UserWillBeInternalUser=Người dùng tạo ra sẽ là một người dùng nội bộ (vì không liên kết với một bên thứ ba cụ thể)
@@ -93,6 +93,7 @@ NameToCreate=Tên của bên thứ ba để tạo
 YourRole=Vai trò của bạn
 YourQuotaOfUsersIsReached=Hạn ngạch của người dùng hoạt động đã hết!
 NbOfUsers=Nb of users
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=Chỉ có một superadmin có thể hạ bậc một superadmin
 HierarchicalResponsible=Giám sát
 HierarchicView=Xem tính kế thừa
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 48c4414a77b..79ae305e708 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Đọc
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 00589d1c558..b023431d670 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Lệnh thanh toán thấu chi trực tiếp
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Lệnh thanh toán thấu chi trực tiếp
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Để xử lý
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
-NoInvoiceCouldBeWithdrawed=Không có hoá đơn Đã rút thành công. Kiểm tra hóa đơn được trên công ty với một BAN hợp lệ.
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=Phân loại ghi
 ClassCreditedConfirm=Bạn có chắc chắn bạn muốn phân loại nhận thu hồi này là ghi có vào tài khoản ngân hàng của bạn?
 TransData=Ngày truyền
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 7bb1cf3e185..b06536c909b 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -25,8 +25,8 @@ Chartofaccounts=账户图表
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
@@ -149,7 +149,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=文件类型
 Docdate=日期
 Docref=参考
-Code_tiers=合伙人
 LabelAccount=标签帐户
 LabelOperation=Label operation
 Sens=SENS
@@ -169,18 +168,17 @@ DelYear=删除整年
 DelJournal=删除整月
 ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
 FinanceJournal=财务账
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=财务账包括全部银行账户付款类型
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=付款发票的客户
-ThirdPartyAccount=合伙人账户
+ThirdPartyAccount=Third party account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
@@ -220,10 +218,12 @@ ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
 
 ## Admin
 ApplyMassCategories=应用批量类别
@@ -234,13 +234,15 @@ AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Nature=属性
-AccountingJournalType1=Miscellaneous operation
+AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=销售
 AccountingJournalType3=采购
 AccountingJournalType4=银行
 AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -282,6 +284,8 @@ Formula=公式
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=本页不支持设置导出格式
 BookeppingLineAlreayExists=已存在的账簿明细行
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 8cd808df693..d8cb5687b40 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -342,7 +342,7 @@ ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each ye
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=错误，格式掩码中标记 @ 必须与{yy}{mm}或{yyyy}{mm}同时使用。
 UMask=Unix/Linux/BSD 文件系统下新文件的 umask 参数。
 UMaskExplanation=定义服务器上 Dolibarr 创建文件的默认权限(例如上传的文件)。<br>它必须是八进制值(例如，0666就表示人人可读可写)。 <br>此参数对Windows服务器无效。
-SeeWikiForAllTeam=全部行动者及其机构的完整列表参见wiki页面
+SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organization
 UseACacheDelay= 缓存导出响应的延迟时间(0或留空表示禁用缓存)
 DisableLinkToHelpCenter=隐藏登陆页面中的“<b>需要帮助或支持</b>”链接
 DisableLinkToHelp=隐藏在线帮助链接 "<b>%s</b>"
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=设置了基本参考价值的产品的价格
 MassConvert=执行批量转换
 String=字符串
 TextLong=Long text 长文本型
+HtmlText=Html text
 Int=整型
 Float=浮点型
 DateAndTime=日期与小时
@@ -411,6 +412,7 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=连接到项目
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -418,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=已使用资料库以支持生成PDF文件
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=一些国家适用于每个发票行2或3的税。如果是这样的情况下，选择的类型的第二和第三税和其速率。可能的类型有： <br> 1：地方税适用的产品和服务，而增值税（localtax的计算量不含税） <br> 2：地方税适用的产品和服务，包括增值税（localtax的计算量+纳税主体） <br> 3：地方税适用的产品不含增值税（localtax的计算量不含税） <br> 4：地方税适用的产品包括增值税（localtax的计算量+主缸） <br> 5：地方税适用于服务，而增值税（localtax的计算量不含税） <br> 6：地方税适用于服务包括增值税（localtax的计算量+税）
 SMS=短信
 LinkToTestClickToDial=输入一个电话号码来为用户显示网络电话网址测试功能 <strong>%s</strong>
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,6 +470,7 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=用户和组
 Module0Desc=Users / Employees and Groups management
@@ -619,6 +622,8 @@ Module59000Name=利润空间
 Module59000Desc=利润空间管理模块
 Module60000Name=佣金
 Module60000Desc=佣金管理模块
+Module62000Name=国际贸易术语
+Module62000Desc=添加功能来管理国际贸易术语
 Module63000Name=资源
 Module63000Desc=资源管理 (打印机, 车辆, 房间, ...)然后你可以分享到活动中
 Permission11=读取销售账单
@@ -833,11 +838,11 @@ Permission1251=导入大量外部数据到数据库(载入资料)
 Permission1321=导出客户发票、属性及其付款资料
 Permission1322=Reopen a paid bill
 Permission1421=导出客户订单及属性资料
-Permission20001=读取请假申请 (您以及您的下属)
-Permission20002=创建/变更你的请假申请
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=删除请假申请
-Permission20004=读取全部请假申请 (即使用户不是下属)
-Permission20005=创建/变更全体人员的请假申请
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=管理员请假申请 (setup and update balance)
 Permission23001=读取排定任务
 Permission23002=创建/更新排定任务
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=印花税票金额
 DictionaryPaymentConditions=付款条件
 DictionaryPaymentModes=付款方式
 DictionaryTypeContact=联络人/地址类型
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax 指令
 DictionaryPaperFormat=纸张格式
 DictionaryFormatCards=Cards formats
@@ -911,8 +917,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=增值税管理
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=默认情况下，建议的营业税为0，可用于像机构、个人或小型公司。
-VATIsUsedExampleFR=在法国，这意味着这个公司或机构有一个真正的财政体制，这个体制会申报增值税。
-VATIsNotUsedExampleFR=在法国，这意味着在非增值税申报协会或公司、组织或已选择了微型企业的财政体制（VAT特许经营），并支付了特许经营的增值税。此选项将显示参考“Non applicable VAT - art-293B of CGI”的发票。
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=税率
 LocalTax1IsNotUsed=不使用第二税率
@@ -977,7 +983,7 @@ Host=服务器
 DriverType=驱动类型
 SummarySystem=系统信息摘要
 SummaryConst=Dolibarr所有设置参数清单
-MenuCompanySetup=公司/组织
+MenuCompanySetup=Company/Organization
 DefaultMenuManager= 标准菜单管理
 DefaultMenuSmartphoneManager=智能手机菜单管理
 Skin=外观主题
@@ -993,8 +999,8 @@ PermanentLeftSearchForm=常驻左侧菜单搜寻框
 DefaultLanguage=默认语言(语言代码)
 EnableMultilangInterface=启用多语言界面
 EnableShowLogo=左侧菜单中显示LOGO公司标志
-CompanyInfo=公司/组织信息
-CompanyIds=Company/organisation identities
+CompanyInfo=Company/organization information
+CompanyIds=Company/organization identities
 CompanyName=名称
 CompanyAddress=地址
 CompanyZip=邮编
@@ -1049,6 +1055,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=系统信息指以只读方式显示的其它技术信息，只对系统管理员可见。
 SystemAreaForAdminOnly=此区仅供管理员用户使用。Dolibarr 中没有权限可越过此限制。
 CompanyFundationDesc=在本页面输入详细的公司或机构的初始资料 (然后点击页面底部的 "变更" 或 "保存" 按钮)
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
 DisplayDesc=这里可以选择 Dolibarr 外观效果相关的所有参数
 AvailableModules=Available app/modules
 ToActivateModule=要启用模块，请到“设定”区 (首页->设定->模块)。
@@ -1441,6 +1448,9 @@ SyslogFilename=文件名称和路径
 YouCanUseDOL_DATA_ROOT=您可以使用 DOL_DATA_ROOT/dolibarr.log 来表示“documents”目录下的日志文件。您可以设置不同的路径来保存此文件。
 ErrorUnknownSyslogConstant=常量 %s 不是已知的 Syslog 常数
 OnlyWindowsLOG_USER=Windows 仅支持 LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=捐赠模块设置
 DonationsReceiptModel=捐赠收据模板
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=财政税和增值税模块设置
 OptionVatMode=增值税到期
-OptionVATDefault=现金收付制
+OptionVATDefault=Standard basis
 OptionVATDebitOption=权责发生制
 OptionVatDefaultDesc=增值税到期： <br> - 商品完成交货(按账单的时间)<br> - 服务付款
 OptionVatDebitOptionDesc=增值税到期： <br> - 交货/付款商品 (按账单的时间) <br> - 服务的付款明细(借记)发出
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=交货时
 OnPayment=付款时
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=所用账单日期
 Buy=采购
 Sell=销售
 InvoiceDateUsed=所用账单日期
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=销售账户代码
 AccountancyCodeBuy=采购账户代码
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=默认显示列表视图
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index b3e12d08264..6f0ea94d28b 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -53,7 +53,9 @@ MemberValidatedInDolibarr=会员 %s 已验证
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=会员 %s 已删除
-MemberSubscriptionAddedInDolibarr=会员订阅 %s 已添加
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
 ShipmentValidatedInDolibarr=运输 %s 已验证
 ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
@@ -97,7 +99,8 @@ AgendaUrlOptions1=您还可以添加以下参数来筛选输出：
 AgendaUrlOptions3=<b>logina=%s</b> 限制输出到用户所拥有的动作 <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> 限制输出到项目相关的操作\n <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=显示联系人生日
 AgendaHideBirthdayEvents=隐藏联系人生日
 Busy=忙碌
@@ -109,7 +112,7 @@ ExportCal=导出日历
 ExtSites=导入外部日历
 ExtSitesEnableThisTool=显示外部日历(定义为全球设置)到议程。不影响由用户定义的外部日历。 
 ExtSitesNbOfAgenda=日历数
-AgendaExtNb=日历NB %s
+AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL来访问。iCal文件
 ExtSiteNoLabel=无说明
 VisibleTimeRange=可见时间范围
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 0f2c011d2ce..52ce5935291 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -67,6 +67,7 @@ PaidBack=已退款
 DeletePayment=删除付款
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=供应商付款
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=收到客户付款
@@ -91,7 +92,7 @@ PaymentAmount=付款金额
 ValidatePayment=确认付款
 PaymentHigherThanReminderToPay=付款金额比需要支付的金额高
 HelpPaymentHigherThanReminderToPay=注意，一个或更多的票据付款金额比其他支付更高。 <br>编辑您的进入，否则确认并考虑建立一个每个多缴发票收到超出信用注记。
-HelpPaymentHigherThanReminderToPaySupplier=注意，一笔或多笔帐单的支付额超过了应付额。<br>修改你的支付，否则确认。
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=归类为 已支付
 ClassifyPaidPartially=归类分 部分支付
 ClassifyCanceled=归类为 已丢弃
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=转换到未来的折扣
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=输入从客户收到的付款
 EnterPaymentDueToCustomer=为客户创建付款延迟
 DisabledBecauseRemainderToPayIsZero=禁用，因为未支付金额为0
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=草案(需要确认)
 BillStatusPaid=已支付
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=已支付 (等待最终发票)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=已丢弃
 BillStatusValidated=已确认 (需要付款)
 BillStatusStarted=开始
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=待办
 AmountExpected=索赔额
 ExcessReceived=找零
+ExcessPaid=Excess paid
 EscompteOffered=折扣额 (付款条件前付款)
 EscompteOfferedShort=折扣
 SendBillRef=发票 %s  的提交
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=从信用记录折扣 %s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=这种信用值可以在发票被确认前使用
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=新的绝对折扣
 NewRelativeDiscount=新的相对折扣
+DiscountType=Discount type
 NoteReason=备注/原因
 ReasonDiscount=原因
 DiscountOfferedBy=授予人
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=账单地址
 HelpEscompte=这是给予客户优惠折扣，因为客户在付款条件日期前已经付清全款。
 HelpAbandonBadCustomer=这一数额已被放弃（客户说是一个坏的客户），并作为一个特殊的松散考虑。
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=发票生成最大数量
-NbOfGenerationDone=发票生成数量已经存在
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=最大数量代达到
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index f1fb24fb62b..152ea33343c 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -43,7 +43,8 @@ Individual=私营个体
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=母公司
 Subsidiaries=附属公司
-ReportByCustomers=客户报表
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=按报表等级
 CivilityCode=文明守则
 RegisteredOffice=注册给办公室
@@ -75,10 +76,12 @@ Town=城市
 Web=网站
 Poste= 位置
 DefaultLang=默认语言
-VATIsUsed=含增值税
-VATIsNotUsed=不含增值税
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=合伙人无论客户或供应商，都没有对象可参考
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=报价
 OverAllOrders=订单
@@ -239,7 +242,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,24 +258,34 @@ ProfId1DZ=钢筋混凝土
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=增值税号码
-VATIntraShort=增值税号码
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=语法是有效的
+VATReturn=VAT return
 ProspectCustomer=准客户/客户
 Prospect=准客户
 CustomerCard=客户信息
 Customer=客户
 CustomerRelativeDiscount=相对客户折扣
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=相对折扣
 CustomerAbsoluteDiscountShort=绝对优惠
 CompanyHasRelativeDiscount=这个客户有一个<b>%s的%%</b>的折扣
 CompanyHasNoRelativeDiscount=此客户没有默认相对折扣
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=此客户仍然有信用票据<b>或s%%s</b>的前存款
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=此客户没有提供贴息贷款
-CustomerAbsoluteDiscountAllUsers=绝对优惠（所有用户授予）
-CustomerAbsoluteDiscountMy=绝对优惠（由自己授予）
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=无
 Supplier=供应商
 AddContact=创建联系人
@@ -377,9 +390,9 @@ NoDolibarrAccess=没有Dolibarr访问
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=联系人和特征
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=联系人/地址 (是否合伙人) 及属性
-ImportDataset_company_3=银行的详细资料
-ImportDataset_company_4=第三方/销售代表(影响销售代表用户对公司的销售代表)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=价格级别
 DeliveryAddress=送货地址
 AddAddress=添加地址
@@ -406,15 +419,16 @@ ProductsIntoElements= %s 的中产品/服务列表
 CurrentOutstandingBill=当前优质账单
 OutstandingBill=优质账单最大值
 OutstandingBillReached=已达到最大优质账单值
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=返回格式%syymm为客户代码以及%syymm -○○○○供应商代码其中YY是年numero，MM是月，nnnn是一个没有休息，没有为0返回序列。
 LeopardNumRefModelDesc=客户/供应商代码是免费的。此代码可以随时修改。
 ManagingDirectors=公司高管(s)称呼 (CEO, 董事长, 总裁...)
 MergeOriginThirdparty=重复第三方(第三方要删除)
 MergeThirdparties=合并合伙人
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=合伙人已合并
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=销售代表登陆
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=有一个错误，当删除第三方。请检查日志。改变已被恢复。
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index ca0acd5e22e..0062da8d52f 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -31,7 +31,7 @@ Credit=贷方
 Piece=会计文档.
 AmountHTVATRealReceived=净收入
 AmountHTVATRealPaid=净支出
-VATToPay=销售增值税
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF付款
 VATPayment=销售税款
 VATPayments=销售税款
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=社会/财政税款
 ShowVatPayment=显示增值税纳税
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- 它包括所有从客户收到发票有效付款。 <br> - 这是对这些发票的付款日期为基础<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=按合伙人IRPF的报表
-LT1ReportByCustomersInInputOutputModeES=按合伙人 RE 报表
-VATReport=VAT报告
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=按合伙人 RE 报表
+LT2ReportByCustomersES=按合伙人IRPF的报表
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=每客户增值税征收和支付的报表
-VATReportByCustomersInDueDebtMode=每客户增值税报表征收和支付的报表
-VATReportByQuartersInInputOutputMode=按征收和支出的增值税率的报表
-LT1ReportByQuartersInInputOutputMode=按RE税率报告
-LT2ReportByQuartersInInputOutputMode=按 IRPF 税率报告
-VATReportByQuartersInDueDebtMode=按征收和支出的增值税率的报表
-LT1ReportByQuartersInDueDebtMode=按RE税率报告
-LT2ReportByQuartersInDueDebtMode=按 IRPF 税率报告
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=按RE税率报告
+LT2ReportByQuartersES=按 IRPF 税率报告
 SeeVATReportInInputOutputMode=见报告<b>%sVAT装箱%S</b>的标准计算
 SeeVATReportInDueDebtMode=见报告<b>流量%%sVAT S上</b>的流量计算与一选项
 RulesVATInServices=- 对于服务，该报告包括实际收到或发出的付款日期的基础上规定的增值税。
-RulesVATInProducts=- 对于重大资产，它包括增值税专用发票发票日期的基础上。
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- 对于服务，该报告包括增值税专用发票，根据发票日期到期，缴纳或者未。
-RulesVATDueProducts=- 对于重大资产，它包括增值税专用发票，根据发票日期。
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=注：对于实物资产，它应该使用的交货日期将更加公平。
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/发票
 NotUsedForGoods=未使用的货物
 ProposalStats=报价单统计
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=计算模式
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=错误：银行账号未发现
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 31bae3a7142..b0b151ccf45 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -43,7 +43,7 @@ CronNoJobs=没有工作注册
 CronPriority=优先级
 CronLabel=标签
 CronNbRun=运行编号
-CronMaxRun=最大运行编号
+CronMaxRun=Max number launch
 CronEach=每
 JobFinished=工作启动和完成
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=工作类型
 CronType_method=Call method of a PHP Class
 CronType_command=命令行
-CronCannotLoadClass=无法加载 class %s 或对象 %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=请到菜单 "主页 - 管理员工具 - 计划任务" 查看和修改计划任务。
 JobDisabled=岗位无效
 MakeLocalDatabaseDumpShort=本地数据库备份
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 8ec17498cca..1df6a6feb47 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
 ErrorLDAPMakeManualTest=甲。LDIF文件已经生成在目录%s的尝试加载命令行手动有更多的错误信息。
 ErrorCantSaveADoneUserWithZeroPercentage=无法储存与行动“规约未启动”如果领域“做的”，也是填补。
 ErrorRefAlreadyExists=号的创作已经存在。
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=不能删除记录。它已被使用或者包含在其他对象中。
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
 ErrorNewValueCantMatchOldValue=新价值不能等于旧的价值
 ErrorFailedToValidatePasswordReset=重新初始化密码密码失败。重新初始化密码已经完成(该链接可以只用一次)。如果没有，请尝试重新启动初始化过程。
-ErrorToConnectToMysqlCheckInstance=连接到数据库失败。检查MySQL服务器运行(在大多数情况下，您可以启动'sudo /etc/init.d/mysql start'的命令行)。
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=无法添加联系人
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/zh_CN/loan.lang b/htdocs/langs/zh_CN/loan.lang
index 7db166dbb1a..e71195d1390 100644
--- a/htdocs/langs/zh_CN/loan.lang
+++ b/htdocs/langs/zh_CN/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=货款模块设置
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 5f0ea4dcdfe..3a2361fb308 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=结果邮件群发
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=最小值
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 342ffafee65..408def9d9bb 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=不是定义的参数%
 ErrorUnknown=未知错误
 ErrorSQL=SQL错误
 ErrorLogoFileNotFound=徽标LOGO文件'%s'没有找到
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=前往模块设置来解决此
 ErrorFailedToSendMail=无法发送邮件（发件人=%s后，接收器=%s）的
 ErrorFileNotUploaded=文件没有上传。检查大小不超过允许的最大值，即在磁盘上的可用空间是可用和有没有这已经与in这个目录同名文件。
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=错误，没有增值税税率确定为国
 ErrorNoSocialContributionForSellerCountry=错误, 这个国家未定义社会/财政税类型 '%s'.
 ErrorFailedToSaveFile=错误，无法保存文件。
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=设置日期
 SelectDate=请选择日期
 SeeAlso=另请参阅 %s
 SeeHere=看这里
+ClickHere=点击这里
+Here=Here
 Apply=申请
 BackgroundColorByDefault=默认的背景颜色
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=链接
 Select=请选取
 Choose=选择
 Resize=调整大小
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=操作者
 User=用户
@@ -325,8 +328,10 @@ Default=默认
 DefaultValue=默认值
 DefaultValues=默认值
 Price=价格
+PriceCurrency=Price (currency)
 UnitPrice=单价
 UnitPriceHT=单位价格（净值）
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=单价
 PriceU=向上
 PriceUHT=不含税价格
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (货币)
 PriceUTTC=U.P. (inc. tax)
 Amount=金额
 AmountInvoice=发票金额
+AmountInvoiced=Amount invoiced
 AmountPayment=付款金额
 AmountHTShort=金额（净值）
 AmountTTCShort=金额(含税)
@@ -353,6 +359,7 @@ AmountLT2ES=IRPF 额
 AmountTotal=总金额
 AmountAverage=平均金额
 PriceQtyMinHT=价格数量分钟。 （税后）
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=百分比
 Total=总计
 SubTotal=小计
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=增值税率
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=平均
 Sum=总和
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=已完成
 ActionUncomplete=未完成
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=公司/组织信息
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=合伙人联系方式
 ContactsAddressesForCompany=这个合伙人联系人/地址
 AddressesForCompany=这个合伙人的地址
@@ -427,6 +437,9 @@ ActionsOnCompany=关于这个合伙人的动作
 ActionsOnMember=此会员相关活动
 ActionsOnProduct=Events about this product
 NActionsLate=逾期 %s
+ToDo=未完成
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=申请已记录
 Filter=筛选
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=警告，你是在维护模式，因此，目前
 CoreErrorTitle=系统错误
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=信用卡
+ValidatePayment=确认付款
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=与<b>%或学科</b>是强制性
 FieldsWithIsForPublic= 公开显示<b>%s</b> 域的成员列表。如果你不想要这个，检查“公共”框。
 AccordingToGeoIPDatabase=（根据geoip的转换）
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=关联项目
 ClassifyBilled=归为已付款
+ClassifyUnbilled=Classify unbilled
 Progress=进展
-ClickHere=点击这里
 FrontOffice=前台
 BackOffice=后台
 View=查看
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=项目
 Projects=项目
 Rights=权限
+LineNb=Line no.
+IncotermLabel=国际贸易术语解释通则
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=全体同仁
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=分配给
diff --git a/htdocs/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang
index af970f53685..46f38d29bf1 100644
--- a/htdocs/langs/zh_CN/margins.lang
+++ b/htdocs/langs/zh_CN/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=税率必须为数字值
 markRateShouldBeLesserThan100=Mark rate 将低于 100
 ShowMarginInfos=显示利润信息
 CheckMargins=利润明细
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 6e527e863fa..a8b551ae323 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=公共认证会员列表
 ErrorThisMemberIsNotPublic=该会员不公开
 ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员 (名称： <b>%s</b> ，登陆： <b>%s</b>) 是已链接到合伙人<b>%s</b>。首先删除这个链接，因为一个合伙人不能被链接到只有一个成员(反之亦然)。
 ErrorUserPermissionAllowsToLinksToItselfOnly=出于安全原因，您必须被授予权限编辑所有用户能够连接到用户的成员是不是你的。
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=内容您的会员卡
 SetLinkToUser=用户链接到Dolibarr
 SetLinkToThirdParty=链接到Dolibarr合伙人
 MembersCards=会员名片
@@ -108,17 +106,33 @@ PublicMemberCard=公共会员信息
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=创建订阅
 ShowSubscription=显示订阅
-SendAnEMailToMember=向会员发送信息的电子邮件
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=内容您的会员卡
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=收到的电子邮件的主题的情况下自动的嘉宾题词
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=电子邮件收到的情况下，自动的客户题词
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=会员自动订阅邮件主题
-DescADHERENT_AUTOREGISTER_MAIL=会员自动订阅邮件
-DescADHERENT_MAIL_VALID_SUBJECT=会员认证邮件主题
-DescADHERENT_MAIL_VALID=会员认证邮件
-DescADHERENT_MAIL_COTIS_SUBJECT=订阅邮件主题
-DescADHERENT_MAIL_COTIS=订阅邮件
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=自动发送邮件
 DescADHERENT_ETIQUETTE_TYPE=标签纸的格式
 DescADHERENT_ETIQUETTE_TEXT=文本打印会员地址表
@@ -177,3 +191,8 @@ NoVatOnSubscription=没有增值税订阅
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=产品使用发票明细订阅列表: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 050d67b998d..c5090dd8387 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=讯息验证支付返回页面
 MessageKO=取消支付返回页面的讯息
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=链接对象
 NbOfActiveNotifications=通知数量(收到邮件数量)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=开始上传
 CancelUpload=取消上传
 FileIsTooBig=文件过大
 PleaseBePatient=请耐心等待...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=已收到你的Dolibarr密码修改申请
 NewKeyIs=你的新登陆码如上
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=页面URL地址
 WEBSITE_TITLE=标题
 WEBSITE_DESCRIPTION=描述
 WEBSITE_KEYWORDS=关键字
+LinesToImport=Lines to import
diff --git a/htdocs/langs/zh_CN/paypal.lang b/htdocs/langs/zh_CN/paypal.lang
index 2c64825327e..1885ad3f6e6 100644
--- a/htdocs/langs/zh_CN/paypal.lang
+++ b/htdocs/langs/zh_CN/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=支付宝
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=这是交易编号<b>：%s</b>
 PAYPAL_ADD_PAYMENT_URL=当你邮寄一份文件，添加URL Paypal付款
-PredefinedMailContentLink=您可以点击下面的安全链接，使您的​​支付宝(PayPal)，如果它不是已经完成。⏎⏎ %s ⏎⏎.
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=错误代码
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 46bbaeb1c2f..f5c0347d047 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=产品或服务
 ProductsAndServices=产品和服务
 ProductsOrServices=产品或服务
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=您确定要删除这行产品吗？
 ProductSpecial=Special
 QtyMin=起订量
 PriceQtyMin=最小数量价格 (w/o 折扣)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=(产品/供应商)增值税税率
 DiscountQtyMin=默认数量折扣
 NoPriceDefinedForThisSupplier=此供应商/产品未设置价格/数量
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index cd9c97360b2..d36f70f7bb7 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=项目联系人
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=所有项目
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=这种观点提出了所有你被允许阅读的项目。
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=这种观点提出的所有项目，您可阅读任务。
 ProjectsDesc=这种观点提出的所有项目（你的用户权限批准你认为一切）。
 TasksOnProjectsDesc=This view presents all tasks on 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.
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=已关闭的项目是不可见的。
 TasksPublicDesc=这种观点提出的所有项目，您可阅读任务。
@@ -55,6 +55,7 @@ TasksOnOpenedProject=打开项目任务
 WorkloadNotDefined=工作量没有定义
 NewTimeSpent=所花费的时间
 MyTimeSpent=我的时间花
+BillTime=Bill the time spent
 Tasks=任务
 Task=任务
 TaskDateStart=任务开始日期
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=项目相关捐款列表
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=项目有关的行动列表
 ListTaskTimeUserProject=项目相关任务时间列表
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=本周项目活动
@@ -98,6 +100,7 @@ ActivityOnProjectThisMonth=本月项目活动
 ActivityOnProjectThisYear=今年项目活动
 ChildOfProjectTask=子项目/任务
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=不是所有者的私人项目
 AffectedTo=分配给
 CantRemoveProject=这个项目不能删除，因为它是由一些(其他对象引用的发票，订单或其他)。见参照资料标签。
@@ -137,6 +140,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=根据新项目的开始日期，不可能的改变任务日期
 ProjectsAndTasksLines=项目和任务
 ProjectCreatedInDolibarr=项目 %s  创建
+ProjectValidatedInDolibarr=Project %s validated
 ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=任务 %s 已创建
 TaskModifiedInDolibarr=任务 %s 已变更
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index 6a63e9c1243..c39f5df8870 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=已签署(待付款)
 PropalStatusNotSigned=未签署(已关闭)
 PropalStatusBilled=已到账
 PropalStatusDraftShort=草稿
+PropalStatusValidatedShort=已确认
 PropalStatusClosedShort=已禁用
 PropalStatusSignedShort=已签署
 PropalStatusNotSignedShort=未签署
diff --git a/htdocs/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang
index 5eb73f9da8e..eb468b19b4c 100644
--- a/htdocs/langs/zh_CN/salaries.lang
+++ b/htdocs/langs/zh_CN/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 5ee821d823f..6d0b194265b 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=变更仓库
 MenuNewWarehouse=新建仓库
 WarehouseSource=来源仓
 WarehouseSourceNotDefined=没有定义仓库，
+AddWarehouse=Create warehouse
 AddOne=添加
+DefaultWarehouse=Default warehouse
 WarehouseTarget=目标仓
 ValidateSending=删除发送
 CancelSending=取消发送
@@ -22,6 +24,7 @@ Movements=运动
 ErrorWarehouseRefRequired=仓库引用的名称是必需的
 ListOfWarehouses=仓库列表
 ListOfStockMovements=库存调拨列表
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/zh_CN/stripe.lang b/htdocs/langs/zh_CN/stripe.lang
index 13e0d0fd21b..2809d73f9e6 100644
--- a/htdocs/langs/zh_CN/stripe.lang
+++ b/htdocs/langs/zh_CN/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
index 2824ff23324..b50eb4d6ad3 100644
--- a/htdocs/langs/zh_CN/trips.lang
+++ b/htdocs/langs/zh_CN/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=显示费用报表
 NewTrip=新建费用报表
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=金额或公里
 DeleteTrip=删除费用报表
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=等待审批
 ExpensesArea=费用报表区
 ClassifyRefunded=归类 '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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=费用报表ID号
 AnyOtherInThisListCanValidate=通知人确认。
 TripSociete=公司资料信息
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index 51fa8218d77..eed0db58ddf 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -69,8 +69,8 @@ InternalUser=内部用户
 ExportDataset_user_1=Dolibarr的用户和属性
 DomainUser=域用户%s
 Reactivate=重新激活
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=因为从权限授予一个用户的一组继承。
 Inherited=遗传
 UserWillBeInternalUser=创建的用户将是一个内部用户(因为没有联系到一个特定的合伙人)
@@ -93,6 +93,7 @@ NameToCreate=创建合伙人名称
 YourRole=您的角色
 YourQuotaOfUsersIsReached=你的活跃用户达到配额！
 NbOfUsers=用户数量
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=只有超级管理员可以降级超级管理员
 HierarchicalResponsible=超级管理员
 HierarchicView=分层视图
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index d8b6611b29c..beca972780b 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=删除网址
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=页面名字/别名
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=外部CSS文件的URL地址
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=在新标签页查看页面
 SetAsHomePage=设为首页
 RealURL=真实URL地址
 ViewWebsiteInProduction=使用主页URL网址查看网页
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=阅读
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 6c9c0b8725c..714d36956c2 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=要处理
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=合伙人银行账号
-NoInvoiceCouldBeWithdrawed=没有发票withdrawed成功。检查发票的公司是一个有效的禁令。
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=分类记
 ClassCreditedConfirm=你确定要分类这一撤离收据上记入您的银行帐户？
 TransData=数据传输
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=按状态明细统计
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 9fdd5f5e31a..c013c65bd55 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -1,292 +1,296 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_SEPARATORCSV=匯出檔案的欄位分隔字元
 ACCOUNTING_EXPORT_DATE=匯出檔案日期格式
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_FORMAT=Select the format for the file
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journalization=Journalization
-Journaux=Journals
-JournalFinancial=Financial journals
-BackToChartofaccounts=Return chart of accounts
-Chartofaccounts=Chart of accounts
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
-OtherInfo=Other information
-DeleteCptCategory=Remove accounting account from group
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
-JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
-DetailByAccount=Show detail by account
-AccountWithNonZeroValues=Accounts with non zero values
-ListOfAccounts=List of accounts
+ACCOUNTING_EXPORT_PIECE=匯出數量
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=全域會計項目匯出
+ACCOUNTING_EXPORT_LABEL=匯出標籤
+ACCOUNTING_EXPORT_AMOUNT=匯出金額
+ACCOUNTING_EXPORT_DEVISE=匯出幣別
+Selectformat=選擇檔案格式
+ACCOUNTING_EXPORT_FORMAT=選擇檔案格式
+ACCOUNTING_EXPORT_ENDLINE=選擇退回類型
+ACCOUNTING_EXPORT_PREFIX_SPEC=指定檔案的前面固定字元
+ThisService=此服務
+ThisProduct=此產品
+DefaultForService=服務的預設
+DefaultForProduct=產品的預設
+CantSuggest=不能建議
+AccountancySetupDoneFromAccountancyMenu=從%s選單的多數會計設定已完成
+ConfigAccountingExpert=會計專業模組的偏好設定
+Journalization=日記簿
+Journaux=各式日記簿
+JournalFinancial=各式財務日記簿
+BackToChartofaccounts=回到會計項目表
+Chartofaccounts=會計項目表
+CurrentDedicatedAccountingAccount=現在專用帳戶
+AssignDedicatedAccountingAccount=新帳戶指定給
+InvoiceLabel=發票標籤
+OverviewOfAmountOfLinesNotBound=行數的金額未關聯到會計項目的概況
+OverviewOfAmountOfLinesBound=行數的金額已關聯到會計項目的概況
+OtherInfo=其他資訊
+DeleteCptCategory=從大類中移除會計項目
+ConfirmDeleteCptCategory=您確定要從會計項目大類中移除會計項目
+JournalizationInLedgerStatus=日記簿狀況
+AlreadyInGeneralLedger=在總帳中準備好記錄
+NotYetInGeneralLedger=尚未記錄到總帳
+GroupIsEmptyCheckSetup=大類是空的。檢查個人化會計大類的設定。
+DetailByAccount=依會計項目顯示詳細資料
+AccountWithNonZeroValues=非零值的會計項目
+ListOfAccounts=會計項目清單
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForCustomersNotDefined=設定中客戶的主要會計項目未定義
+MainAccountForSuppliersNotDefined=設定中供應商的主要會計項目未定義
+MainAccountForUsersNotDefined=設定中用戶的主要會計項目未定義
+MainAccountForVatPaymentNotDefined=設定中營業稅的應繳金額的主要會計項目未定義
 
-AccountancyArea=Accountancy area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=會計區
+AccountancyAreaDescIntro=使用會計模組需要以下步驟：
+AccountancyAreaDescActionOnce=接下來的動作通常只做一次或一年做一次…
+AccountancyAreaDescActionOnceBis=下一步驟為當製作日記簿(記錄到日記帳簿及總分類帳)時，建議由預設會計項目以節省您的時間。
+AccountancyAreaDescActionFreq=接下來的動作在大公司一般是每月、每週或每天的做…
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
-AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+AccountancyAreaDescJournalSetup=步驟%s: 從選單中建立或檢查您日記簿內容清單%s
+AccountancyAreaDescChartModel=步驟%s:從%s選單建立會計項目表模組
+AccountancyAreaDescChart=步驟%s: 從選單中建立或檢查會計項目表的內容%s。
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescVat=步驟%s: 定義每一項營業稅率的預設會計項目。可使用選單輸入%s。
+AccountancyAreaDescExpenseReport=步驟%s: 定義每一費用報表類型的預設會計項目。可使用選單輸入%s。
+AccountancyAreaDescSal=步驟%s: 定義薪資付款的預設會計項目。可使用選單輸入%s。
+AccountancyAreaDescContrib=步驟%s: 定義特定費用(雜項稅捐)的預設會計項目。可使用選單輸入%s。
+AccountancyAreaDescDonation=步驟%s: 定義捐款的預設會計項目。可使用選單輸入%s。
+AccountancyAreaDescMisc=步驟%s:針對雜項交易定義必要的預設帳戶及預設會計項目。可使用選單輸入%s。
+AccountancyAreaDescLoan=步驟%s:定義借款的預設會計項目。可使用選單輸入%s。
+AccountancyAreaDescBank=步驟%s: 定義每家銀行及財務帳戶的預設會計項目及日記簿代號。可使用選單輸入%s。
+AccountancyAreaDescProd=定義%s: 對您的產品及服務定義會計項目。可使用選單輸入%s。
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=步驟%s: 檢查已存在%s行數與會計項目關聯性，所以程式可以一鍵在總帳中記錄交易。完成缺少的關聯。可使用選單輸入%s。
+AccountancyAreaDescWriteRecords=步驟 %s :將交易填入總帳。可到選單 <strong>%s </strong>, 點選按鈕 <strong>%s</strong>。
+AccountancyAreaDescAnalyze=步驟%s:新增或編輯已有交易及產生報表與輸出。
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=步驟%s:關帳，所以之後無法修改。
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-AccountAccountingShort=Account
-SubledgerAccount=Subledger Account
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
+TheJournalCodeIsNotDefinedOnSomeBankAccount=設定中必要設定未完成(全部銀行帳戶沒有定義會計代號的日記簿)
+Selectchartofaccounts=選擇可用的會計項目表
+ChangeAndLoad=修改及載入
+Addanaccount=新增會計項目
+AccountAccounting=會計項目
+AccountAccountingShort=會計
+SubledgerAccount=明細分類帳會計項目
+ShowAccountingAccount=顯示會計項目
+ShowAccountingJournal=顯示會計日記簿
+AccountAccountingSuggest=建議的會計項目
+MenuDefaultAccounts=預設會計項目
 MenuBankAccounts=銀行帳戶
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-ProductsBinding=Products accounts
-Ventilation=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
-Bookkeeping=Ledger
-AccountBalance=Account balance
+MenuVatAccounts=營業稅會計項目
+MenuTaxAccounts=稅捐會計項目
+MenuExpenseReportAccounts=費用報表會計項目
+MenuLoanAccounts=借款會計項目
+MenuProductsAccounts=產品會計項目
+ProductsBinding=產品會計項目
+Ventilation=關聯到各式會計項目
+CustomersVentilation=客戶發票的關聯
+SuppliersVentilation=供應商發票的關聯
+ExpenseReportsVentilation=費用報表的關聯
+CreateMvts=建立新的交易
+UpdateMvts=交易的修改
+ValidTransaction=驗證交易
+WriteBookKeeping=在總帳中記錄交易
+Bookkeeping=總帳
+AccountBalance=項目餘額
 ObjectsRef=Source object ref
-CAHTF=Total purchase supplier before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
+CAHTF=稅前總採購供應商
+TotalExpenseReport=總費用報表
+InvoiceLines=關聯的各式發票
+InvoiceLinesDone=已關聯的各式發票
+ExpenseReportLines=費用報表關聯數
+ExpenseReportLinesDone=已關連的費用報表
+IntoAccount=會計項目的關聯
 
 
-Ventilate=Bind
-LineId=Id line
-Processing=Processing
-EndProcessing=Process terminated.
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+Ventilate=關聯
+LineId=ID行
+Processing=處理中
+EndProcessing=中止處理
+SelectedLines=選擇線條
+Lineofinvoice=發票線
+LineOfExpenseReport=費用報表行
+NoAccountSelected=沒有選定會計項目
+VentilatedinAccount=會計項目綁定成功
+NotVentilatedinAccount=不受會計項目約束
+XLineSuccessfullyBinded=%s 產品/服務成功地指定會計項目
+XLineFailedToBeBinded=%s 產品/服務沒指定任何會計項目
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=每頁顯示筆數(建議最大: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=待綁定，依最新的排序
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=完成綁定，依最新的排序
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_LENGTH_DESCRIPTION=在產品及服務清單中描述在第 x 字元 ( 最佳為 50 ) 後會被截掉
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=產品及服務會計項目清單中描述表單中第 x 字元 ( 最佳為 50 )後會被截掉
+ACCOUNTING_LENGTH_GACCOUNT=會計項目的長度(如果設定為 6，會計項目為706，則會變成 706000)
+ACCOUNTING_LENGTH_AACCOUNT=合作方會計項目長度(如果設定為 6，會計項目為 401，則會變成 401000)
+ACCOUNTING_MANAGE_ZERO=允許管理會計項目尾數的不同零值。某些國家有此需求(如瑞士)。若為off(預設)，則您可設定2個接下來的參數，要求程式增加虛擬零值。
+BANK_DISABLE_DIRECT_INPUT=不啟用在銀行帳戶中直接記錄交易
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=銷貨簿
+ACCOUNTING_PURCHASE_JOURNAL=進貨簿
+ACCOUNTING_MISCELLANEOUS_JOURNAL=其他日記簿
+ACCOUNTING_EXPENSEREPORT_JOURNAL=費用日記簿
+ACCOUNTING_SOCIAL_JOURNAL=交際/社交會計項目
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=過帳的會計項目
+ACCOUNTING_ACCOUNT_SUSPENSE=等待的會計項目
+DONATION_ACCOUNTINGACCOUNT=註冊捐款的會計項目
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=預設已購產品的會計項目(如果在產品頁沒有定義時使用)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=預設已售產品的會計項目(如果在產品頁沒有定義時使用)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=委外服務預設會計項目(若沒在服務頁中定義時使用)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=服務收入預設會計項目(若沒在服務頁中定義時使用)
 
-Doctype=Type of document
-Docdate=Date
+Doctype=文件類型
+Docdate=日期
 Docref=Reference
-Code_tiers=Thirdparty
-LabelAccount=Label account
-LabelOperation=Label operation
+LabelAccount=標籤會計項目
+LabelOperation=標籤操作
 Sens=Sens
-Codejournal=Journal
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
-ByYear=在今年
-NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-DelBookKeeping=Delete record of the Ledger
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
-CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
-ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+Codejournal=日記簿
+NumPiece=件數
+TransactionNumShort=交易編號
+AccountingCategory=個人化群組
+GroupByAccountAccounting=依會計項目編類
+AccountingAccountGroupsDesc=您可定義某些會計項目大類。他們可以在個人化會計報表中使用。
+ByAccounts=依會計項目
+ByPredefinedAccountGroups=依大類
+ByPersonalizedAccountGroups=依個人化大類
+ByYear=依年度
+NotMatch=未設定
+DeleteMvt=刪除總帳行
+DelYear=刪除年度
+DelJournal=刪除日記簿
+ConfirmDeleteMvt=將會刪除此年度總帳且/或從指定日記簿中的全部行數。至少需要一項標準。
+ConfirmDeleteMvtPartial=將會從總帳中刪除交易(與相同交易的行數會被刪除)
+FinanceJournal=財務日記簿
+ExpenseReportsJournal=費用報表日記簿
+DescFinanceJournal=財務日記簿包含由銀行帳戶支出的全部付款資料。
+DescJournalOnlyBindedVisible=檢視此記錄的已關聯的會計項目及總帳的記錄
+VATAccountNotDefined=營業稅(VAT)會計項目未定義
+ThirdpartyAccountNotDefined=合作方的會計項目未定義
+ProductAccountNotDefined=產品會計項目未定義
+FeeAccountNotDefined=費用的會計項目未定義
+BankAccountNotDefined=銀行帳戶沒有定義
+CustomerInvoicePayment=客戶發票的付款
+ThirdPartyAccount=合作方會計項目
+NewAccountingMvt=新交易
+NumMvts=交易筆數
+ListeMvts=移動清單
+ErrorDebitCredit=借方金額不等貸方金額
+AddCompteFromBK=新增各式會計項目到大類
+ReportThirdParty=合作方會計項目清單
+DescThirdPartyReport=在此查閱合作方中客戶及供應商名單及其的各式會計項目
+ListAccounts=各式會計項目清單
+UnknownAccountForThirdparty=未知合作方會計項目。我們將使用%s
+UnknownAccountForThirdpartyBlocking=未知合作方會計項目。阻止錯誤
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=未知合作方會計項目及等待會計項目未定義。阻止錯誤
 
-Pcgtype=Group of account
-Pcgsubtype=Subgroup of account
-PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+Pcgtype=會計項目大類
+Pcgsubtype=會計項目中類
+PcgtypeDesc=某些會計報表在使用會計的大類及中類時，是使用預先定的"篩選"及"分類"準則。例如，針對產品建立費用/收入報表的會計項目中的"收入"或"費用"，其使用大類。
 
-TotalVente=Total turnover before tax
-TotalMarge=Total sales margin
+TotalVente=稅前總周轉
+TotalMarge=總銷貨淨利
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=在此查閱客戶發票清單是否關聯到產品會計項目
+DescVentilMore=在多數案例中，若你預先設定產品或服務，且在產品/服務卡片中您設定會計項目，只要一按一鍵<strong>"%s"</strong>，程式會關聯到您的發票及會計項目表的會計項目。若在產品/服務卡片中沒有設定會計項目，或若你仍有些行數未關聯到任何會計項目，您必須從選單 "<strong>%s</strong>"中進行人工關聯。
+DescVentilDoneCustomer=在此查閱已開立各式發票客戶的清單及其產品會計項目
+DescVentilTodoCustomer=關聯發票沒有關聯到產品會計項目
+ChangeAccount=用以下會計項目變更產品/服務的會計項目：
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=在此查閱供應商發票關聯或未關聯到產品會計項目的清單
+DescVentilDoneSupplier=在此查閱已開立發票供應商的清單及其會計項目
+DescVentilTodoExpenseReport=關聯費用報表行數還沒準備好要關聯費用會計項目
+DescVentilExpenseReport=在此查閱費用報表行數是否關聯到費用會計項目的清單
+DescVentilExpenseReportMore=若您在費用報表行數的類別設定會計項目，只要按一鍵<strong>"%s"</strong>，程式將會在您費用報表行及會計項目表的會計項目中進行關聯。若在費用目錄中會計項目未設定，或您仍有某些行數沒有關聯到任何會計項目，您要在選單 "<strong>%s</strong>" 中人工進行關聯。
+DescVentilDoneExpenseReport=在此查閱費用報表的清單及其費用會計項目。
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=自動地關聯
+AutomaticBindingDone=自動關聯已完成
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
-NoNewRecordSaved=No more record to journalize
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
+ErrorAccountancyCodeIsAlreadyUse=錯誤，您不能刪除此會計項目，因為已使用
+MvtNotCorrectlyBalanced=移動後借貸不平 。借方 = 1%s , 貸方 = 1%s
+FicheVentilation=關聯中卡片
+GeneralLedgerIsWritten=交易已紀錄到總帳中
+GeneralLedgerSomeRecordWasNotRecorded=某些交易未記錄。若沒有其他錯誤，這可能是因為已被記錄。
+NoNewRecordSaved=沒有交易可記錄
+ListOfProductsWithoutAccountingAccount=清單中的產品沒有指定任何會計項目
+ChangeBinding=修改關聯性
+Accounted=計入總帳
+NotYetAccounted=尚未記入總帳
 
 ## Admin
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group
-CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Accounting journals
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccoutingJournal=Show accounting journal
-Nature=類型
-AccountingJournalType1=Miscellaneous operation
-AccountingJournalType2=可否銷售
-AccountingJournalType3=可否採購
-AccountingJournalType4=银行
-AccountingJournalType5=Expenses report
+ApplyMassCategories=套用大量分類
+AddAccountFromBookKeepingWithNoCategories=個人化群組中可用會計項目尚未完成
+CategoryDeleted=會計項目的類別已移除
+AccountingJournals=各式會計日記簿
+AccountingJournal=會計日記簿
+NewAccountingJournal=新會計日記簿
+ShowAccoutingJournal=顯示會計日記簿
+Nature=性質
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=各式銷貨
+AccountingJournalType3=各式採購
+AccountingJournalType4=銀行
+AccountingJournalType5=費用報表
+AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
+ErrorAccountingJournalIsAlreadyUse=此日記簿已使用
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 
 ## Export
-ExportDraftJournal=Export draft journal
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
-Modelcsv_COALA=Export towards Sage Coala
-Modelcsv_bob50=Export towards Sage BOB 50
-Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export towards Quadratus QuadraCompta
-Modelcsv_ebp=Export towards EBP
-Modelcsv_cogilog=Export towards Cogilog
-Modelcsv_agiris=Export towards Agiris
-Modelcsv_configurable=Export Configurable
-ChartofaccountsId=Chart of accounts Id
+ExportDraftJournal=匯出日記簿草稿
+Modelcsv=專家模式
+Selectmodelcsv=選擇專家模式
+Modelcsv_normal=典型匯出
+Modelcsv_CEGID=匯出成相容的 CEGID 專家模式
+Modelcsv_COALA=匯出成 Sage Coals 格式
+Modelcsv_bob50=匯出成 Sage BOB 50 格式
+Modelcsv_ciel=匯出成 Sage Ciel Compta 或 Compta Evolution 格式
+Modelcsv_quadratus=匯出成 Quadratus QuadraCompta 格式
+Modelcsv_ebp=匯出成 EBP
+Modelcsv_cogilog=匯出成 Cogilog 格式
+Modelcsv_agiris=匯出到 Agiris
+Modelcsv_configurable=匯出偏好設定
+ChartofaccountsId=會計項目表ID
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+InitAccountancy=初始會計
+InitAccountancyDesc=此頁可在沒有定義產品及服務的銷售及採購會計項目下使用產品及服務的會計項目。
+DefaultBindingDesc=當沒有設定特定會計項目時，此頁面可設定預設會計項目連結到薪資、捐贈、稅捐及營業稅的交易紀錄。
+Options=選項
+OptionModeProductSell=銷售模式
+OptionModeProductBuy=採購模式
+OptionModeProductSellDesc=顯示銷售產品的會計項目
+OptionModeProductBuyDesc=顯示採購所有產品的會計項目
+CleanFixHistory=移除會計代號將不再出現在會計項目表中。
+CleanHistory=針對選定年度重設全部關聯性
+PredefinedGroups=預定大類
+WithoutValidAccount=沒有驗證的指定會計項目
+WithValidAccount=驗證的指定會計項目
+ValueNotIntoChartOfAccount=在會計項目表中沒有會計項目的值
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=會計項目範圍
+Calculated=已計算
+Formula=公式
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
-NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
-UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
+SomeMandatoryStepsOfSetupWereNotDone=某些必要的設定步驟沒有完成，請完成它們
+ErrorNoAccountingCategoryForThisCountry=此國家 %s 沒有會計項目大類可用(查閱首頁-設定-各式目錄)
+ErrorInvoiceContainsLinesNotYetBounded=您試著記錄發票某行<strong>%s</strong>，但其他行數尚未完成關聯到會計項目。拒絕本張發票全部行數的記錄。
+ErrorInvoiceContainsLinesNotYetBoundedShort=發票中某些行數未關聯到會計項目。
+ExportNotSupported=已設定匯出格式不支援匯出到此頁
+BookeppingLineAlreayExists=在簿記中此行已存在
+NoJournalDefined=沒有定義的日記簿
+Binded=關聯行數
+ToBind=關聯行
+UseMenuToSetBindindManualy=不能自動檢測，使用選單 <a href="%s">%s</a> 用人工方式關聯
 
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=警告，此報表非依總帳製作的，所以不含總帳中人工修改的交易。若您日記簿是最新的日期，則記帳檢視會比較準確。
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 86d6de410ec..738c1ef929b 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -1,202 +1,202 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
+Foundation=基金會
 Version=版本
 Publisher=Publisher
 VersionProgram=版本計劃
 VersionLastInstall=初始安裝版
-VersionLastUpgrade=最新版本升級
-VersionExperimental=實驗
-VersionDevelopment=發展
+VersionLastUpgrade=升級最新版本
+VersionExperimental=實驗性
+VersionDevelopment=開發
 VersionUnknown=未知
-VersionRecommanded=推薦
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+VersionRecommanded=推薦的
+FileCheck=檔案完整檢查器
+FileCheckDesc=此工具可每一筆與官方檔案相互檢查檔案完整性及設定應用程式。也包含了一些設定值。你也可用此工具檢查檔案是否被駭客修改過。
+FileIntegrityIsStrictlyConformedWithReference=檔案完整性符合參考值。
+FileIntegrityIsOkButFilesWereAdded=檔案完整性已檢查過，但增加一些檔案。
+FileIntegritySomeFilesWereRemovedOrModified=檔案完整性檢查扶敗。有檔案被修改、移除或新增。
 GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=會話ID
-SessionSaveHandler=處理程序，以節省會議
-SessionSavePath=本地化存儲會議
-PurgeSessions=清除的會議
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=保存的會話處理器配置你的PHP不允許列出所有正在運行的會話。
-LockNewSessions=鎖定新的連接
-ConfirmLockNewSessions=你肯定你想限制任何新Dolibarr連接到自己。只有用戶<b>%s</b>將能夠連接之後。
-UnlockNewSessions=刪除連接鎖
-YourSession=您的會話
-Sessions=用戶會議
-WebUserGroup=Web服務器的用戶/組
-NoSessionFound=您的PHP似乎不容許列出活動的會話。目錄用於保存會話<b>（%s）</b>可能受到保護（例如，通過操作系統的權限，或者由PHP指令的open_basedir）。
-DBStoringCharset=儲存資料所使用的資料庫語系編碼
-DBSortingCharset=數據庫字符集的數據進行排序
-ClientCharset=Client charset
+MakeIntegrityAnalysisFrom=製作應用程式檔完整性分析來自
+LocalSignature=嵌入本地簽名檔 (較不可靠)
+RemoteSignature=遠端簽名 (較可靠)
+FilesMissing=遺失檔案
+FilesUpdated=已上傳檔案
+FilesModified=已修改檔案
+FilesAdded=新增檔案
+FileCheckDolibarr=檢查應用程式檔案完整性
+AvailableOnlyOnPackagedVersions=當安裝來自官方的應用程式時本地檔案完整檢查才可用。
+XmlNotFound=沒有應用程式 xml 的完整性檔
+SessionId=連線階段ID
+SessionSaveHandler=儲存連線階段處理程序
+SessionSavePath=存儲連線階段位置
+PurgeSessions=清除的連線會議
+ConfirmPurgeSessions=您確定要清除所有的連線階段？這會導致離線(除您之外)。
+NoSessionListWithThisHandler=在您的 PHP 中設定儲存連線階段處理程序中是不允許列出全部執行中的連線。
+LockNewSessions=鎖定新的連線
+ConfirmLockNewSessions=您確定要限制任何新 Dolibarr 連接到自己。之後只有用戶<b>%s</b>能夠連線。
+UnlockNewSessions=移除連線鎖定
+YourSession=您的連線階段
+Sessions=用戶連線階段
+WebUserGroup=網頁伺服器的用戶/組
+NoSessionFound=您的 PHP 似乎不容許列出啟動的連線。用於保存連線<b>（%s）</b>檔案目錄的可能受到保護（例如，由作業系統的權限，或由 PHP 指令的 open_basedir）。
+DBStoringCharset=儲存資料的資料庫字集
+DBSortingCharset=資料排序以資料庫字集
+ClientCharset=客戶端字集
 ClientSortingCharset=Client collation
-WarningModuleNotActive=模組<b>%s</b>必須啟用
-WarningOnlyPermissionOfActivatedModules=只有激活相關的模組權限是在這裡顯示。你可以在激活家庭>安裝->模組網頁上的其他模組。
-DolibarrSetup=Dolibarr 安裝或升級
-InternalUser=公司員工用戶
-ExternalUser=非公司員工用戶
-InternalUsers=公司員工用戶
-ExternalUsers=非公司員工用戶
-GUISetup=人機介面
+WarningModuleNotActive=模組<b>%s</b>必須啓用
+WarningOnlyPermissionOfActivatedModules=在此顯示已啓動模組之相關權限。你可在 首頁 -> 設定 -> 模組頁上啓動其他模組。
+DolibarrSetup=Dolibarr 安裝或昇級
+InternalUser=內部用戶
+ExternalUser=外部用戶
+InternalUsers=內部用戶們
+ExternalUsers=外部用戶們
+GUISetup=顯示設定
 SetupArea=設定區
-UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=測試檔案上傳的表單 ( 根據設置 )
-IfModuleEnabled=註：是的，是有效的，只有模組<b>%s</b>是啟用
-RemoveLock=刪除檔案 <b>%s</b> ，如果此檔案是因為升級工具產生的。
-RestoreLock=針對 <b>%s</b> 檔案只開啟唯讀權限，並關閉任何升級工具。
-SecuritySetup=安全設置
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=錯誤，這個模組需要的PHP版本是%s或更高
-ErrorModuleRequireDolibarrVersion=錯誤，這個模組需要Dolibarr%s或更高版本
-ErrorDecimalLargerThanAreForbidden=錯誤<b>，1%的</b>精度高於不支持。
-DictionarySetup=設定選項清單
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=需要 %s 個字元來觸發搜尋
-NotAvailableWhenAjaxDisabled=用時沒有Ajax的殘疾人
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=禁用JavaScript
-UsePreviewTabs=使用預覽標籤
+UploadNewTemplate=上傳新的範例
+FormToTestFileUploadForm=上傳測試檔案(根據設定)
+IfModuleEnabled=註：若模組<b>%s</b>是啓動時，「是的」有效。
+RemoveLock=若此檔案存在允許昇級工具移除<b>%s</b>檔案。
+RestoreLock=回存檔案 <b>%s</b> ，僅有唯讀權限，並關閉任何昇級工具。
+SecuritySetup=安全設定
+SecurityFilesDesc=在此定義上傳檔案相關的安全設定。
+ErrorModuleRequirePHPVersion=錯誤，這個模組需要的PHP版本是 %s 或更高版本
+ErrorModuleRequireDolibarrVersion=錯誤，這個模組需要 Dolibarr 版本 %s 或更高版本
+ErrorDecimalLargerThanAreForbidden=錯誤，高度精密的 <b> %s </b>不支援。
+DictionarySetup=目錄設定
+Dictionary=目錄
+ErrorReservedTypeSystemSystemAuto='system' 及 'systemauto' 為保留值。你可使用 'user' 值加到您自己的紀錄中。
+ErrorCodeCantContainZero=不含 0 值
+DisableJavascript=不啓動 JavaScript and Ajax 功能 (建議盲人或是文字型瀏覽器使用)
+UseSearchToSelectCompanyTooltip=另外，你若有大量合作方 (> 100 000), 您可在'設定 -> 其他'設定常數 COMPANY_DONOTSEARCH_ANYWHERE 為 1 增加速度。尋找將會限制在字串的開頭。
+UseSearchToSelectContactTooltip=另外，你若有大量合作方 (> 100 000), 您可在'設定 -> 其他'設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 增加速度。尋找將會限制在字串的開頭。
+DelaiedFullListToSelectCompany=等你在載入合作方組合列表的內容之前按下一個鍵 (如果你有大量的合作方這可增加效能，不過會減少便利)
+DelaiedFullListToSelectContact=等你在載入第三方組合列表的內容之前按下一個鍵 (如果你有大量的第三方程式這可增加效能，不過會減少便利)
+NumberOfKeyToSearch=需要 %s 個字元進行搜尋
+NotAvailableWhenAjaxDisabled=當 Ajax 不啓動時，此不可用。
+AllowToSelectProjectFromOtherCompany=在合作方的文件上，可選擇已結專案到另外合作方。
+JavascriptDisabled=JavaScript 不啓動
+UsePreviewTabs=使用預覽分頁
 ShowPreview=顯示預覽
 PreviewNotAvailable=無法預覽
-ThemeCurrentlyActive=目前活躍的主題
-CurrentTimeZone=PHP 的時區 ( 伺服器 )
-MySQLTimeZone=TimeZone MySql (database)
+ThemeCurrentlyActive=目前可用的主題
+CurrentTimeZone=PHP (服務器) 的時區
+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=表格
 Fields=欄位
 Index=索引
 Mask=遮罩
-NextValue=下一個產生的值
-NextValueForInvoices=下一個發票(invoice)編碼值
-NextValueForCreditNotes=下一個信用債券編碼值
+NextValue=下一個值
+NextValueForInvoices=下一個值(發票號)
+NextValueForCreditNotes=下一個值(貸方通知單號)
 NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=注意：你的PHP限制每個文件上傳的大小為<b>%s%s</b>的，不管這個參數的值
-NoMaxSizeByPHPLimit=註：不限制設置在你的PHP配置
-MaxSizeForUploadedFiles=最高（0上傳文件的大小，禁止任何上傳）
-UseCaptchaCode=使用圖形化代碼，在登錄（CAPTCHA的）頁
-AntiVirusCommand= 反病毒命令的完整路徑
-AntiVirusCommandExample= 示例的ClamWin中：C：\\程序文件（x86）的\\的ClamWin \\斌\\ clamscan.exe <br> ClamAV的實例：/ usr /斌/ clamscan
-AntiVirusParam= 命令行參數的更多
-AntiVirusParamExample= 示例的ClamWin： - 數據庫=的“C：\\程序文件（x86）的\\的ClamWin \\ lib目錄”
-ComptaSetup=會計模組設置
-UserSetup=用戶的管理設置
-MultiCurrencySetup=Multi-currency setup
+MustBeLowerThanPHPLimit=註：你的 PHP 限制每個上傳檔案的大小為<b>%s%s</b>，因此不用此參數的值
+NoMaxSizeByPHPLimit=註：你的 PHP 偏好設定為無限制
+MaxSizeForUploadedFiles=上傳檔案最大值（0 為禁止上傳）
+UseCaptchaCode=在登錄頁中的使用圖形碼 (CAPTCHA)
+AntiVirusCommand= 防毒命令的完整路徑
+AntiVirusCommandExample= 例如 ClamWin 為 c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>例如 ClamAv 為 /usr/bin/clamscan
+AntiVirusParam= 在命令列中更多的參數
+AntiVirusParamExample= 例如 ClamWin 為 --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=會計模組設定
+UserSetup=用戶管理設定
+MultiCurrencySetup=不同幣別設定
 MenuLimits=限制及精準度
-MenuIdParent=父菜單編號
-DetailMenuIdParent=家長菜單（0編號為頂級菜單）
-DetailPosition=分類編號，以確定菜單位置
+MenuIdParent=上層選單ID
+DetailMenuIdParent=上層選單的ID（最上層選單為空白）
+DetailPosition=排序編號以定義選單位置
 AllMenus=所有
-NotConfigured=Module/Application not configured
-Active=活躍
+NotConfigured=模組/應用程式未設置偏好
+Active=啓動
 SetupShort=設定
-OtherOptions=其他選項
-OtherSetup=其他設置
-CurrentValueSeparatorDecimal=小數分隔符
-CurrentValueSeparatorThousand=千位分隔符
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+OtherOptions=其他各式選項
+OtherSetup=其他設定
+CurrentValueSeparatorDecimal=小數分隔符號
+CurrentValueSeparatorThousand=千位分隔符號
+Destination=目地的
+IdModule=模組 ID
+IdPermissions=存取 ID
 LanguageBrowserParameter=%s的參數
 LocalisationDolibarrParameters=本地化參數
-ClientTZ=使用者時區
-ClientHour=使用者時區
-OSTZ=伺服器時區
+ClientTZ=客戶時區(用戶)
+ClientHour=客戶時間(用戶)
+OSTZ=伺服器作業系統時區
 PHPTZ=PHP伺服器時區
-DaylingSavingTime=夏令時間（用戶）
-CurrentHour=當前 PHP伺服器時間
-CurrentSessionTimeOut=當前會話超時
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+DaylingSavingTime=夏令時間
+CurrentHour=PHP (伺服器)時間
+CurrentSessionTimeOut=目前連線階段的時間已到
+YouCanEditPHPTZ=設定不同 PHP 時區 (非必要), 您可試著在 .htacces 檔案中增一行字串如 "SetEnv TZ Europe/Paris" 。
 HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=小工具
-Boxes=小工具
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+Boxes=各式小工具
+MaxNbOfLinesForBoxes=各式小工具最大行數
 AllWidgetsWereEnabled=All available widgets are enabled
-PositionByDefault=預設順序
+PositionByDefault=預設排序
 Position=位置
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=使用者目錄
+MenusDesc=選單管理器設定2項選單欄(垂直及水平)
+MenusEditorDesc=選單編輯器允許自行定義選單行。使用時要小心以免造成不穩定及永久無法使用的選單。<br>某些模組會增加選單(幾乎<b>全部</b>在選單中)。若您失誤地移除某些選單，您可透過模組回復成啟用或不啟用。
+MenuForUsers=用戶的選單
 LangFile=語系檔
 System=系統
 SystemInfo=系統資訊
-SystemToolsArea=系統工具區
-SystemToolsAreaDesc=此區提供了管理功能，請點選選單來管理你想要的內容。
+SystemToolsArea=系統各式工具區
+SystemToolsAreaDesc=此區提供了管理層面功能，請使用選單來選擇你想要的功能。
 Purge=清除
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeAreaDesc=此頁允許您刪除已產生的檔案或存在 Dolibarr ( 在<b>%s</b>的檔案目錄下的暫存檔或全部檔案)。這功能不是必要的。因為此是提供給dolibarr是架在網頁伺服器供應商者，且其無權限刪除檔案者使用。
+PurgeDeleteLogFile=刪除 log 檔案，包含Syslog 模組的 <b>%s</b> (沒有遺失資料風險)
+PurgeDeleteTemporaryFiles=刪除全部暫存檔案(沒有遺失資料風險)
 PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=刪除所有文件目錄<b>%s。</b>臨時文件，而且文件附加到元素（第三方發票，...），進入流腦模組上傳將被刪除。
+PurgeDeleteAllFilesInDocumentsDir=在檔案目錄<b>%s</b>中刪除所有檔案。暫存檔案不只是資料庫備份(dumps)、元件的夾檔 ( 合作方、各式發票... ) 及上傳到 ECM 模組的將會被刪除。
 PurgeRunNow=立即清除
-PurgeNothingToDelete=沒有可以刪除的目錄或檔案。
-PurgeNDirectoriesDeleted=<b>%s的</b>文件或目錄刪除。
+PurgeNothingToDelete=沒有可以刪除的檔案目錄或檔案。
+PurgeNDirectoriesDeleted=<b>%s的</b>檔案或目錄已刪除。
 PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
 PurgeAuditEvents=清除所有安全性事件
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=您確定要清除全部安全事件？所有安全性 log 將會被刪除，沒有其他資料被移除。
 GenerateBackup=產生備份
 Backup=備份
 Restore=還原
-RunCommandSummary=備份將通過下面的命令
+RunCommandSummary=接下來的命令將會啟動備份
 BackupResult=備份結果
-BackupFileSuccessfullyCreated=生成的備份文件成功
-YouCanDownloadBackupFile=生成的文件現在可以下載
-NoBackupFileAvailable=沒有可用的備份文件。
+BackupFileSuccessfullyCreated=備份檔案成功地的產生
+YouCanDownloadBackupFile=產生的檔案現在可以下載了
+NoBackupFileAvailable=沒有可用的備份檔案。
 ExportMethod=匯出方法
 ImportMethod=匯入方法
-ToBuildBackupFileClickHere=要建立一個備份文件，單擊<a href="%s">此處</a> 。
-ImportMySqlDesc=要匯入備份文件，您必須從命令列下達 mysql 指令：
-ImportPostgreSqlDesc=要匯入備份文件，你必須從命令列下達 pg_restore 指令：
-ImportMySqlCommand=%s %s <mybackupfile.sql
+ToBuildBackupFileClickHere=要建立一個備份檔案，點擊<a href="%s">此處</a> 。
+ImportMySqlDesc=要匯入備份檔案，您必須從命令列中下達 mysql 指令：
+ImportPostgreSqlDesc=要匯入備份檔案，你必須從命令列下達 pg_restore 指令：
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=產生的檔案名稱
 Compression=壓縮
-CommandsToDisableForeignKeysForImport=匯入時指定進用外來鍵
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=生成的導出文件的兼容性
+CommandsToDisableForeignKeysForImport=在匯入時下達禁止使用外來鍵命令
+CommandsToDisableForeignKeysForImportWarning=若您之後要回復您 sql dump，則必須要
+ExportCompatibility=產生匯出檔案的相容性
 MySqlExportParameters=MySQL 的匯出參數
 PostgreSqlExportParameters= PostgreSQL 的匯出參數
 UseTransactionnalMode=使用交易模式
 FullPathToMysqldumpCommand=mysqldump 指令的完整路徑
 FullPathToPostgreSQLdumpCommand=pg_dump 指令的完整路徑
-AddDropDatabase=加入刪除資料庫的命令
-AddDropTable=加入刪除資料表的命令
+AddDropDatabase=加入 drop database 命令
+AddDropTable=加入 drop table 命令
 ExportStructure=結構
 NameColumn=名稱列
 ExtendedInsert=擴展的INSERT
 NoLockBeforeInsert=INSERT 沒有使用鎖定指令
 DelayedInsert=延遲插入
 EncodeBinariesInHexa=在十六進制編碼的二進制數據
-IgnoreDuplicateRecords=忽略複製資料的錯誤訊息 (INSERT IGNORE)
+IgnoreDuplicateRecords=忽略重覆資料的錯誤訊息 (INSERT IGNORE)
 AutoDetectLang=自動檢測（瀏覽器的語言）
-FeatureDisabledInDemo=在演示功能禁用
+FeatureDisabledInDemo=在展示中禁用功能
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=只有被<a href="modules.php"> modules.php </a>所啟用的模組才會顯示。
-ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+BoxesDesc=小工具是顯示您自行增加個人化的資料。您可選擇顯示小工具或由選定目標頁點選啟動或禁用。
+OnlyActiveElementsAreShown=僅從<a href="%s">啟動模組</a>後元件才會顯示。
+ModulesDesc=Dolibarr 程式/功能的模組可在軟體內啟動。某些程式/模組您必須允許用戶權限，之後再啟動。點選按鈕 on/off 啟動模組/程式。
+ModulesMarketPlaceDesc=您可在外部網頁中找到更多可下載的模組...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
+ModulesMarketPlaces=找外部 app / 模組
 ModulesDevelopYourModule=Develop your own app/modules
 ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
@@ -210,46 +210,46 @@ Updated=Updated
 Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore，為Dolibarr的ERP / CRM的外部模組官方市場
+DoliStoreDesc=DoliStore 是 Dolibarr ERP / CRM 外部模組的官方市集
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+WebSiteDesc=參考網頁找到更多模組...
 DevelopYourModuleDesc=Some solutions to develop your own module...
-URL=連結
-BoxesAvailable=有元件
-BoxesActivated=元件已啟用
+URL=連線
+BoxesAvailable=可用小工具
+BoxesActivated=小工具已啟用
 ActivateOn=啟用
-ActiveOn=啟用
+ActiveOn=已啟用
 SourceFile=來源檔案
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=僅當禁用JavaScript是不
-Required=需要
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=僅當 JavaScript 不是禁用時可用
+Required=必須
 UsedOnlyWithTypeOption=Used by some agenda option only
 Security=安全
 Passwords=密碼
-DoNotStoreClearPassword=難道沒有明確的密碼存儲在數據庫，但只存儲加密值（活性炭推薦）
-MainDbPasswordFileConfEncrypted=數據庫密碼conf.php加密（活性炭推薦）
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=保護生成的PDF文件（活性不推薦，休息質量PDF生成）
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+DoNotStoreClearPassword=在資料庫中不要存明碼，要存成加密(建議啟動)
+MainDbPasswordFileConfEncrypted=在 conf.php 中資料庫密碼加密(建議啟動)
+InstrucToEncodePass=為使已編碼好的密碼放到<b>conf.php</b>檔案中，應採用<br><b>$dolibarr_main_db_pass="crypted:%s";</b>此行代替<br><b>$dolibarr_main_db_pass="...";</b><br>
+InstrucToClearPass=為使密碼(明碼)放到 <b> conf.php </b> 檔案中，應採用<br><b>$dolibarr_main_db_pass="%s";</b>此行代替 <br><b> $dolibarr_main_db_pass="crypted:...";</b><br>
+ProtectAndEncryptPdfFiles=產生 pdf 檔案的保護（不建議啟動，會中斷大量 pdf 的產生）
+ProtectAndEncryptPdfFilesDesc=保留可由 pdf 流灠器閱讀及列印的 pdf 文件保護。因此不能編輯及複製。注意使用此功能會使合併 pdf 無法使用。
 Feature=功能特色
 DolibarrLicense=授權
 Developpers=開發商/貢獻者
 OfficialWebSite=Dolibarr國際官方網站
 OfficialWebSiteLocal=Local web site (%s)
 OfficialWiki=Dolibarr維基
-OfficialDemo=Dolibarr在線演示
-OfficialMarketPlace=官方/插件外部模組市場
-OfficialWebHostingService=參照的網站主機服務 (雲端主機)
+OfficialDemo=Dolibarr在線展示
+OfficialMarketPlace=外部模組/插件官方市場
+OfficialWebHostingService=可參考的網站主機服務 (雲端主機)
 ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External resources
 SocialNetworks=Social Networks
-ForDocumentationSeeWiki=對於用戶或開發人員的文件（文檔，常見問題...), <br>看一看在Dolibarr維基看看： <br> <a href="%s" target="_blank"><b>%s的</b></a>
-ForAnswersSeeForum=對於任何其他問題/幫助，您可以使用Dolibarr論壇： <br> <a href="%s" target="_blank"><b>%s的</b></a>
-HelpCenterDesc1=這方面可以幫助你獲得一個Dolibarr幫助支持服務。
-HelpCenterDesc2=一些服務的一部分，這是<b>只有英文</b> 。
-CurrentMenuHandler=當前選單處理程序
-MeasuringUnit=計量單位
+ForDocumentationSeeWiki=有關用戶或開發人員的文件（文件，常見問題...), <br>可在Dolibarr維基查閱： <br> <a href="%s" target="_blank"><b>%s的</b></a>
+ForAnswersSeeForum=有關任何其他問題/幫助，您可以使用Dolibarr論壇： <br> <a href="%s" target="_blank"><b>%s的</b></a>
+HelpCenterDesc1=此區可以幫助你取得 Dolibarr 的幫忙支援服務。
+HelpCenterDesc2=某些服務<b>僅可使用英文</b> 。
+CurrentMenuHandler=目前選單處理者
+MeasuringUnit=衡量單位
 LeftMargin=Left margin
 TopMargin=Top margin
 PaperSize=Paper type
@@ -261,142 +261,143 @@ Content=Content
 NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
+EMailsSetup=Email 設定
+EMailsDesc=此頁允許您複寫您 email 傳送的 php 參數。在 Unix/Linux 系統中多數案例，您 php 設定正確及參數是無效的。
 EmailSenderProfiles=Emails sender profiles
-MAIN_MAIL_SMTP_PORT=的SMTP / SMTPS連接埠（通過php.ini文件的預設位置<b>：%s）</b>的
-MAIN_MAIL_SMTP_SERVER=的SMTP / SMTPS主機（通過php.ini文件的預設位置<b>：%s）</b>的
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=的SMTP / SMTPS港口（不定義為PHP的Unix類系統）
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=的SMTP / SMTPS主機（不定義為PHP的Unix類系統）
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
-MAIN_MAIL_AUTOCOPY_TO= 發送一個隱藏的系統碳複製所有發送電子郵件給
-MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_MAIL_SMTP_PORT=SMTP / SMTPS 連接埠 ( 在 php.ini 中預設值:<b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS 主機 ( 在 php.ini 中是預設的:<b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS 連接埠 ( 在 Unix like 系統內，沒有定義在 PHP中)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS 主機 ( 在 Unix like 系統內，沒有定義在 PHP 中)
+MAIN_MAIL_EMAIL_FROM=自動郵件信件時寄件者(在 php.ini中預設值:<b>%s</b>)
+MAIN_MAIL_ERRORS_TO=在寄出mail時使用 'Errors-To' 欄位
+MAIN_MAIL_AUTOCOPY_TO= 系統私下寄送所有發送郵件的副件給
+MAIN_DISABLE_ALL_MAILS=禁用傳送所有郵件(適用於測試目的或是展示)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_SENDMODE=方法用於發送電子郵件
+MAIN_MAIL_SENDMODE=傳送電子郵件方法
 MAIN_MAIL_SMTPS_ID=SMTP 帳號（如果需要驗證）
 MAIN_MAIL_SMTPS_PW=SMTP 密碼（如果需要驗證）
 MAIN_MAIL_EMAIL_TLS= 使用 TLS (SSL) 的加密
 MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=禁用所有的短信sendings（用於測試目的或演示）
-MAIN_SMS_SENDMODE=使用方法發送短信
-MAIN_MAIL_SMS_FROM=預設發件人的電話號碼發送短信
+MAIN_DISABLE_ALL_SMS=禁用傳送所有簡訊/SMS(適用於測試目的或展示)
+MAIN_SMS_SENDMODE=使用傳送簡訊/SMS的方法
+MAIN_MAIL_SMS_FROM=傳送簡訊/SMS的傳送者預設電話號碼
 MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email)
 UserEmail=User email
 CompanyEmail=Company email
-FeatureNotAvailableOnLinux=功能不可用在Unix類系統。在本地測試您的sendmail程序。
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+FeatureNotAvailableOnLinux=在Unix系列系統中不能使用功能。在本地測試您的寄送郵件程式。
+SubmitTranslation=若未完整地翻譯您的語言或您找到錯誤，您可透過編輯檔案放到<b>langs/%s</b>的檔案目錄中修正他們，或是傳送您做的異動到 www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
-ModuleSetup=模組設置
-ModulesSetup=模組/程式 設置
+ModuleSetup=模組設定
+ModulesSetup=模組/程式設定
 ModuleFamilyBase=系統
-ModuleFamilyCrm=客戶關係管理（CRM）
+ModuleFamilyCrm=客戶關係管理(CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=產品管理 (PM)
 ModuleFamilyHr=人力資源管理 (HR)
-ModuleFamilyProjects=專案 / 協同工作
+ModuleFamilyProjects=專案 / 協同作業
 ModuleFamilyOther=其他
-ModuleFamilyTechnic=多模組工具
-ModuleFamilyExperimental=實驗模組
-ModuleFamilyFinancial=財務模組（會計/庫務）
+ModuleFamilyTechnic=多種模組工具
+ModuleFamilyExperimental=實驗性模組
+ModuleFamilyFinancial=財務模組（會計/財務）
 ModuleFamilyECM=數位內容管理 (ECM)
 ModuleFamilyPortal=Web sites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=選單處理程序
 MenuAdmin=選單編輯器
 DoNotUseInProduction=請勿在實際工作環境使用
-ThisIsProcessToFollow=這是處理的步驟：
+ThisIsProcessToFollow=此處理步驟：
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=第 %s 步驟
-FindPackageFromWebSite=從網站尋找你想要擴充的主題、模組（可上 %s 網站參考）。
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+StepNb=步驟 %s 
+FindPackageFromWebSite=尋找您想要功能的套件(在官網 %s 上有範例)。
+DownloadPackageFromWebSite=下載套件(在官網%s上有範例)。
+UnpackPackageInDolibarrRoot=解壓縮的套件檔案到伺服器下的 dolibarr 檔案目錄:<b>%s</b>
 UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can submit the .zip file of module package here :
-CurrentVersion=此系統軟體(Dolibarr)目前版本
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
+SetupIsReadyForUse=模組的發展已完成。您必須透過模組設定頁面啟動及在您的程式中設定模組:<a href="%s">%s</a>
+NotExistsDirect=替代根檔案目錄沒有定義到已存在的檔案目錄。<br>
+InfDirAlt=自從第3版起，可定義替代根檔案目錄。此允許您儲存到指定檔案目錄、插件及客製化範本。<br>只要在 dolibarr 的根目錄內建立檔案目錄(例如: 客戶)。<br>
+InfDirExample=<br>在 <strong>conf.php 檔案宣告 <br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>若這幾行已用"#"方式註解了，啟動他，也就是移除 "#"。
+YouCanSubmitFile=此步驟，您可傳送模組套件的 .zip 檔案到此:
+CurrentVersion=Dolibarr 目前版本
+CallUpdatePage=到此頁昇級資料庫架構及資料:%s。
+LastStableVersion=最新穩定版本
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
 WithCounter=Manage a counter
-GenericMaskCodes=這個編碼模組使用方式如下:<br>1. <b>{000000}</b>表示每個 %s 編碼會依據此參數產生序號字串，且會自動遞增。有多少個0就表示序號字串有多長，滿最大值會自動歸0。<br>2. <b>{000000+000}</b> 同上面第一條，但是多了 offset 功能，也就第一筆 %s 編碼的起始序號會根據 + 號後面的參數而定。<br>3. <b>{000000@x}</b> 同上面第一條，但是每當為新的月份時，會將序號歸0。如果使用兩個x 則必需要有 {yy}{mm} 或 {yyyy}{mm} 參數。<br><b>{dd}</b> 表示天 (01 to 31).<br><b>{mm}</b> 表示月 (01 to 12)<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b>  表示用多少位數顯示年<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
-GenericMaskCodes3=非遮罩字元的則該字元維持不變，也就是 A 就是 A，Z 就是 Z<br>注意:不允許空白字元<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>例如: 於 2007-01-31 建立的客戶/供應商資訊:</u> <br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes=您可使用任何數字遮罩。在此遮罩下可使用接下來的標籤:<br>1. <b>{000000}</b>表示每個 %s 編碼會依據此參數產生序號字串，且會自動遞增。有多少個0就表示序號字串有多長，滿最大值會自動歸0。<br>2. <b>{000000+000}</b> 同上面第一條，但是多了 offset 功能，也就第一筆 %s 編碼的起始序號會根據 + 號後面的參數而定。<br>3. <b>{000000@x}</b> 同上面第一條，但是每當為新的月份時，會將序號歸 0 ( x介於 1 到 12 間，或是使用 0 則依您偏好設定中已定義的財務年度的最早月份，或是使用 99 代表每月重新歸 0)。如果使用兩個x 則必需要有 {yy}{mm} 或 {yyyy}{mm} 參數。<br><b>{dd}</b> 表示天 (01 到 31).<br><b>{mm}</b> 表示月 (01 到 12)<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b>  表示用 2、4 或 1 位數顯示年<br>
+GenericMaskCodes2=在n字元下客戶代號為<b>{cccc}</b><br>在n字元下客戶代號為<b>{cccc000}</b>是專門給客戶的計數器。此計數器大於全域計數器時會重新歸0。<br>在n字元下合作方類型代號為<b>{tttt}</b>(在選單首頁 - 設定 - 目錄 - 合作方類型)。若您增加標籤，每個合作方類型的計數器會不同。<br>
+GenericMaskCodes3=非遮罩字元的則該字元維持不變，也就是 A 就是 A，Z 就是 Z<br>注意:不允許空白字元。<br>
+GenericMaskCodes4a=<u>例如: 日期在 2007-01-31 的第99個%s合作方公司:</u><br>
+GenericMaskCodes4b=<u>例如: 在 2007-03-01 建立的合作方:</u><br>
+GenericMaskCodes4c=<u>例如: 於2007-03-01 建立的產品:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b>會成為<b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b>會成為<b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b>會成為<b>IN0701-0099-A</b>。若公司的類型代號是 'Responsable Inscripto' 則會為 'A_RI'
 GenericNumRefModelDesc=根據事先定義的遮罩值，回傳一個客制化的編號，詳細可參照說明。
-ServerAvailableOnIPOrPort=服務器可在地址<b>%s%s的</b>連接埠上
-ServerNotAvailableOnIPOrPort=服務器而不是<b>%</b>可在地址<b>的</b>港口<b>%s</b>對
-DoTestServerAvailability=測試服務器連接
-DoTestSend=發送測試
-DoTestSendHTML=測試發送HTML
+ServerAvailableOnIPOrPort=網址<b>%s</b>連接埠<b>%s</b>的伺服器可以使用
+ServerNotAvailableOnIPOrPort=網址<b>%s</b>連接埠<b>%s</b>的伺服器無法使用。
+DoTestServerAvailability=測試伺服器連線
+DoTestSend=傳送測試
+DoTestSendHTML=測試傳送HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=錯誤，不能使用選項@如果序列（yy）（）或（西元年毫米）（毫米）是不是面具。
-UMask=umask的參數在Unix / Linux / BSD的文件系統的新文件。
-UMaskExplanation=此參數允許您定義，例如上載期間就Dolibarr服務器上創建文件的預設設置權限（）。 <br>它必須是八進制值（例如，0666就是為大家閲讀和書寫）。 <br>這個參數是沒有用的基於Windows的服務器。
-SeeWikiForAllTeam=採取的所有行動者及其組織的完整列表維基頁面看看
-UseACacheDelay= 在幾秒鐘內出口的緩存響應延遲（0或沒有緩存為空）
-DisableLinkToHelpCenter=隱藏連結“ <b>需要幫助或支持</b>登錄”頁
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=注意:沒有自動換行功能，所以如果文件太長，請務必按下Enter鍵換行。
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=錯誤，若序列 {yy}{mm} 或 {yyyy}{mm} 不在遮罩內則不能使用選項 @。
+UMask=在 Unix/Linux/BSD/Mac 的檔案系統中新檔案的 UMask 參數。
+UMaskExplanation=此參數允許您定義在伺服器上由 Dolibarr 建立的檔案的權限(例如在上載檔案時)。 <br>這是八進位(例如，0666 為全部人可讀寫)。<br>此參數無法在 Windows 伺服器上使用。
+SeeWikiForAllTeam=在 wiki 頁面中查看所有角色及其組織的完整清單
+UseACacheDelay= 以秒為單位的遞延匯出反應的時間(0或空格為沒有緩衝)
+DisableLinkToHelpCenter=登錄頁面上隱藏連線“ <b>需要幫助或支援</b>"
+DisableLinkToHelp=隱藏連線到線上幫助 "<b>%s</b>"
+AddCRIfTooLong=沒有自動換行功能，若一行太長，請自行按下 Enter 鍵換行。
+ConfirmPurge=您確認要執行刪除嗎？<br>此會刪您所有資料，且無法還復(含 ECM 檔案及各式夾檔)。
 MinLength=最小長度
-LanguageFilesCachedIntoShmopSharedMemory=文件。郎加載到共享內存
+LanguageFilesCachedIntoShmopSharedMemory=.lang 檔案載入分享記憶體中
 LanguageFile=Language file
-ExamplesWithCurrentSetup=與當前正在運行的安裝實例
-ListOfDirectories=OpenDocument 的文件範本目錄清單
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
-ExampleOfDirectoriesForModelGen=範例： <br> 1. ç:\\mydir<br>2. /home/mydir<br>3. DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>要知道如何建立您的ODT文建範本，並儲存在這些目錄，請上讀上　wiki　網站：
+ExamplesWithCurrentSetup=現在執行範例設定
+ListOfDirectories=OpenDocument 範本檔案目錄下的清單
+ListOfDirectoriesForModelGenODT=包含 OpenDocument 格式範本的檔案目錄清單。<br><br>檔案目錄完整路徑放在這裡。<br>每一檔案目錄之間要用 enter 鍵。<br>為增加 GED 模組的檔案目錄，請放在<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>。<br><br>在這些檔案目錄的檔案結尾必須是 <b>.odt</b> 或 <b>.ods</b>。
+NumberOfModelFilesFound=在這些檔案目錄中找到 ODT/ODS 範本檔數字
+ExampleOfDirectoriesForModelGen=語法範例:<br> ç:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>要知道如何建立您的ODT文件範本，並儲存在這些目錄，請上 wiki 網站：
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=的名字位置/名稱
-DescWeather=下面的圖片將會顯示在儀表盤時，晚行動的數量達到以下值：
-KeyForWebServicesAccess=鍵來使用Web服務（在WebServices的參數“dolibarrkey”）
-TestSubmitForm=可在以下表單輸入資料來測試
-ThisForceAlsoTheme=使用此菜單管理器，也將使用它自己的主題，無論是用戶的選擇。此菜單經理還專門為智能手機並不適用於所有的智能手機。使用另一個菜單管理器，如果你遇到你的問題。
+FirstnameNamePosition=名字/姓氏的位置
+DescWeather=當最後動作的數量達到以下值，以下的圖片將會顯示在儀表板上：
+KeyForWebServicesAccess=輸入使用 Web 服務（在 WebServices 的參數是“dolibarrkey”）
+TestSubmitForm=輸入測試表單
+ThisForceAlsoTheme=無論用戶的選擇為何，使用此選單管理器也將使用其本身的主題。此選單管理器是專適用於智慧手機，但並不適用於全部的智慧手機。若您遇到問題，請使用另一個選單管理器。
 ThemeDir=skins目錄
-ConnectionTimeout=聯接超時
-ResponseTimeout=響應超時
-SmsTestMessage=測試消息從_ PHONEFROM__ __ PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=安全網址的關鍵
-NoSmsEngine=沒有SMS發件人經理。短信發件人經理沒有安裝預設分配（因為他們依賴外部供應商），但你可以找到一些http://www.dolistore.com
+ConnectionTimeout=連線超時
+ResponseTimeout=回應超時
+SmsTestMessage=測試訊息從 __PHONEFROM__ 到 __PHONETO__
+ModuleMustBeEnabledFirst=若您需要此功能，您首先要啟用模組<b>%s</b>。
+SecurityToken=安全的網址的值
+NoSmsEngine=沒有簡訊/SMS傳送器可用。簡訊/SMS傳送器預設沒有安裝（因為需要外部供應商），但你可在 %s 找到。
 PDF=PDF格式
-PDFDesc=你可以設置PDF生成有關的每個全局選項
-PDFAddressForging=偽造地址框的規則
-HideAnyVATInformationOnPDF=隱藏所有有關增值稅生成的PDF信息
+PDFDesc=您可以設定每個全域選項關連到 PDF產生器
+PDFAddressForging=產生地址規則
+HideAnyVATInformationOnPDF=在產生的 PDF 上隱藏所有有關營業稅的資訊
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
-HideDescOnPDF=在生成 PDF 檔時隱藏產品描述
-HideRefOnPDF=在生成 PDF 檔時隱藏產品參照
-HideDetailsOnPDF=在生成 PDF 檔時隱藏產品詳細資料
+HideDescOnPDF=在產生的 PDF 上隱藏產品描述
+HideRefOnPDF=在產生的 PDF 上隱藏產品參考號
+HideDetailsOnPDF=在產生的 PDF 上產品線詳細資訊
 PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
 Library=程式庫
 UrlGenerationParameters=將網址安全化的參數
-SecurityTokenIsUnique=每個URL使用獨特的securekey參數
-EnterRefToBuildUrl=輸入參考對象%s
-GetSecuredUrl=獲取計算網址
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
-OldVATRates=舊稅率
-NewVATRates=新稅率
-PriceBaseTypeToChange=根據定義的基礎參照值修改價格
+SecurityTokenIsUnique=每個URL使用獨特的安全/securekey參數
+EnterRefToBuildUrl=輸入對象%s的參考值
+GetSecuredUrl=取得計算後網址
+ButtonHideUnauthorized=當非管理權限的用戶在非授權行動時改成隱藏按鈕，而非灰色禁用鈕。
+OldVATRates=舊營業稅率
+NewVATRates=新營業稅率
+PriceBaseTypeToChange=根據已定義的基礎參考價參修改價格
 MassConvert=啟動大量轉換
 String=字串
 TextLong=長字串
+HtmlText=Html text
 Int=整數
 Float=浮點數
 DateAndTime=日期時間
 Unique=唯一
-Boolean=布林值 (one checkbox)
+Boolean=布林值 (一個勾選方框)
 ExtrafieldPhone = 電話
 ExtrafieldPrice = 價格
 ExtrafieldMail = 電子郵件
@@ -405,29 +406,29 @@ ExtrafieldSelect = 選擇清單
 ExtrafieldSelectList = 從表格選取
 ExtrafieldSeparator=分隔 (非欄位)
 ExtrafieldPassword=密碼
-ExtrafieldRadio=單選按鈕 (on choice only)
-ExtrafieldCheckBox=勾選欄
+ExtrafieldRadio=雷達鈕 (限選擇性質)
+ExtrafieldCheckBox=勾選方框
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
+ExtrafieldParamHelpselect=此行的清單清，其格式為 關鍵字,值(關鍵字不為'0')<br><br>例如:<br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>為使清單可依賴於其他補充屬性清單:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key<br><br>為使清單可依賴於另一清單:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=此行的清單值，其格式為 關鍵字,值 (關鍵字不能為 '0')<br><br>例如:<br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=此行的清單值，其格式為 關鍵字,值 (關鍵字不能為 '0')<br><br>例如:<br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=從表格來的清單值<br>語法:table_name:label_field:id_field::filter<br>例如:c_typent:libelle:id::filter<br><br>-idfilter 是必須地且主要的初始關鍵字<br>-filter 可以簡單測試(啟動為active=1)只顯示下啟動值<br>您也可以在過濾器中使用 $ID$ 過瀘當期的 id<br>為使用 SELECT 可在過瀘器中使用$SEL$<br>若你想要過濾額外欄位使用語為 extra.fieldcode=... (欄位代號為額外欄位的代號)<br><br>為使清單可依賴另外的補充屬性的清單:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>為使清單可依賴於另外清單:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
+LibraryToBuildPDF=PDF產生器使用程式庫
+LocalTaxDesc=某些國家在每張發票適用 2 或 3 種稅率。若在此情況，選擇第二和三種稅率。可能類型:<br>1: 在地稅率適用不含營業稅的產品及服務(此是以未稅金額計算)<br>2:在地稅率適用含營業稅的產品及服務(此是以金額+主要稅金計算)<br>3:在地稅率適用不含營業稅的產品(此是以未稅金額計算)<br>4:在地稅率適用含營業稅的產品(此是以金額+主要營業稅計算)<br>5:在地稅率適用不含營業稅的服務(此是以未稅金額計算)<br>6:在地稅率適用含營業稅的服務(此是以金額+稅金計算)
+SMS=簡訊
+LinkToTestClickToDial=用戶輸入電話號碼以撥打顯示可連線到可測試的 URL <strong>%s</strong>
+RefreshPhoneLink=更新連線
+LinkToTest=用戶產生可連線 <strong>%s</strong> (點選電話號碼來測試)
+KeepEmptyToUseDefault=保留空白則使用預設值
+DefaultLink=預設連線
 SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ValueOverwrittenByUserSetup=警告，用戶指定設定會覆蓋該值(每位用戶可設定自己的 URL )
 ExternalModule=External module - Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
@@ -449,7 +450,8 @@ ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting 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.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
@@ -468,11 +470,12 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
+davDescription=Add a component to be a DAV server
 # Modules
 Module0Name=用戶和群組
-Module0Desc=用戶（員工）以及群組管理
-Module1Name=客戶/供應商
-Module1Desc=公司和聯絡人的管理
+Module0Desc=用戶/員工以及群組管理
+Module1Name=合作方
+Module1Desc=公司和聯絡人的管理(客戶、潛在客戶)
 Module2Name=商業
 Module2Desc=商業管理
 Module10Name=會計
@@ -480,23 +483,23 @@ Module10Desc=簡單的會計管理（發票和付款作業）
 Module20Name=建議書
 Module20Desc=商業建議書的管理
 Module22Name=大量發送的電子郵件
-Module22Desc=大規模電子郵件發送的管理
+Module22Desc=大量電子郵件發送的管理
 Module23Name=能源
 Module23Desc=監測的能源消耗
 Module25Name=客戶訂單
 Module25Desc=客戶訂單管理
 Module30Name=發票
-Module30Desc=客戶發票(invoice)和票據(credit note)的管理。供應商發票(invoice)的管理。
+Module30Desc=客戶發票和貸方通知單的管理。供應商發票的管理。
 Module40Name=供應商
 Module40Desc=供應商的管理和採購管理（訂單和發票）
-Module42Name=Debug Logs
+Module42Name=除錯日誌
 Module42Desc=日誌記錄 (file, syslog, ...)。這些日誌是針對技術性以及除錯用途。
 Module49Name=編輯
 Module49Desc=編輯器的管理
 Module50Name=產品
 Module50Desc=產品的管理
 Module51Name=大量郵件
-Module51Desc=群眾郵寄文件的管理
+Module51Desc=大量文件發送的管理
 Module52Name=庫存
 Module52Desc=產品庫存的管理
 Module53Name=服務
@@ -507,50 +510,50 @@ Module55Name=條碼
 Module55Desc=條碼的管理
 Module56Name=電話
 Module56Desc=電話整合
-Module57Name=支付銀行順序
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=ClickToDial一體化
+Module57Name=直接由銀行付款命令
+Module57Desc=直接借方付款命令管理。包含適用歐洲國家 SEPA 檔案的產生。
+Module58Name=點選撥打
+Module58Desc=點選撥打系統(Asterisk, ...)的整合
 Module59Name=Bookmark4u
-Module59Desc=添加函數生成一個Dolibarr帳戶Bookmark4u帳戶
-Module70Name=干預
-Module70Desc=干預的管理
-Module75Name=費用和旅遊筆記
+Module59Desc=新增從 Dolibarr 帳號產生 Bookmark4u 帳號的功能
+Module70Name=干預/介入
+Module70Desc=干預/介入的管理
+Module75Name=費用和出差筆記
 Module75Desc=費用和旅遊音符的管理
 Module80Name=出貨
-Module80Desc=出貨單和交貨單的管理
+Module80Desc=出貨和交貨單的管理
 Module85Name=銀行及現金
 Module85Desc=銀行或現金帳戶管理
-Module100Name=ExternalSite
-Module100Desc=到Dolibarr菜單包含任何外部網站，並查看它成為一個Dolibarr框架
-Module105Name=梅爾曼和SIP
-Module105Desc=郵遞員或SPIP成員模組接口
-Module200Name=LDAP的
-Module200Desc=LDAP目錄同步
+Module100Name=外部網站
+Module100Desc=本模組將一個外部網站或網頁含到 Dolibarr 選單中，並使用 Dolibarr 框架內檢視。
+Module105Name=Mailman and SPIP
+Module105Desc=會員模組用的 Mailman 或 SPIP 介面
+Module200Name=LDAP
+Module200Desc=LDAP 檔案目錄的同步
 Module210Name=PostNuke
-Module210Desc=PostNuke一體化
-Module240Name=匯出數據
-Module240Desc=Dolibarr 用來匯出資料的工具 (具備協助)
+Module210Desc=PostNuke 的整合
+Module240Name=匯出資料
+Module240Desc=匯出 Dolibarr 資料的工具 (協助)
 Module250Name=資料匯入
-Module250Desc=Dolibarr 用來匯入資料的工具 (具備協助)
-Module310Name=成員
-Module310Desc=基金會成員管理
-Module320Name=RSS饋送
-Module320Desc=添加RSS飼料內Dolibarr屏幕頁面
+Module250Desc=匯入 Dolibarr 資料的工具 (協助)
+Module310Name=會員
+Module310Desc=基金會會員管理
+Module320Name=RSS 訂閱
+Module320Desc=在 Dolibarr 螢幕頁增加 RSS 訂閱
 Module330Name=書籤
 Module330Desc=書籤管理
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also 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=特別支出
-Module500Desc=特別支出管理(稅,社會或財稅,分紅)
+Module500Desc=特別支出管理(稅負、社會或年度稅負、分配)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
-Module600Name=商業活動通知
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
+Module600Name=商業事件通知
+Module600Desc=傳送 EMail 通知 ( 由某些商業事件引起 ) 給用戶 ( 在每位用戶中設定 )、給合作方通訊錄 ( 在每位合作方中設定 ) 或是給固定的 email
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
 Module610Name=Product Variants
 Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
@@ -565,214 +568,216 @@ Module1200Desc=Mantis 功能整合
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=標籤/分類
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=建立標籤/分類 (產品、客戶、供應商、通訊錄或是會員)
 Module2000Name=所視即所得編輯器
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
+Module2000Desc=允許使用進階的編輯器 ( CKEditor ) 編輯某些文字區
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=排程工作
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2300Desc=排程工作管理(連到 cron 或是 chrono table)
+Module2400Name=事件/行程
+Module2400Desc=遵循完成及即將發生的事件。讓應用程式記錄自動事件以用於跟踪目的或記錄手動事件或rendez-vous。
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2500Desc=文件管理系統 / 電子內容管理。您產生或是儲存的文件會自動整理組織。當您有需要就分享吧。
+Module2600Name=API/Web 服務 ( SOAP 伺服器 )
+Module2600Desc=啟動 Dolibarr SOAP 伺服器提供 API 服務 
 Module2610Name=API/Web services (REST server)
 Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2660Name=Call WebServices (SOAP client)
 Module2660Desc=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
+Module2700Name=Gravatar
+Module2700Desc=使用線上的 Gravatar 服務 ( www.gravatar.com )，以顯示用戶/會員的照片 (使用本身的 email 尋找)。此需要連上網
+Module2800Desc=FTP 客戶端
 Module2900Name=GeoIPMaxmind
-Module2900Desc=geoip的Maxmind轉換能力
+Module2900Desc=GeoIP Maxmind 的轉換功能
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
 Module3200Name=Unalterable Archives
 Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
-Module5000Name=多公司
-Module5000Desc=允許你管理多個公司
+Module5000Name=多個公司
+Module5000Desc=允許您管理多個公司
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Products lots
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=出納
-Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
-Module50100Name=銷售點
-Module50100Desc=Point of sales module (POS).
-Module50200Name=貝寶
-Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module20000Name=離職申請管理
+Module20000Desc=聲明並遵守員工離職申請
+Module39000Name=產品批次
+Module39000Desc=在產品中批次或序號、有效日及銷售日的管理
+Module50000Name=PayBox
+Module50000Desc=提供使用 PayBox 的借貸卡做為線上支付方式的模組。此可允許您客戶免付款或是用在特定Dolibarr元件 ( 發票、訂單 ... ) 上付款。
+Module50100Name=銷售時點情報
+Module50100Desc=銷售時點情報模組 ( POS )
+Module50200Name=Paypal
+Module50200Desc=提供使用 PayPal ( 信用卡或是 PayPal 信用) 做為線上支付方式的模組。此可允許您客戶免付款或是在特定 Dolibarr 元件 ( 發票、訂單 ... ) 上付款。
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
 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=Poll, Survey or Vote
 Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
+Module59000Name=利潤
+Module59000Desc=模組管理利潤
+Module60000Name=委員會
+Module60000Desc=模組管理委員會
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 Module63000Name=資源
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=讀取發票
-Permission12=讀取發票
-Permission13=Unvalidate發票
-Permission14=驗證發票
-Permission15=通過電子郵件發送發票
-Permission16=建立付款 for 客戶發票
-Permission19=刪除發票
-Permission21=瞭解商業的建議
-Permission22=建立/修改商業建議
-Permission24=驗證商業建議
-Permission25=發送商業建議
-Permission26=商業建議關閉
-Permission27=商業建議刪除
-Permission28=出口商業建議
+Permission11=讀取客戶發票
+Permission12=建立/修改客戶發票
+Permission13=使客戶發票無效
+Permission14=驗證客戶發票
+Permission15=以電子郵件發送客戶發票
+Permission16=為客戶發票建立付款單
+Permission19=刪除客戶發票
+Permission21=讀取商業的報價/提案/建議書
+Permission22=建立/修改商業報價/提案/建議書
+Permission24=驗證商業報價/提案/建議書
+Permission25=傳送商業報價/提案/建議書
+Permission26=結束商業報價/提案/建議書(結案)
+Permission27=刪除商業報價/提案/建議書
+Permission28=匯出商業報價/提案/建議書
 Permission31=讀取產品資訊
 Permission32=建立/修改產品資訊
 Permission34=刪除產品資訊
-Permission36=查看/隱藏產品管理
+Permission36=查看/管理隱藏的產品
 Permission38=匯出產品資訊
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=刪除項目（共享的項目和項目我聯繫）
+Permission41=讀取專案及任務(分享專案及有關我的專案聯絡人)。也可針對自己或是層級已分配的任務輸入處理時間(時間表)
+Permission42=建立/修改專案(分享專案及有關我的專案聯絡人)。也可建立任務及分配用戶的專案及任務
+Permission44=刪除專案（分享專案及有關我的專案聯絡人）
 Permission45=Export projects
-Permission61=閲讀干預
-Permission62=建立/修改干預
-Permission64=刪除干預
-Permission67=出口乾預措施
-Permission71=閲讀成員
-Permission72=建立/修改成員
-Permission74=刪除成員
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=閲讀訂閲
+Permission61=讀取干預/介入
+Permission62=建立/修改干預/介入
+Permission64=刪除干預/介入
+Permission67=匯出干預/介入
+Permission71=讀取會員
+Permission72=建立/修改會員
+Permission74=刪除會員
+Permission75=會員關係類型設定
+Permission76=匯出資料
+Permission78=讀取訂閲
 Permission79=建立/修改訂閲
-Permission81=讀取商業訂單
-Permission82=建立/修改商業訂單
-Permission84=驗證商業訂單
-Permission86=發送商業訂單
-Permission87=關閉商業訂單
-Permission88=取消商業訂單
-Permission89=刪除商業訂單
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=閲讀報告
+Permission81=讀取客戶訂單
+Permission82=建立/修改客戶訂單
+Permission84=驗證客戶訂單
+Permission86=發送客戶訂單
+Permission87=結束客戶訂單(結案)
+Permission88=取消客戶訂單
+Permission89=刪除客戶訂單
+Permission91=讀取社會或年度稅務及營業稅
+Permission92=建立/修改社會或年度稅務及營業稅
+Permission93=刪除社會或年度稅務及營業稅
+Permission94=匯出社會或年度稅務及營業稅
+Permission95=讀取報告
 Permission101=讀取出貨資訊
 Permission102=建立/修改出貨單
 Permission104=驗證出貨單
-Permission106=Export sendings
+Permission106=匯出出貨單
 Permission109=刪除出貨單
-Permission111=閲讀財務帳目
-Permission112=建立/修改/刪除和比較交易
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=出口交易和帳戶報表
-Permission116=帳戶之間轉帳
-Permission117=檢查調度管理
-Permission121=讀取連接到使用者的客戶/供應商/潛在資訊
-Permission122=建立/修改連接到使用者的客戶/供應商/潛在資訊
-Permission125=刪除連接到使用者的客戶/供應商/潛在資訊
-Permission126=匯出客戶/供應商/潛在資訊
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
-Permission146=閲讀者
-Permission147=讀統計
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejects of direct debit payment orders
-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
+Permission111=讀取財務會計項目
+Permission112=建立/修改/刪除及比較交易
+Permission113=設定財務會計項目(建立、管理分類)
+Permission114=調整各式交易
+Permission115=匯出交易和會計描述
+Permission116=帳戶之間交易
+Permission117=管理支票調度
+Permission121=讀取已連線到用戶的合作方
+Permission122=建立/修改已連線到用戶的合作方
+Permission125=刪除已連線到用戶的合作方
+Permission126=匯出合作方資料
+Permission141=讀取全部專案及任務(也含我無法聯絡的私人專案)
+Permission142=建立/修改全部專案及任務(也含我無法聯絡的私人專案)
+Permission144=刪除全部專案及任務(也含我無法聯絡的私人專案)
+Permission146=讀取提供者
+Permission147=讀取狀況
+Permission151=讀取直接貸方付款訂單
+Permission152=建立/修改直接貸方付款訂單
+Permission153=傳送/傳輸直接貸方付款訂單
+Permission154=記錄直接貸方付款訂單的點數/拒絕
+Permission161=讀取合約/訂閱
+Permission162=建立/修改合約/訂閱
+Permission163=啟動服務合約/合約的訂閱
+Permission164=禁用服務合約/合約的訂閱
+Permission165=刪除合約/訂閱
 Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
+Permission171=讀取旅費(您與您的部屬)
+Permission172=建立及修改旅費
+Permission173=刪除旅費
 Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission178=匯出旅費
 Permission180=讀取供應商資訊
 Permission181=讀取供應商訂單
 Permission182=建立/修改供應商訂單
 Permission183=驗證供應商訂單
 Permission184=核准供應商訂單
-Permission185=Order or cancel supplier orders
+Permission185=下訂或是取消供應商訂單
 Permission186=接收供應商訂單
-Permission187=關閉供應商訂單
+Permission187=結束供應商訂單情(結案)
 Permission188=取消供應商訂單
 Permission192=建立行
 Permission193=取消行
-Permission194=閲讀頻寬線路
-Permission202=建立ADSL連接
-Permission203=為了連接訂單
-Permission204=為了連接
+Permission194=讀取頻寬線路
+Permission202=建立ADSL連線
+Permission203=訂購連接訂單
+Permission204=訂購連接
 Permission205=管理連接
-Permission206=閲讀連接
-Permission211=閲讀電話
+Permission206=讀取連接
+Permission211=讀取電話
 Permission212=訂單行
-Permission213=激活線
+Permission213=啟動線路
 Permission214=安裝電話
 Permission215=安裝商
-Permission221=閲讀emailings
-Permission222=建立/修改emailings（主題，收件人...）
-Permission223=驗證emailings（允許發送）
-Permission229=刪除emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission221=讀取電子郵件
+Permission222=建立/修改電子郵件（主題，收件人...）
+Permission223=驗證電子郵件（允許發送）
+Permission229=刪除電子郵件
+Permission237=檢視收件人及資訊
+Permission238=人工傳送郵件
+Permission239=驗證或傳送後刪除郵件
 Permission241=讀取分類
 Permission242=建立/修改分類
 Permission243=刪除分類
-Permission244=看到隱藏的內容類別
+Permission244=查看隱藏分類的內容
 Permission251=讀取其他用戶和群組資訊
-PermissionAdvanced251=閲讀其他用戶
-Permission252=讀取其他用戶的使用者權限
-Permission253=建立/修改其他用戶、群組資訊及其權限
-PermissionAdvanced253=創建/修改內部/外部用戶和權限
+PermissionAdvanced251=讀取其他用戶
+Permission252=讀取其他用戶的權限
+Permission253=建立/修改其他用戶、群組及其權限
+PermissionAdvanced253=建立/修改內部/外部用戶和權限
 Permission254=只能建立/修改外部用戶資訊
 Permission255=修改其他用戶密碼
-Permission256=刪除或暫時關閉其他用戶
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc).<br>Not effective for projects (only rules on project permissions, visibility and assignement matters).
-Permission271=正讀
-Permission272=閲讀發票
+Permission256=刪除或禁用其他用戶
+Permission262=延伸存取到全部合作方 (不只是用戶是銷售代表的合作方) 。<br>對外部用戶無效 ( 限於自已的提案/報價、訂單、發票、合約等)。<br>對專案無效 (只有專案權限、可見性和分配事宜的規則)。
+Permission271=讀取 CA
+Permission272=讀取發票
 Permission273=發票問題
 Permission281=讀取聯絡人資訊
 Permission282=建立/修改聯絡人資訊
 Permission283=刪除聯絡人資訊
 Permission286=匯出聯絡人資訊
-Permission291=閲讀關稅
-Permission292=關於關稅設置權限
-Permission293=修改關稅的costumers
+Permission291=讀取關稅
+Permission292=設定關稅權限
+Permission293=修改客戶的關稅
 Permission300=讀取條碼
 Permission301=建立/修改條碼
 Permission302=刪除條碼
-Permission311=閲讀服務
-Permission312=Assign service/subscription to contract
-Permission331=閲讀書籤
+Permission311=讀取服務
+Permission312=分配服務/訂閱合約
+Permission331=讀取書籤
 Permission332=建立/修改書籤
 Permission333=刪除書籤
-Permission341=閲讀自己的權限
+Permission341=讀取自己的權限
 Permission342=建立/修改自己的資訊
 Permission343=修改自己的密碼
 Permission344=修改自己的權限
-Permission351=閲讀群體
-Permission352=閲讀組的權限
-Permission353=建立/修改組
-Permission354=刪除或禁用組
+Permission351=讀取群組
+Permission352=讀取群組的權限
+Permission353=建立/修改群組
+Permission354=刪除或禁用群組
 Permission358=匯出用戶資訊
-Permission401=閲讀折扣
+Permission401=讀取折扣
 Permission402=建立/修改折扣
 Permission403=驗證折扣
 Permission404=刪除折扣
@@ -787,12 +792,12 @@ Permission522=Create/modify loans
 Permission524=Delete loans
 Permission525=Access loan calculator
 Permission527=Export loans
-Permission531=閲讀服務
+Permission531=讀取服務
 Permission532=建立/修改服務
 Permission534=刪除服務
-Permission536=查看/隱藏服務管理
-Permission538=出口服務
-Permission701=閲讀捐款
+Permission536=查看/管理隱藏服務
+Permission538=匯出服務
+Permission701=讀取捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
 Permission771=Read expense reports (yours and your subordinates)
@@ -803,8 +808,8 @@ Permission775=Approve expense reports
 Permission776=Pay expense reports
 Permission779=Export expense reports
 Permission1001=讀取庫存資訊
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=建立/修改倉庫
+Permission1003=刪除倉庫
 Permission1004=讀取庫存的轉讓資訊
 Permission1005=建立/修改庫存轉讓
 Permission1101=讀取交貨訂單
@@ -816,49 +821,49 @@ Permission1182=讀取供應商訂單
 Permission1183=建立修改供應商訂單
 Permission1184=驗證供應商訂單
 Permission1185=核准供應商訂單
-Permission1186=整理供應商訂單
+Permission1186=訂購供應商訂單
 Permission1187=告知供應商訂單的接收資訊
 Permission1188=刪除供應商訂單
 Permission1190=Approve (second approval) supplier orders
-Permission1201=取得一個匯出結果
-Permission1202=建立/修改一個匯出
-Permission1231=讀取供應商發票(invoice)
-Permission1232=建立供應商發票(invoice)
-Permission1233=驗證供應商發票(invoice)
-Permission1234=刪除供應商發票(invoice)
-Permission1235=通過電子郵件發送的供應商發票
-Permission1236=匯出供應商發票(invoice)、屬性及其付款資訊
-Permission1237=Export supplier orders and their details
-Permission1251=執行外部資料大量匯入資料庫的功能(載入資料)
-Permission1321=匯出客戶的發票(invoice)、屬性及其付款資訊
+Permission1201=取得匯出結果
+Permission1202=建立/修改匯出
+Permission1231=讀取供應商發票
+Permission1232=建立/修改供應商發票
+Permission1233=驗證供應商發票
+Permission1234=刪除供應商發票
+Permission1235=以電子郵件發送的供應商發票
+Permission1236=匯出供應商發票、屬性及其付款資訊
+Permission1237=匯出供應商訂單及其詳細資料
+Permission1251=執行匯入大量外部資料到資料庫的功能 (載入資料)
+Permission1321=匯出客戶發票、屬性及其付款資訊
 Permission1322=Reopen a paid bill
-Permission1421=匯出商業訂單及屬性資訊
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
+Permission1421=匯出客戶訂單及屬性資訊
+Permission20001=Read leave requests (your leaves and the one of your subordinates)
+Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=閲讀的行動（事件或任務）連結到其戶口
-Permission2402=建立/修改行動（事件或任務）連結到其戶口
-Permission2403=（事件或任務）與他的帳戶刪除操作
-Permission2411=閲讀的行動（事件或任務）他人
-Permission2412=建立/修改行動（事件或任務）的人
-Permission2413=（事件或任務）刪除他人行動
+Permission23001=讀取預定工作
+Permission23002=建立/更新預定工作
+Permission23003=刪除預定工作
+Permission23004=執行預定工作
+Permission2401=讀取連結到其帳戶的行動（事件或任務）
+Permission2402=建立/修改連結到其帳戶的行動（事件或任務）
+Permission2403=刪除連結到其帳戶的行動（事件或任務）
+Permission2411=讀取其他的行動（事件或任務）
+Permission2412=建立/修改其他的行動（事件或任務）
+Permission2413=刪除其他的行動（事件或任務）
 Permission2414=Export actions/tasks of others
-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)
-Permission50101=Use Point of sales
+Permission2501=讀取/下載文件
+Permission2502=下載文件
+Permission2503=提交或刪除文件
+Permission2515=設定文件的檔案目錄
+Permission2801=在唯讀模式下使用 FTP 客戶端 (僅瀏覽及下載)
+Permission2802=在寫入模式下使用 FTP 客戶端 (可刪除或上傳檔案)
+Permission50101=使用銷售時點情報系統
 Permission50201=讀取交易
-Permission50202=進口交易
+Permission50202=匯入交易
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -884,6 +889,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=付款條件
 DictionaryPaymentModes=付款方式
 DictionaryTypeContact=聯絡人類型
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax指令（WEEE）
 DictionaryPaperFormat=文件格式
 DictionaryFormatCards=Cards formats
@@ -895,48 +901,48 @@ DictionaryOrderMethods=排列方法
 DictionarySource=訂單來源方式
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
+DictionaryAccountancyJournal=各式會計日記簿
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=單位
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
+DictionaryOpportunityStatus=專案/潛在客戶的機會狀況
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 SetupSaved=設定值已儲存
 SetupNotSaved=Setup not saved
-BackToModuleList=返回模組列表
-BackToDictionaryList=回到設定選項列表
+BackToModuleList=返回模組清單
+BackToDictionaryList=回到設定選項清單
 TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=營業稅管理
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=預設情況下，建議的營業稅為0，可用於像協會的情況下才使用，個人歐小型公司。
-VATIsUsedExampleFR=在法國，這意味着公司或機構有真正的財政體制（簡體真實的或正常的真實）。在其中一個營業稅申報制度。
-VATIsNotUsedExampleFR=在法國，這意味着協會，都是非營業稅申報或公司，組織或已選擇了微型企業會計制度（特許增值稅）和申報繳納營業稅沒有任何專利權營業稅自由職業者。這一選擇將顯示“的提法不適用營業稅 - 發票上的藝術的CGI 293B”。
+VATIsUsedDesc=當建立潛在客戶、發票、訂單等營業稅稅率會以下列標準規則啟動：<br>若賣方不接受營業稅，則營業稅預設為 0 的規則。<br>若(買賣雙方國家)相同時，營業稅率會預設為賣方國家的產品營業稅。<br>若賣方與買方皆歐盟國家且貨物是運輸產品(車子、船舶、飛機)，則預設營業稅為 0 ( 營業稅由買方支付給買方國家，非賣方 )。<br>若賣方與買方皆歐盟國家且買方非公司組織，則營業稅預設為銷售產品的營業稅。<br>若賣方與買方皆歐盟國家且買方是公司組織，則營業稅預設為 0。<br>其他例子則預設營業稅為 0。
+VATIsNotUsedDesc=預設情況下建議的營業稅為 0，可用於像協會、個人或是小型公司。
+VATIsUsedExampleFR=在法國，指的是有實際會計年度 (簡單真實或一般真實)的公司或組織。是營業稅適用的系統。
+VATIsNotUsedExampleFR=在法國，指的是選擇微型企業會計年度(特許的營業稅)如非適用營業稅之協會或是公司、組織或是自由專門職業且支付不適用營業稅的特許營業稅。此選項會在發票顯示為"不適用營業稅 - art-293B of CGI"。
 ##### Local Taxes #####
 LTRate=稅率
-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
+LocalTax1IsNotUsed=不使用第二種稅率
+LocalTax1IsUsedDesc=使用第二稅率類型(除營業稅外)
+LocalTax1IsNotUsedDesc=不使用其他稅率類型(除營業稅外)
+LocalTax1Management=第二種稅率類型
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-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
+LocalTax2IsNotUsed=不使用第三種稅率
+LocalTax2IsUsedDesc=使用第三種稅率類型(除營業稅外)
+LocalTax2IsNotUsedDesc=不使用其他稅率類型(除營業稅外)
+LocalTax2Management=第三種稅率類型
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= 稀土管理
-LocalTax1IsUsedDescES= 預設情況下，稀土率在創建前景，發票，訂單等後續活動的標準規定： <br>如果德買方沒有受到稀土，稀土預設= 0。結束統治。 <br>如果買方是受再然後在預設情況下可再生能源。結束統治。 <br>
-LocalTax1IsNotUsedDescES= 預設情況下，建議重為0。結束統治。
-LocalTax1IsUsedExampleES= 在西班牙，他們是專業人士受西班牙誤差性能指標的某些具體的條文。
-LocalTax1IsNotUsedExampleES= 在西班牙，他們是專業和社會，受到了西班牙誤差性能指標的某些章節。
-LocalTax2ManagementES= IRPF管理
-LocalTax2IsUsedDescES= 預設情況下，稀土率在創建前景，發票，訂單等後續活動的標準規定： <br>如果賣方沒有受到IRPF，然後IRPF預設= 0。結束統治。 <br>如果賣方遭受IRPF則預設IRPF。結束統治。 <br>
-LocalTax2IsNotUsedDescES= 預設情況下，建議IRPF為0。結束統治。
-LocalTax2IsUsedExampleES= 在西班牙，自由職業者，誰提供服務，誰選擇了模組稅務系統公司獨立專業人士。
-LocalTax2IsNotUsedExampleES= 在西班牙他們bussines不繳稅的模組系統。
+LocalTax1ManagementES= RE 管理
+LocalTax1IsUsedDescES= 當在建立潛在客戶、發票、訂單等後續活動的標準規定，其預設 RE 率為： <br>如果買方沒有受RE，預設 RE = 0。<br>如果買方是接受 RE 則預設為 RE。 <br>
+LocalTax1IsNotUsedDescES= 預設的 RE 建議值為0。
+LocalTax1IsUsedExampleES= 在西班牙他們是受到西班牙 IAE 某些特別規範的專業人士。
+LocalTax1IsNotUsedExampleES= 在西班牙他們是專業及社會人士且受到西班牙 IAE 某些特別的規範。
+LocalTax2ManagementES= IRPF 管理
+LocalTax2IsUsedDescES= 當在建立潛在客戶、發票、訂單等後續活動的標準規定，其預設 RE 率為： <br>如果賣方不接受 IRPF，則 IRPF 預設 = 0。 <br>如果賣方受 IRPF 規範，則 IRPF 為預設。 <br>
+LocalTax2IsNotUsedDescES= 預設的 IRPF 建議值為0。
+LocalTax2IsUsedExampleES= 在西班牙，自由職業者及提供服務的專業人士及選擇稅務系統模組的公司。
+LocalTax2IsNotUsedExampleES= 在西班牙他們是生意不是稅務系統模組話題。
 CalcLocaltax=Reports on local taxes
 CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
@@ -944,25 +950,25 @@ CalcLocaltax2=可否採購
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=可否銷售
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=預設情況下使用標籤，如果沒有翻譯，可找到的代碼
-LabelOnDocuments=標籤上的文件
-NbOfDays=鈮天
-AtEndOfMonth=月末
+LabelUsedByDefault=若代號沒有找翻譯字句，則預設使用標籤
+LabelOnDocuments=文件上的標籤
+NbOfDays=Nb 的天數
+AtEndOfMonth=月底
 CurrentNext=Current/Next
 Offset=抵銷
-AlwaysActive=始終活躍
+AlwaysActive=始終啟動
 Upgrade=升級
 MenuUpgrade=升級/擴充
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+AddExtensionThemeModuleOrOther=部署/安裝外部程式/模組
 WebServer=網頁伺服器
 DocumentRootServer=網頁伺服器的根目錄
-DataRootServer=數據文件的目錄
-IP=知識產權
-Port=港口
+DataRootServer=資料檔案的檔案目錄
+IP=IP
+Port=連接埠
 VirtualServerName=虛擬服務器名稱
 OS=作業系統
-PhpWebLink=PHP網路連結
-Browser=Browser
+PhpWebLink=網路PHP的連線
+Browser=瀏覽器
 Server=服務器
 Database=資料庫
 DatabaseServer=資料庫主機
@@ -971,172 +977,173 @@ DatabasePort=資料庫連接埠
 DatabaseUser=資料庫用戶
 DatabasePassword=資料庫密碼
 Tables=表格
-TableName=表名稱
-NbOfRecord=鈮記錄
+TableName=表格名稱
+NbOfRecord=Nb 的記錄
 Host=服務器
-DriverType=驅動類型
+DriverType=驅動程式類型
 SummarySystem=系統資訊摘要
-SummaryConst=列出所有Dolibarr設置參數
-MenuCompanySetup=Company/Organisation
-DefaultMenuManager= 標準菜單管理
-DefaultMenuSmartphoneManager=智能手機菜單管理
+SummaryConst=所有 Dolibarr 設定參數清單
+MenuCompanySetup=公司/組織
+DefaultMenuManager= 標準選單管理器
+DefaultMenuSmartphoneManager=智慧型手機選單管理器
 Skin=佈景主題
 DefaultSkin=預設佈景主題
-MaxSizeList=最大清單長度
-DefaultMaxSizeList=Default max length for lists
+MaxSizeList=清單的最大長度
+DefaultMaxSizeList=預設清單的最大長度
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=消息的一天
-MessageLogin=登錄頁的信息
+MessageOfDay=一天的訊息
+MessageLogin=登錄頁的訊息
 LoginPage=Login page
 BackgroundImageLogin=Background image
-PermanentLeftSearchForm=常駐左搜尋列表菜單
-DefaultLanguage=預設語言使用（語言代碼）
+PermanentLeftSearchForm=左側選單上的尋找表單
+DefaultLanguage=預設使用語言（語言代號）
 EnableMultilangInterface=啟用多語言界面
-EnableShowLogo=在菜單上顯示的標誌
-CompanyInfo=Company/organisation information
-CompanyIds=Company/organisation identities
+EnableShowLogo=在左側選單顯示組織標誌
+CompanyInfo=公司/組織資訊
+CompanyIds=公司/組織身分
 CompanyName=名稱
 CompanyAddress=地址
 CompanyZip=郵遞區號
-CompanyTown=鎮
+CompanyTown=鄉鎮市區
 CompanyCountry=國家
 CompanyCurrency=主要貨幣
 CompanyObject=Object of the company
-Logo=Logo
+Logo=組織標誌
 DoNotSuggestPaymentMode=不建議
 NoActiveBankAccountDefined=沒有定義有效的銀行帳戶
-OwnerOfBankAccount=銀行帳戶%342
-BankModuleNotActive=銀行模組沒有啟用
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=其他快訊資訊
-DelaysOfToleranceBeforeWarning=前警告性延誤
-DelaysOfToleranceDesc=這個屏幕允許你定義的警報之前不能容忍拖延是與象形%s的屏幕報晚元素。
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
+OwnerOfBankAccount=銀行帳戶的擁有者%s
+BankModuleNotActive=銀行帳戶模組沒有啟用
+ShowBugTrackLink=顯示連線"<strong>%s</strong>"
+Alerts=警告
+DelaysOfToleranceBeforeWarning=警告提醒
+DelaysOfToleranceDesc=此螢幕允許您定義對每一元件用形狀%s的螢幕警告提醒。
+Delays_MAIN_DELAY_ACTIONS_TODO=在已計劃的事件(行程事件)中尚未完成的警告提醒(以天計)
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=沒有即時結束專案提醒的延遲容忍度（以天為單位）
 Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=對訂單尚未完成程序的警告提醒(以天計)
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=對供應商訂單尚未完成的警告提醒(以天計)
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=在結束提案前的警告提醒(以天計)
+Delays_MAIN_DELAY_PROPALS_TO_BILL=建議書/報價/提單沒有計費的警告提醒(以天計)
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=對服務尚未啟動的警告提醒(以天計)
+Delays_MAIN_DELAY_RUNNING_SERVICES=對過期服務的警告提醒(以天計)
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=對尚未付款供應商發票的警告提醒(以天計)
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=對尚未付款客戶發票的警告提醒(以天計)
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=正在等待銀行對帳的警告提醒(以天計)
+Delays_MAIN_DELAY_MEMBERS=對延遲會員費用的警告提醒(以天計)
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=檢查存款的警告提醒(以天計)
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
-SetupDescription5=其他菜單項管理可選參數。
+SetupDescription1=在使用 Dolibarr 前"設定區"是一開始要設定的參數。
+SetupDescription2=這兩個必需的設定步驟是左側設定選單中的前兩個步驟：%s設定頁面及%s設定頁面：
+SetupDescription3=在選單的參數<a href="%s">%s -> %s</a>是必須的，因為在 Dolibarr 螢幕會使用到定義的資料及以客制化的預設軟體行為(例如與各國相關的功能)
+SetupDescription4=在選單的參數<a href="%s">%s -> %s</a>是必須的，因為 Dolibarr ERP/CRM 是數個模組/程式的集合，或多或少是獨立的。每一啟動的模組會增加選單的功能。
+SetupDescription5=其他選單項管理可選的參數。
 LogEvents=安全稽核事件
-Audit=安全稽核
-InfoDolibarr=About Dolibarr
+Audit=稽核
+InfoDolibarr=關於 Dolibarr
 InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
+InfoOS=關於作業系統
+InfoWebServer=關於網頁伺服器
+InfoDatabase=關於資料庫
+InfoPHP=關於 PHP
 InfoPerf=About Performances
 BrowserName=Browser name
 BrowserOS=Browser OS
-ListOfSecurityEvents=安全事件清單
-SecurityEventsPurged=安全事件清除
-LogEventDesc=在這裡您可以啟用的Dolibarr安全事件日誌記錄。管理員就可以看到它的菜單內容，通過<b>系統工具-稽核</b> 。警告，此功能可以在數據庫中消耗了大量數據。
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
-SystemInfoDesc=只有系統管理員可以取得系統資訊。
-SystemAreaForAdminOnly=此區是只給具有管理員權限的使用者。在此系統軟體中，這是必要的限制。
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=您可以選擇相關的Dolibarr每個參數的外觀和感覺這裡
-AvailableModules=Available app/modules
-ToActivateModule=要激活模組，繼續安裝區（首頁->安裝->模組）。
-SessionTimeOut=會話超時
-SessionExplanation=這個數字保證會議將永不過期此之前的延遲。在此期限後但PHP sessoin管理並不保證該屆會議上總是屆滿：如果出現這種情況的制度進行清理緩存會話運行。 <br>註：沒有特定的系統，內部PHP的過程將清除<b>之晤談</b>約每<b>%/%s的</b>訪問，但只在會議期間提出的其他訪問。
+ListOfSecurityEvents=Dolibarr 安全事件清單
+SecurityEventsPurged=清除安全事件
+LogEventDesc=您可以啟動記錄 Dolibarr 安全事件日誌。管理員就可以透過選單<b>系統工具-稽核</b> 看到內容。警告，此功能在資料庫中消耗了大量資料。
+AreaForAdminOnly=設定參數僅由<b>管理員用戶</b>設定。
+SystemInfoDesc=僅供具有系統管理員以唯讀及可見模式取得系統資訊。
+SystemAreaForAdminOnly=此區僅供具有管理員權限用戶。Dolibarr 權限都不能減少此限制。
+CompanyFundationDesc=在此頁編輯你需要管理的公司或是基金會的全部已知資訊(點選下方的"修改"或是儲存"鈕)。
+AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+DisplayDesc=您可以選擇與 Dolibarr 的外觀及感受有關的每一項參數
+AvailableModules=可用的程式/模組
+ToActivateModule=為啟動模組則到設定區（首頁 -> 設定 -> 模組）。
+SessionTimeOut=連線階段超時
+SessionExplanation=當此連線階段由內部PHP連線階段清除器清除時(沒有別的)，此數字保證連線階段在遞延前不會到期。內部PHP連線階段清除器不會保證此遞延後的連線階段將會到期。當連線階段清除器在執行時，則此遞延之後將會到期，所以每個<b>%s/%s</b>存取，不只限制由其他階段存取的期間。<br>注意：有外部連線階段清除機器的某些伺服器( DEBIAN, UBUNTU 下的 CRON)，不論參數值多少，當預設參數<strong>session.gc_maxlifetime</strong>定義後，連線階段會被破壞。
 TriggersAvailable=可用的觸發器
-TriggersDesc=觸發器是文件，將修改工作流行為Dolibarr一旦<b>觸發</b>複製到該目錄<b>htdocs中/包括/。</b>他們認識到新的行動，對Dolibarr事件（新公司的建立，發票驗證，...).啟動
-TriggerDisabledByName=在這個文件觸發器被禁用的<b>，將NoRun</b>在其名稱尾碼。
-TriggerDisabledAsModuleDisabled=在這個文件觸發器被禁用的模組<b>%s</b>是禁用的。
-TriggerAlwaysActive=在這個文件觸發器總是活躍，無論是激活Dolibarr模組。
-TriggerActiveAsModuleActive=在這個文件中啟用觸發器活躍模組<b>%s</b>是。
-GeneratedPasswordDesc=這裡定義的規定，你要用來生成新的密碼，如果你問有自動生成的密碼
+TriggersDesc=觸發器是可以修改Dolibarr工作流程行為的檔案，一旦複製到該檔案目錄<b>/htdocs/core/triggers</b>。他們實現了新的行動，啟動 Dolibarr 事件（新公司的建立，發票驗證...)。
+TriggerDisabledByName=在此檔案中觸發器是禁用的，其名稱尾碼<b>-NORUN</b>。
+TriggerDisabledAsModuleDisabled=當模組<b>%s</b>禁用時，此檔案中觸發器是禁用的。
+TriggerAlwaysActive=此檔案中觸發器是活躍的，無論啟動任何 Dolibarr 模組。
+TriggerActiveAsModuleActive=當模組<b>%s</b>為啟動時，此檔案中觸發器是可用的。
+GeneratedPasswordDesc=在此定義當您詢問需要自動產生密碼時，您就要使用新密碼
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=限制及精準度
-LimitsDesc=您可以定義範圍，精度和Dolibarr這裡使用的最佳化
-MAIN_MAX_DECIMALS_UNIT=單位價格最高為小數
-MAIN_MAX_DECIMALS_TOT=總價格的最高位小數
-MAIN_MAX_DECIMALS_SHOWN=屏幕（最大顯示價格小數就新增<b>...</b>這個號碼後，如果你想看到<b>...</b>當數被截斷時，屏幕上顯示）
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=一種產品的單位價格網
-TotalPriceAfterRounding=總價格（淨值/增值稅/含稅）後四捨五入
+ConstDesc=此頁允許您編輯所有不在前頁的參數。這些主要是為開發人員或進階故障排除預留參數。<a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">在此可檢查</a>選項清單。
+MiscellaneousDesc=所有其他與安全參數有關的在此定義。
+LimitsSetup=限制及精準度設定
+LimitsDesc=在此 Dolibarr 使用您定義的限制、精準度及最佳化。
+MAIN_MAX_DECIMALS_UNIT=單價的小數點
+MAIN_MAX_DECIMALS_TOT=總價的小數點
+MAIN_MAX_DECIMALS_SHOWN=在螢幕上顯示價格的最大位數小數點 (新增<b>...</b>想看到新增的數字<b>...</b>當螢幕上顯示數字被截掉時)
+MAIN_ROUNDING_RULE_TOT=捨去範圍的步驟 (對於基數為10以外的國家/地區進行捨去。例如：若以 0.05 步完成捨去，則輸入 0.05)
+UnitPriceOfProduct=產品的淨單位價格
+TotalPriceAfterRounding=捨去後總價格（淨價/營業稅/含稅價）
 ParameterActiveForNextInputOnly=下一個輸入參數才能有效
-NoEventOrNoAuditSetup=沒有安全事件已被記錄呢。這可以是正常的，如果稽核沒有在“設置中啟用 - 安全 - 稽核”頁面。
-NoEventFoundWithCriteria=沒有安全事件已發現這種搜尋標準。
-SeeLocalSendMailSetup=看到您當地的sendmail的設置
-BackupDesc=為了使一個完整的Dolibarr備份，您必須：
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
-BackupDescX=存檔的目錄應該被存儲在一個安全的地方。
-BackupDescY=生成的轉儲文件應存放在安全的地方。
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-RestoreDesc=要還原Dolibarr備份，您必須：
-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 (<b>%s</b>).
-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 (<b>%s</b>). 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= 這項規則是被迫到<b>%s</b>的一個激活的模組
-PreviousDumpFiles=Generated database backup files
+NoEventOrNoAuditSetup=尚未有被記錄的安全事件。若“設定 - 安全 - 稽核”頁面沒有啟動稽核，則為正常的。
+NoEventFoundWithCriteria=沒有搜尋到此條件的安全事件。
+SeeLocalSendMailSetup=查看本地的 sendmail 的設定
+BackupDesc=為了完整的 Dolibarr 備份，您必須：
+BackupDesc2=儲存文件檔案目錄的內 (<b>%s</b>) 包含所有已上傳及產生的檔案 ( 所以此包含在步驟1中所有產生的轉存檔案 )
+BackupDesc3=儲存您資料庫的內容(<b>%s</b>)到轉存檔案。為完成此您要使用接下來的助理。
+BackupDescX=檔案目錄應該被存放於安全的地方。
+BackupDescY=產生的轉存檔案應存放於安全的地方。
+BackupPHPWarning=此法不能保證可備份。使用上一個
+RestoreDesc=還原 Dolibarr 備份檔，您必須：
+RestoreDesc2=還原文件目錄的檔案 (例如 ZIP 檔) 是將以樹狀目錄的方式解壓檔案到新安裝 Dolibarr 的文件檔案目錄內或是解到目前文件檔案目錄(<b>%s</b>)。
+RestoreDesc3=從備份轉存檔案還原的資料匯入到新安裝的 Dolibarr 或是目前已安裝的程式 (<b>%s</b>)。警告，一旦還原完成，您必須使用回復的資料庫中的用戶及密碼重新連線。還原備份資料庫到目前已安裝的程式，你可以依照接以下的幫助處理。
+RestoreMySQL=匯入 MySQL
+ForcedToByAModule= 啟動的模組<b>%s</b>都強制適用此規則
+PreviousDumpFiles=已產生資料庫備份檔案
 WeekStartOnDay=每週的第一天
-RunningUpdateProcessMayBeRequired=運行升級進程似乎需要（程序版本%s版本%s從數據庫不同）
-YouMustRunCommandFromCommandLineAfterLoginToUser=您必須運行此命令從命令行殻用戶登錄後<b>進入%s。</b>
-YourPHPDoesNotHaveSSLSupport=SSL的功能不是在您的PHP可用
+RunningUpdateProcessMayBeRequired=似乎需要執行昇級程式（程式版本 %s不同於資料庫版本%s）
+YouMustRunCommandFromCommandLineAfterLoginToUser=用戶<b>%s</b>在登入終端機後您必須從命令列執行此命令，或您必須在命令列末增加 -W 選項以提供 <b>%s</b> 密碼。
+YourPHPDoesNotHaveSSLSupport=在您 PHP 中 SSL 的功能是不使用
 DownloadMoreSkins=更多佈景主題下載
-SimpleNumRefModelDesc=編號會依照 %syymm-nnnn 的參數規則產生編號。其中yy是年、mm是月、nnnn 是序列數字。
-ShowProfIdInAddress=文件上顯示professionnal地址ID
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
+SimpleNumRefModelDesc=編號會依照 %syymm-nnnn 的參數規則產生編號。其中yy是年、mm是月、nnnn 是不間斷且不重設的序列數字。
+ShowProfIdInAddress=顯示在文件中專業  ID
+ShowVATIntaInAddress=隱藏在文件中營業稅內部編號
 TranslationUncomplete=部分翻譯
-MAIN_DISABLE_METEO=禁用氣象局認為
+MAIN_DISABLE_METEO=禁用氣象檢視
 MeteoStdMod=Standard mode
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Percentage mode
 MeteoPercentageModEnabled=Percentage mode enabled
 MeteoUseMod=Click to use %s
-TestLoginToAPI=測試登錄到API
-ProxyDesc=Dolibarr的某些功能需要有一個上網工作。這裡定義為這個參數。 ，如果Dolibarr服務器代理服務器後面的是，那些參數告訴Dolibarr的如何通過它來訪問互聯網。
-ExternalAccess=外部訪問
-MAIN_PROXY_USE=使用代理服務器（否則直接訪問互聯網）
-MAIN_PROXY_HOST=代理服務器的名稱/地址
+TestLoginToAPI=測試登入到 API
+ProxyDesc=Dolibarr 的某些功能需要連上網路工作。此定義為這類參數。，如果 Dolibarr 服務器是在隱藏在代理服務器後，則那些參數為通知 Dolibarr 要如何通過它來連上網路。
+ExternalAccess=外部存取
+MAIN_PROXY_USE=使用代理服務器（否則直接連上網路存取）
+MAIN_PROXY_HOST=代理服務器的名稱/位置
 MAIN_PROXY_PORT=代理服務器的連接埠
-MAIN_PROXY_USER=登錄使用代理服務器
+MAIN_PROXY_USER=登入使用代理服務器
 MAIN_PROXY_PASS=使用代理服務器的密碼
-DefineHereComplementaryAttributes=請再這裡新增客制化欄位，以便讓 %s 模組可以支援顯示。
-ExtraFields=新增客制化欄位
+DefineHereComplementaryAttributes=在此定義全部屬性，也包含了預設可用的屬性，以便讓 %s 模組可以支援顯示。
+ExtraFields=補充屬性
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices 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)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsThirdParties=補充屬性(合作方)
+ExtraFieldsContacts=補充屬性(聯絡資訊/地址)
+ExtraFieldsMember=補充屬性(會員)
+ExtraFieldsMemberType=補充屬性(會員類型)
+ExtraFieldsCustomerInvoices=補充屬性(發票)
 ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+ExtraFieldsSupplierOrders=補充屬性(訂單)
+ExtraFieldsSupplierInvoices=補充屬性(發票)
+ExtraFieldsProject=補充屬性(專案)
+ExtraFieldsProjectTask=補充屬性(任務)
+ExtraFieldHasWrongValue=屬性 %s 有錯誤值。
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=警告，在某些Linux系統，從您的電子郵件發送電子郵件，必須conatins sendmail的執行設置選項-BA（參數mail.force_extra_parameters到你的php.ini文件）。如果收件人沒有收到電子郵件，嘗試編輯mail.force_extra_parameters =-BA）這個PHP參數。
+SendmailOptionNotComplete=警告，在某些Linux系統，從您的電子郵件發送電子郵件，必須包含 sendmail 的執行設置選項 -ba（在您的 php.ini 檔案設定參數 mail.force_extra_parameters ）。如果收件人沒有收到電子郵件，嘗試編輯 mail.force_extra_parameters = -ba 這個PHP參數。
 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=Setup of translation
+TranslationSetup=翻譯設定
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
+TranslationDesc=如何設定顯示應用程式語言: <br>* 系統上: 選單 <strong> 首頁 - 設定 - 顯示</strong><br> * 每個人: 在用戶卡 (點選螢幕最上方的用戶) 使用 <strong>用戶顯示設定</strong> 分頁。
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1145,13 +1152,13 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
+TotalNumberOfActivatedModules=已啟動程式/模組: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=您至少要啟動 1 個模組
+ClassNotFoundIntoPathWarning=在 PHP 路徑沒有找到 Class %s
+YesInSummer=是的，在夏天
+OnlyFollowingModulesAreOpenedToExternalUsers=注意，接下來的模組由外部用戶 ( 無論用戶的權限為何 ) 開啟且只有授權的情況下：
+SuhosinSessionEncrypt=以 Suhosin 加密方式儲存連線階段
+ConditionIsCurrently=目前情況 %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.
@@ -1167,59 +1174,59 @@ FieldEdition=外地版 %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Get barcode
 ##### Module password generation
-PasswordGenerationStandard=返回一個密碼生成算法根據內部Dolibarr：8個字元，包含共享小寫數字和字元。
-PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
+PasswordGenerationStandard=回到由 Dolibarr 本身算法所產生的密碼：8個字元，包含小寫數字和字元。
+PasswordGenerationNone=不建議產生任何密碼，必須由人工輸入。
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
 PasswordPatternDesc=Password pattern description
 ##### Users setup #####
-RuleForGeneratedPasswords=建議的規則來生成密碼或驗證密碼
-DisableForgetPasswordLinkOnLogonPage=不顯示連結“登錄時忘記密碼”頁面
-UsersSetup=用戶模組設置
-UserMailRequired=創建用戶時需要輸入電子郵件資訊
+RuleForGeneratedPasswords=依建議的規則產生密碼或驗證密碼
+DisableForgetPasswordLinkOnLogonPage=在登入頁面不顯示連結“忘記密碼”的連線
+UsersSetup=用戶模組設定
+UserMailRequired=建立用戶時需要輸入電子郵件資訊
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
-CompanySetup=客戶/供應商模組及其相關參數設置
-CompanyCodeChecker=客戶/潛在/供應商編號產生及檢查模組設定
-AccountCodeManager=Module for accounting code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
+CompanySetup=各式公司模組設定
+CompanyCodeChecker=產生及檢查合作方代號的模組(客戶或供應商)
+AccountCodeManager=產生會計代號的模組(客戶或供應商)
+NotificationsDesc=EMail 通知功能允許您在某些 Dolibarr 事件時自動傳送郵件。通知的標的如下：
 NotificationsDescUser=* per users, one user at time.
 NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=文件範本
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=從 OpenDocument 的範本產生文件(可由 OpenOffice, KOffice, TextEdit 開啟的 .ODT 或.ODS檔案)
 WatermarkOnDraft=在草稿文件上產生浮水印字串(如果以下文字框不是空字串)
 JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=專業術語欄位ID是否獨一無二
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
+MustBeUnique=必須是唯一值？
+MustBeMandatory=強制建立合作方？
+MustBeInvoiceMandatory=強制驗證發票？
 TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
-WebCalUrlForVCalExport=出口連接到<b>%s</b>格式可在以下連結：%s的
+WebCalUrlForVCalExport=匯出連接到 <b>%s</b> 格式可在以下連結：%s的
 ##### Invoices #####
-BillsSetup=發票模組設置
-BillsNumberingModule=發票編號和信用票據模組
-BillsPDFModules=發票文件範本
+BillsSetup=發票模組設定
+BillsNumberingModule=發票及貸方通知單編號模組
+BillsPDFModules=發票文件模組
 PaymentsPDFModules=Payment documents models
-CreditNote=信用注意
-CreditNotes=信用票據
+CreditNote=貸方通知單
+CreditNotes=貸方通知單
 ForceInvoiceDate=強制使用驗證日期為發票(invoice)日期
-SuggestedPaymentModesIfNotDefinedInInvoice=設定發票(invoice)付款方式的預設值，如果在在發票(invoice)模組中沒有此定義。
-SuggestPaymentByRIBOnAccount=利用帳戶提款方式來付款
-SuggestPaymentByChequeToAddress=利用支票方式來付款
-FreeLegalTextOnInvoices=可在下面輸入額外的發票資訊
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+SuggestedPaymentModesIfNotDefinedInInvoice=如果在發票上沒有定義付款方式，則其預設值。
+SuggestPaymentByRIBOnAccount=建議用匯款方式付款
+SuggestPaymentByChequeToAddress=建議用支票方式付款
+FreeLegalTextOnInvoices=輸入額外的發票資訊
+WatermarkOnDraftInvoices=在發票草稿上的浮水印(若空白則無)
 PaymentsNumberingModule=Payments numbering model
 SuppliersPayment=已收到的供應商付款單據清單
 SupplierPaymentSetup=Suppliers payments setup
 ##### Proposals #####
-PropalSetup=商業建議模組設置
-ProposalsNumberingModules=商業建議編號模組
-ProposalsPDFModules=商業模式的建議文件
-FreeLegalTextOnProposal=可在下面輸入額外的建議書資訊
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+PropalSetup=商業報價/提案模組設定
+ProposalsNumberingModules=商業報價/提案編號模式
+ProposalsPDFModules=商業報價/提案文件模式
+FreeLegalTextOnProposal=輸入額外的商業報價/提案
+WatermarkOnDraftProposal=商業報價/提案草稿上的浮水印(若空白則無)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
 SupplierProposalSetup=Price requests suppliers module setup
@@ -1232,11 +1239,11 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
 ##### Orders #####
-OrdersSetup=設定訂單管理模組
+OrdersSetup=訂單管理設定
 OrdersNumberingModules=訂單編號模組
-OrdersModelModule=訂單文件範本
+OrdersModelModule=訂單文件模式
 FreeLegalTextOnOrders=可在下面輸入額外的訂單資訊
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+WatermarkOnDraftOrders=訂單草稿上的浮水印(若空白則無)
 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
 ##### Interventions #####
@@ -1305,18 +1312,18 @@ LDAPContactDn=Dolibarr接觸'的DN
 LDAPContactDnExample=完整的DN（例如：歐=接觸，直流=社會，直流= com）上
 LDAPMemberDn=Dolibarr成員的DN
 LDAPMemberDnExample=完整的DN（例如：歐=成員，直流=社會，直流= com）上
-LDAPMemberObjectClassList=objectClass的名單
-LDAPMemberObjectClassListExample=名單確定（例如：頂，頂的inetOrgPerson或為活動目錄用戶記錄屬性objectclass）
+LDAPMemberObjectClassList=objectClass 清單
+LDAPMemberObjectClassListExample=objectClass 清單已定義記錄屬性(例如：top,inetOrgPerson 或是 top, 啟動檔案目錄的用戶)
 LDAPMemberTypeDn=Dolibarr members types DN
 LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
 LDAPMemberTypeObjectClassList=objectClass的名單
 LDAPMemberTypeObjectClassListExample=定義（例如：記錄屬性objectclass列表的頂部，groupOfUniqueNames）
-LDAPUserObjectClassList=objectClass的名單
-LDAPUserObjectClassListExample=名單確定（例如：頂，頂的inetOrgPerson或為活動目錄用戶記錄屬性objectclass）
-LDAPGroupObjectClassList=objectClass的名單
-LDAPGroupObjectClassListExample=定義（例如：記錄屬性objectclass列表的頂部，groupOfUniqueNames）
-LDAPContactObjectClassList=objectClass的名單
-LDAPContactObjectClassListExample=名單確定（例如：頂，頂的inetOrgPerson或為活動目錄用戶記錄屬性objectclass）
+LDAPUserObjectClassList=objectClass 清單
+LDAPUserObjectClassListExample=objectClass 清單已定義記錄屬性(例如：top,inetOrgPerson 或是 top, 啟動檔案目錄的用戶)
+LDAPGroupObjectClassList=objectClass 清單
+LDAPGroupObjectClassListExample=objectClass 清單已定義記錄屬性(例如：top,groupOfUniqueNames)
+LDAPContactObjectClassList=objectClass 清單
+LDAPContactObjectClassListExample=objectClass 清單已定義記錄屬性(例如：top,inetOrgPerson 或是 top, 啟動檔案目錄的用戶)
 LDAPTestConnect=測試LDAP連接
 LDAPTestSynchroContact=測試聯繫人的同步
 LDAPTestSynchroUser=測試用戶的同步
@@ -1420,7 +1427,7 @@ DefaultFocus=Default focus fields
 ProductSetup=產品模組設置
 ServiceSetup=服務模組的設置
 ProductServiceSetup=產品和服務模組的設置
-NumberOfProductShowInSelect=在 combos 選擇清單中，最大可供選擇的產品數量（0 =沒有限制選擇列表）
+NumberOfProductShowInSelect=在 combos 選擇清單中，最大可供選擇的產品數量（0 =沒有限制）
 ViewProductDescInFormAbility=在表單上是否可以直接顯示產品描述資訊(如果關閉則採用彈出式訊息框方式顯示)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
@@ -1441,6 +1448,9 @@ SyslogFilename=文件名稱和路徑
 YouCanUseDOL_DATA_ROOT=你可以使用DOL_DATA_ROOT /可在Dolibarr日誌文件dolibarr.log“文件”目錄。你可以設置一個不同的路徑來存儲該文件。
 ErrorUnknownSyslogConstant=恆%s不是一個已知的syslog常數
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=捐贈模組設置
 DonationsReceiptModel=模板的捐贈收據
@@ -1515,10 +1525,10 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=新選單
 Menu=選擇選單
 MenuHandler=選單處理程序
-MenuModule=源模組
-HideUnauthorizedMenu= 隱藏未經授權的菜單（灰色）
+MenuModule=原始碼模組
+HideUnauthorizedMenu= 隱藏未經授權的選單（灰色）
 DetailId=選單編號
-DetailMenuHandler=選單處理程序在哪裡顯示新的菜單
+DetailMenuHandler=顯示新的選單的選單處理程序
 DetailMenuModule=模組名稱，如果菜單項來自一個模組
 DetailType=類型選單（頂部或左）
 DetailTitre=選單標籤或標籤代碼翻譯
@@ -1537,10 +1547,12 @@ FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=由於營業稅
-OptionVATDefault=Cash basis
+OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=增值稅是因為： <br> - 交貨/付款商品<br> - 關於服務費
 OptionVatDebitOptionDesc=增值稅是因為： <br> - 交貨/付款商品<br> - 對發票（付款）服務
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
 OnDelivery=交貨
 OnPayment=關於付款
@@ -1550,7 +1562,7 @@ SupposedToBeInvoiceDate=使用的發票日期
 Buy=購買
 Sell=出售
 InvoiceDateUsed=使用的發票日期
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1568,7 +1580,7 @@ AGENDA_REMINDER_BROWSER=Enable event reminder <b>on users browser</b> (when even
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
-ClickToDialSetup=點擊撥號模組設置
+ClickToDialSetup=點擊撥號模組設定
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
@@ -1576,14 +1588,14 @@ ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a so
 ##### Point Of Sales (CashDesk) #####
 CashDesk=銷售點
 CashDeskSetup=模組設置的銷售點
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=在銷售時預設一般的合作方
 CashDeskBankAccountForSell=帳戶用於接收現金付款
 CashDeskBankAccountForCheque= 帳戶用於接收支票付款
 CashDeskBankAccountForCB= 帳戶用於接收信用卡支付現金
 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 lot management
+StockDecreaseForPointOfSaleDisabledbyBatch=在POS中庫存減少與批次管理不相容
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=模組設置書籤
@@ -1639,7 +1651,7 @@ AccountingPeriods=Accounting periods
 AccountingPeriodCard=Accounting period
 NewFiscalYear=New accounting period
 OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
+CloseFiscalYear=關帳
 DeleteFiscalYear=Delete accounting period
 ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
 ShowFiscalYear=Show accounting period
@@ -1698,7 +1710,7 @@ UrlTrackingDesc=If the provider or transport service offer a page or web site to
 OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
 TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+TemplateIsVisibleByOwnerOnly=只有擁有者才可看到範本
 VisibleEverywhere=Visible everywhere
 VisibleNowhere=Visible nowhere
 FixTZ=TimeZone fix
@@ -1718,6 +1730,7 @@ MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 MailToMember=To send email from member page
 MailToUser=To send email from user page
+MailToProject= To send email from project page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1764,9 +1777,13 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+WebDavServer=URL of %s server : %s
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index ca9304cb7f6..7266a474476 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -1,128 +1,131 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
+IdAgenda=事件ID
 Actions=事件
-Agenda=議程
-TMenuAgenda=議程
-Agendas=議程
-LocalAgenda=內部日曆
-ActionsOwnedBy=事件屬於
-ActionsOwnedByShort=業主
-AffectedTo=受影響
-Event=行動
-Events=活動
-EventsNb=事件數量
-ListOfActions=名單事件
-EventReports=Event reports
+Agenda=行程
+TMenuAgenda=行程
+Agendas=行程集
+LocalAgenda=本地日曆
+ActionsOwnedBy=事件承辦人
+ActionsOwnedByShort=承辦人
+AffectedTo=指定給
+Event=事件
+Events=事件集
+EventsNb=事件集數量
+ListOfActions=事件清單
+EventReports=事件報表
 Location=位置
-ToUserOfGroup=To any user in group
-EventOnFullDay=全天事件
-MenuToDoActions=所有不完整的行動
-MenuDoneActions=所有終止行動
-MenuToDoMyActions=我不完整的行動
-MenuDoneMyActions=我的行動終止
-ListOfEvents=事件清單
-ActionsAskedBy=記錄操作
-ActionsToDoBy=受影響的行動
-ActionsDoneBy=做的動作
-ActionAssignedTo=事件指派
-ViewCal=查看日歷
-ViewDay=日視圖
-ViewWeek=周視圖
-ViewPerUser=Per user view
-ViewPerType=Per type view
-AutoActions= 全自動灌裝議程
-AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+ToUserOfGroup=給群組成員
+EventOnFullDay=整天事件
+MenuToDoActions=全部未完成事件
+MenuDoneActions=全部已停止事件
+MenuToDoMyActions=我未完成事件
+MenuDoneMyActions=我已停止事件
+ListOfEvents=事件清單(本地事件)
+ActionsAskedBy=誰的事件報表
+ActionsToDoBy=事件指定給
+ActionsDoneBy=由誰完成事件
+ActionAssignedTo=事件指定給
+ViewCal=月檢視
+ViewDay=日檢視
+ViewWeek=周檢視
+ViewPerUser=檢視每位用戶
+ViewPerType=每種類別檢視
+AutoActions= 自動填滿
+AgendaAutoActionDesc= 在此定義你可使 Dolibarr 在行程中自動建立事件。若沒有勾選，只能自行登入行程中增加。而且完成公事事件的自動追踪不會儲存。
 AgendaSetupOtherDesc= 這頁允許配置議程模塊其他參數。
-AgendaExtSitesDesc=此頁面允許申報日歷的外部來源，以他們的活動看到到Dolibarr議程。
-ActionsEvents=為此Dolibarr活動將創建一個自動行動議程
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
+AgendaExtSitesDesc=此頁面允許在 Dolibarr 待辦事項中查看已宣告外部日曆來源的事件
+ActionsEvents=Dolibarr 會在待辦中自動建立行動的事件
+EventRemindersByEmailNotEnabled=在行程模組設定中沒有啟用透過 EMail 提醒事件
 ##### Agenda event labels #####
-NewCompanyToDolibarr=Third party %s created
-ContractValidatedInDolibarr=Contract %s validated
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=建議%s的驗證
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=發票%s的驗證
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
-InvoiceBackToDraftInDolibarr=發票的%s去回到草案狀態
-InvoiceDeleteDolibarr=刪除發票
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
-MemberModifiedInDolibarr=Member %s modified
-MemberResiliatedInDolibarr=Member %s terminated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
-ShipmentDeletedInDolibarr=Shipment %s deleted
-OrderCreatedInDolibarr=Order %s created
-OrderValidatedInDolibarr=採購訂單%s已驗證
-OrderDeliveredInDolibarr=Order %s classified delivered
-OrderCanceledInDolibarr=為了%s取消
-OrderBilledInDolibarr=訂單歸類為已結帳
-OrderApprovedInDolibarr=為了%s批準
-OrderRefusedInDolibarr=拒絕的訂單
-OrderBackToDraftInDolibarr=為了%s回到草案狀態
-ProposalSentByEMail=商業建議通過電子郵件發送%s
-ContractSentByEMail=Contract %s sent by EMail
-OrderSentByEMail=客戶訂單通過電子郵件發送%s
-InvoiceSentByEMail=客戶發票通過電子郵件發送%s
-SupplierOrderSentByEMail=供應商的訂單通過電子郵件發送%s
-SupplierInvoiceSentByEMail=供應商的發票通過電子郵件發送%s
-ShippingSentByEMail=運費已透過Email發送
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=通過電子郵件發送的幹預%s
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
-PRODUCT_CREATEInDolibarr=Product %s created
-PRODUCT_MODIFYInDolibarr=Product %s modified
-PRODUCT_DELETEInDolibarr=Product %s deleted
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
-PROJECT_CREATEInDolibarr=Project %s created
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
+NewCompanyToDolibarr=合作方 %s 已建立
+ContractValidatedInDolibarr=合約 %s 已驗證
+PropalClosedSignedInDolibarr=提案/報價 %s 已簽署
+PropalClosedRefusedInDolibarr=提案/報價 %s 已拒絕
+PropalValidatedInDolibarr=提案/報價 %s 已驗證
+PropalClassifiedBilledInDolibarr=提案/報價 %s 歸類為已結
+InvoiceValidatedInDolibarr=發票 %s 的驗證
+InvoiceValidatedInDolibarrFromPos=POS 的發票 %s 的驗證
+InvoiceBackToDraftInDolibarr=發票 %s 回復到草案狀態
+InvoiceDeleteDolibarr=發票 %s 已刪除
+InvoicePaidInDolibarr=發票 %s 已更改為已付款
+InvoiceCanceledInDolibarr=發票 %s 已取消
+MemberValidatedInDolibarr=會員 %s 已驗證
+MemberModifiedInDolibarr=會員 %s 已修改
+MemberResiliatedInDolibarr=會員 %s 已停止
+MemberDeletedInDolibarr=會員 %s 已刪除
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=貨運單 %s 已驗證
+ShipmentClassifyClosedInDolibarr=貨運單 %s 歸類為已結帳
+ShipmentUnClassifyCloseddInDolibarr=貨運單 %s 歸類為再開啓
+ShipmentDeletedInDolibarr=貨運單 %s 已刪除
+OrderCreatedInDolibarr=訂單 %s 已建立
+OrderValidatedInDolibarr=訂單 %s 已驗證
+OrderDeliveredInDolibarr=訂單 %s 歸類為已傳送
+OrderCanceledInDolibarr=訂單 %s 取消
+OrderBilledInDolibarr=訂單 %s 歸類為已結帳
+OrderApprovedInDolibarr=訂單 %s 已核准
+OrderRefusedInDolibarr=訂單 %s 被拒絕
+OrderBackToDraftInDolibarr=訂單 %s 回復到草案狀態
+ProposalSentByEMail=已透過 E-Mail 傳送商業提案/建議 %s
+ContractSentByEMail=合約 %s 透過 EMail 傳送
+OrderSentByEMail=已透過 E-Mail 傳送客戶訂單 %s
+InvoiceSentByEMail=已透過 E-Mail 傳送客戶發票 %s
+SupplierOrderSentByEMail=已透過 E-Mail 傳送供應商訂單 %s
+SupplierInvoiceSentByEMail=已透過 E-Mail 傳送供應商發票 %s
+ShippingSentByEMail=已透過 E-Mail 傳送貨運單 %s
+ShippingValidated= 貨運單 %s 已驗證
+InterventionSentByEMail=已透過 E-Mail 傳送 Intervention %s
+ProposalDeleted=提案/建議已刪除
+OrderDeleted=訂單已刪除
+InvoiceDeleted=發票已刪除
+PRODUCT_CREATEInDolibarr=產品 %s 已建立
+PRODUCT_MODIFYInDolibarr=產品 %s 已修改
+PRODUCT_DELETEInDolibarr=產品 %s 已刪除
+EXPENSE_REPORT_CREATEInDolibarr=費用報表 %s 已建立
+EXPENSE_REPORT_VALIDATEInDolibarr=費用報表 %s 已驗證
+EXPENSE_REPORT_APPROVEInDolibarr=費用報表 %s 已核准
+EXPENSE_REPORT_DELETEInDolibarr=費用報表 %s 已刪除
+EXPENSE_REPORT_REFUSEDInDolibarr=費用報表 %s 已拒絕
+PROJECT_CREATEInDolibarr=專案 %s 已建立
+PROJECT_MODIFYInDolibarr=專案 %s 已修改
+PROJECT_DELETEInDolibarr=專案 %s 已刪除
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
+AgendaModelModule=適用事件的文件範例/本
 DateActionStart=開始日期
 DateActionEnd=結束日期
-AgendaUrlOptions1=您還可以添加以下參數來篩選輸出：
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Show birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
+AgendaUrlOptions1=您還可以增加以下參數進來篩選輸出：
+AgendaUrlOptions3=<b>logina=%s</b> 將限制輸出為使用者自行操作 <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> 將限制輸出為非使用者自行操作 <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> 將限制輸出為指定使用者操作 <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> 將限制輸出為指定專案 <b>PROJECT_ID</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b>排除自動事件。
+AgendaShowBirthdayEvents=顯示連絡人生日
+AgendaHideBirthdayEvents=隱藏連絡人生日
 Busy=忙錄
-ExportDataset_event1=List of agenda events
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+ExportDataset_event1=行程事件清單
+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.
-ExtSitesNbOfAgenda=日歷數
-AgendaExtNb=日歷NB %s
-ExtSiteUrlAgenda=URL來訪問。iCal文件
+ExportCal=匯出日曆
+ExtSites=匯入外部日曆
+ExtSitesEnableThisTool=顯示外部日曆 (已在全域設定中定義) 到行程。不會影響由使用者自行定義的外部日曆。
+ExtSitesNbOfAgenda=日曆數量
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=用 URL 存取 .iCal 檔案
 ExtSiteNoLabel=無說明
-VisibleTimeRange=時間區間
-VisibleDaysRange=日區間
+VisibleTimeRange=顯示時間區間
+VisibleDaysRange=顯示日的區間
 AddEvent=建立事件
-MyAvailability=My availability
-ActionType=事件類型
-DateActionBegin=開始日期
-CloneAction= 刪除事件
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+MyAvailability=我的空檔
+ActionType=事件類別
+DateActionBegin=事件開始日期
+CloneAction=複製本身事件
+ConfirmCloneEvent=您確定要複製本身事件 <b>%s</b>?
 RepeatEvent=重覆事件
-EveryWeek=每個星期
-EveryMonth=每個月份
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
+EveryWeek=每周
+EveryMonth=每月
+DayOfMonth=月份的天數
+DayOfWeek=週的天數
+DateStartPlusOne=開始日 +1 小時
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 3097820b70f..bc4936144aa 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -1,41 +1,41 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=發票
 Bills=發票
-BillsCustomers=Customer invoices
+BillsCustomers=各式客戶發票
 BillsCustomer=客戶發票
-BillsSuppliers=Supplier invoices
-BillsCustomersUnpaid=Unpaid customer invoices
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliers=各式供應商發票
+BillsCustomersUnpaid=尚未付款的客戶發票
+BillsCustomersUnpaidForCompany=針對%s尚未付款的客戶發票
+BillsSuppliersUnpaid=尚未付款的供應商發票
+BillsSuppliersUnpaidForCompany=針對%s尚未付款的供應商發票
 BillsLate=逾期付款
 BillsStatistics=客戶發票統計
 BillsStatisticsSuppliers=供應商發票統計
 DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
 DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
 DisabledBecauseNotErasable=Disabled because cannot be erased
-InvoiceStandard=發票
-InvoiceStandardAsk=發票
+InvoiceStandard=標準發票
+InvoiceStandardAsk=標準發票
 InvoiceStandardDesc=這是一種常見的發票。
 InvoiceDeposit=Down payment invoice
 InvoiceDepositAsk=Down payment invoice
 InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
 InvoiceProForma=形式發票
 InvoiceProFormaAsk=形式發票
-InvoiceProFormaDesc=<b>形式發票</b>是發票的形象，但沒有一個真正的會計價值。
+InvoiceProFormaDesc=<b>形式發票</b>是發票的形象，但沒有真實的會計價值。
 InvoiceReplacement=更換發票
 InvoiceReplacementAsk=更換發票的發票
-InvoiceReplacementDesc=替換發票僅用於取消或代替未付款項的發票\n注意:僅有未付款發票才可被替換。若被替換發票尚未被關閉，系統將自動棄用此發票
-InvoiceAvoir=信用票據
-InvoiceAvoirAsk=信用註意糾正發票
-InvoiceAvoirDesc=<b>信貸說明</b>是一種消極的發票用來解決一個事實，即發票已繳納的數額相差實在比額（因為顧客付出太多的錯誤，例如將不支付或完全因為他歸還了部分產品）。
+InvoiceReplacementDesc=<b>更換發票</b>僅用於取消或代替未付款項但已收貨的發票\n<br><br>注意:僅有未付款發票才可被更換。若被更換發票尚未被關閉，系統將自動'放棄'此發票。
+InvoiceAvoir=貸方通知單
+InvoiceAvoirAsk=貸方通知單到正確發票
+InvoiceAvoirDesc=<b>貸方通知單</b>是一種負數發票，用來解決發票金額不同於實際支付之事實（範例：因為客戶因錯誤支付，或是他退回某些產品而不支付）。
 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
-ReplaceInvoice=替換%s的發票
+ReplaceInvoice=更換%s的發票
 ReplacementInvoice=更換發票
-ReplacedByInvoice=按發票取代%s
-ReplacementByInvoice=取代發票
+ReplacedByInvoice=依發票%s更換
+ReplacementByInvoice=依發票更換
 CorrectInvoice=%s的正確發票
 CorrectionInvoice=發票的更正
 UsedByInvoice=用於支付發票%s的
@@ -67,6 +67,7 @@ PaidBack=返回款項
 DeletePayment=刪除付款
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=已收到的供應商付款單據清單
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=已收到的客戶付款單據清單
@@ -91,7 +92,7 @@ PaymentAmount=付款金額
 ValidatePayment=驗證付款
 PaymentHigherThanReminderToPay=付款支付更高的比提醒
 HelpPaymentHigherThanReminderToPay=註意，一個或更多的票據付款金額比其他支付更高。 <br>編輯您的進入，否則確認並考慮建立一個每個多繳發票收到超出信用註記。
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=分類'有償'
 ClassifyPaidPartially=分類薪部分'
 ClassifyCanceled=分類'遺棄'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=轉換到未來的折扣
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=輸入從客戶收到付款
 EnterPaymentDueToCustomer=由於客戶的付款
 DisabledBecauseRemainderToPayIsZero=因剩餘未付款為零而停用
@@ -119,7 +121,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=草案（等待驗證）
 BillStatusPaid=支付
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=轉換成折扣
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=棄
 BillStatusValidated=驗證（需要付費）
 BillStatusStarted=開始
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=索賠額
 ExcessReceived=收到過剩
+ExcessPaid=Excess paid
 EscompteOffered=折扣額（任期前付款）
 EscompteOfferedShort=折扣
 SendBillRef=Submission of invoice %s
@@ -242,8 +245,8 @@ DateInvoice=發票日期
 DatePointOfTax=Point of tax
 NoInvoice=沒有任何發票(invoice)
 ClassifyBill=分類發票
-SupplierBillsToPay=Unpaid supplier invoices
-CustomerBillsUnpaid=Unpaid customer invoices
+SupplierBillsToPay=尚未付款的供應商發票
+CustomerBillsUnpaid=尚未付款的客戶發票
 NonPercuRecuperable=非可收回
 SetConditions=設置付款條件
 SetMode=設置支付方式
@@ -283,16 +286,20 @@ Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=從信用註意%折扣s
 DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=這種信貸可用於發票驗證前
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=新的全域折扣
 NewRelativeDiscount=新的相對折扣
+DiscountType=Discount type
 NoteReason=備註/原因
 ReasonDiscount=原因
 DiscountOfferedBy=獲
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=條例草案的報告
 HelpEscompte=這是給予客戶優惠折扣，因為它的任期作出之前付款。
 HelpAbandonBadCustomer=這一數額已被放棄（客戶說是一個壞的客戶），並作為一個特殊的松散考慮。
@@ -341,10 +348,10 @@ NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
 DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-NbOfGenerationDoneShort=Nb of generation done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Max number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -448,7 +455,7 @@ Cheques=檢查
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=使用客戶的帳單，而不是作為第三方發票收件人地址聯系地址
+UsBillingContactAsIncoiveRecipientIfExist=使用客戶帳單的連絡人地址，而不是作以合作方上地址作為發票收件人
 ShowUnpaidAll=顯示所有未付款的發票
 ShowUnpaidLateOnly=只顯示遲遲未付款的發票
 PaymentInvoiceRef=%s的付款發票
@@ -521,3 +528,7 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
diff --git a/htdocs/langs/zh_TW/bookmarks.lang b/htdocs/langs/zh_TW/bookmarks.lang
index 65a6e68cc36..049086d0c1e 100644
--- a/htdocs/langs/zh_TW/bookmarks.lang
+++ b/htdocs/langs/zh_TW/bookmarks.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
-Bookmark=Bookmark
+AddThisPageToBookmarks=新增目前頁面到書籤
+Bookmark=書籤
 Bookmarks=書籤
-ListOfBookmarks=List of bookmarks
-EditBookmarks=List/edit bookmarks
+ListOfBookmarks=書簽清單
+EditBookmarks=列出/編輯書籤
 NewBookmark=新書簽
-ShowBookmark=Show bookmark
-OpenANewWindow=Open a new window
-ReplaceWindow=Replace current window
-BookmarkTargetNewWindowShort=New window
-BookmarkTargetReplaceWindowShort=Current window
-BookmarkTitle=Bookmark title
-UrlOrLink=URL
-BehaviourOnClick=Behaviour when a bookmark URL is selected
-CreateBookmark=Create bookmark
-SetHereATitleForLink=Set a title for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
+ShowBookmark=顯示書籤
+OpenANewWindow=開啟新視窗
+ReplaceWindow=替換目前視窗
+BookmarkTargetNewWindowShort=新視窗
+BookmarkTargetReplaceWindowShort=目前視窗
+BookmarkTitle=書籤標題
+UrlOrLink=網址
+BehaviourOnClick=當書籤網址被選後的行為
+CreateBookmark=建立書籤
+SetHereATitleForLink=設定書籤標題
+UseAnExternalHttpLinkOrRelativeDolibarrLink=使用外部 http 的網址或是 Dolibarr 的相對網址
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=選擇當網頁連線時是否開啟新視窗
 BookmarksManagement=書籤管理
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index a16bc833dcd..eca3f4a92ac 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -9,7 +9,7 @@ CashdeskShowServices=賣服務
 CashDeskProducts=產品
 CashDeskStock=股票
 CashDeskOn=上
-CashDeskThirdParty=第三方
+CashDeskThirdParty=合作方
 ShoppingCart=購物車
 NewSell=新的銷售
 AddThisArticle=添加此文章
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index cd9d145fb42..78fe0fbf756 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=子類別
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index fb69e057413..17e728ef738 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -43,7 +43,8 @@ Individual=私營個體
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=母公司
 Subsidiaries=附屬公司
-ReportByCustomers=客戶的報告
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
 ReportByQuarter=報告率
 CivilityCode=文明守則
 RegisteredOffice=註冊辦事處
@@ -75,10 +76,12 @@ Town=城市
 Web=網站
 Poste= 位置
 DefaultLang=預設語系
-VATIsUsed=使用營業稅(VAT)
-VATIsNotUsed=不使用營業稅(VAT)
+VATIsUsed=Sales tax is used
+VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=建議
 OverAllOrders=訂單
@@ -239,7 +242,7 @@ ProfId3TN=教授ID已3（杜阿納代碼）
 ProfId4TN=教授ID已4（班）
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=Prof ID 6
 ProfId3US=Prof ID 6
 ProfId4US=Prof ID 6
@@ -255,24 +258,34 @@ ProfId1DZ=鋼筋混凝土
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=公司統一編號
-VATIntraShort=公司統編
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=語法是有效的
+VATReturn=VAT return
 ProspectCustomer=潛在/客戶
 Prospect=潛在
 CustomerCard=客戶卡
 Customer=客戶
 CustomerRelativeDiscount=相對客戶折扣
+SupplierRelativeDiscount=Relative supplier discount
 CustomerRelativeDiscountShort=相對折扣
 CustomerAbsoluteDiscountShort=無條件折扣
 CompanyHasRelativeDiscount=這個客戶有一個<b>%s%%</b>的折扣
 CompanyHasNoRelativeDiscount=此客戶沒有定義相關的折扣
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=此客戶仍然有信用票據<b>%s或%s</b>的前存款
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=此客戶沒有無條件折扣條件
-CustomerAbsoluteDiscountAllUsers=無條件折扣（給所有使用者使用）
-CustomerAbsoluteDiscountMy=無條件折扣（只有自己可使用）
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=無
 Supplier=供應商
 AddContact=建立聯絡人資訊
@@ -377,9 +390,9 @@ NoDolibarrAccess=沒有任何系統存取記錄
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=聯系和屬性
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
-ImportDataset_company_2=聯絡資訊/地址(合作廠商)和屬性
-ImportDataset_company_3=銀行的詳細資料
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
+ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=價格水平
 DeliveryAddress=送貨地址
 AddAddress=添加地址
@@ -406,15 +419,16 @@ ProductsIntoElements=產品列表於 %s
 CurrentOutstandingBill=目前未兌現票據
 OutstandingBill=最高數量的未兌現票據
 OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
 MonkeyNumRefModelDesc=用以下固定的方式回傳編號:<br> %syymm-nnnn 為客戶編號生成格式。<br> %syymm-nnnn 為供應商編號生成格式。<br>   yy 是年、mm是月、nnnn是一個不為0的序號。
 LeopardNumRefModelDesc=客戶/供應商編號規則不受限制，此編碼可以隨時修改。(可開啟Elephant or Monkey模組來設定編碼規則)
 ManagingDirectors=主管(們)姓名 (執行長, 部門主管, 總裁...)
 MergeOriginThirdparty=重複的客戶/供應商 (你想刪除的客戶/供應商)
 MergeThirdparties=合併客戶/供應商
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
-ThirdpartiesMergeSuccess=客戶/供應商將被合併
+ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=刪除客戶/供應商時發生錯誤.請檢查log紀錄. 變更將會回復.
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index e788111190a..a48ffd3e084 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -31,7 +31,7 @@ Credit=信用
 Piece=Accounting Doc.
 AmountHTVATRealReceived=凈收
 AmountHTVATRealPaid=凈支付
-VATToPay=增值稅銷售
+VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
 VATSummary=Tax Balance
@@ -103,6 +103,7 @@ LT2PaymentsES=IRPF付款
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=顯示增值稅納稅
@@ -157,30 +158,34 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- 它包括所有從客戶收到發票有效付款。 <br> - 這是對這些發票的付款日期為基礎<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are nor included
 DepositsAreIncluded=- Down payment invoices are included
-LT2ReportByCustomersInInputOutputModeES=報告由第三方IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=報告由第三方IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByCustomers=Sale tax report by customer
 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
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=見報告<b>%sVAT裝箱%S</b>的標準計算
 SeeVATReportInDueDebtMode=見報告<b>流量%%sVAT S上</b>的流量計算與一選項
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- 對於重大資產，它包括增值稅專用發票發票日期的基礎上。
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- 對於服務，該報告包括增值稅專用發票，根據發票日期到期，繳納或者未。
-RulesVATDueProducts=- 對於重大資產，它包括增值稅專用發票，根據發票日期。
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=註：對於實物資產，它應該使用的交貨日期將更加公平。
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/發票
 NotUsedForGoods=未使用的貨物
 ProposalStats=統計數據的建議
@@ -213,8 +218,8 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
@@ -236,3 +241,4 @@ ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignement
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index 4ce50c1136e..bcfa4d2a335 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = 讀取預定作業
+Permission23102 = 建立/更新預定工作
+Permission23103 = 刪除預定工作
+Permission23104 = 執行預定工作
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -43,7 +43,7 @@ CronNoJobs=No jobs registered
 CronPriority=優先
 CronLabel=品號
 CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
+CronMaxRun=Max number launch
 CronEach=Every
 JobFinished=Job launched and finished
 #Page card
@@ -74,9 +74,10 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index f41ee948296..d32cec1cfda 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
 ErrorLDAPMakeManualTest=甲。LDIF文件已經生成在目錄%s的嘗試加載命令行手動有更多的錯誤信息。
 ErrorCantSaveADoneUserWithZeroPercentage=無法儲存與行動“規約未啟動”如果領域“做的”，也是填補。
 ErrorRefAlreadyExists=號的創作已經存在。
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
@@ -127,7 +127,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 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').
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date cannot 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.
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -229,3 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the bulk actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/zh_TW/ftp.lang b/htdocs/langs/zh_TW/ftp.lang
index 56ee21ff28c..e8962f85922 100644
--- a/htdocs/langs/zh_TW/ftp.lang
+++ b/htdocs/langs/zh_TW/ftp.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP客戶端模塊設置
+FTPClientSetup=FTP客戶端模組設定
 NewFTPClient=新的FTP連接建立
 FTPArea=的FTP區
 FTPAreaDesc=這個屏幕顯示您的FTP服務器查看內容
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index b7909032b9a..f247e900847 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -196,6 +196,8 @@ MigrationEvents=事件遷移正進行新增事件負責人到指定的表格
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=顯示不可用的選項
diff --git a/htdocs/langs/zh_TW/loan.lang b/htdocs/langs/zh_TW/loan.lang
index 7db594c715e..a62e22dca79 100644
--- a/htdocs/langs/zh_TW/loan.lang
+++ b/htdocs/langs/zh_TW/loan.lang
@@ -50,4 +50,6 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Créer / Modifier échéancier de pret
+FinancialCommitment=Financial commitment
+CreateCalcSchedule=Edit financial commitment
+InterestAmount=Interest amount
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 2230dd7d957..66d20ed1267 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -78,6 +78,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
+SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -135,7 +136,7 @@ NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index a13338061b1..58036e26e9d 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -8,22 +8,22 @@ FONTFORPDF=msungstdlight
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%Y/%m/%d
-FormatDateShortInput=%Y/%m/%d
-FormatDateShortJava=yyyy/MM/dd
-FormatDateShortJavaInput=yyyy/MM/dd
-FormatDateShortJQuery=yy/mm/dd
-FormatDateShortJQueryInput=yy/mm/dd
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShortJQuery=%H:%M
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%Y %b %d
-FormatDateText=%Y %B %d
-FormatDateHourShort=%Y/%m/%d %I:%M %p
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%Y/%m/%d
-FormatDateHourText=%Y/%m/%d
-DatabaseConnection=資料庫
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=資料庫連線
 NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=無交易
@@ -34,17 +34,17 @@ NotEnoughDataYet=Not enough data
 NoError=沒有發生錯誤
 Error=錯誤
 Errors=錯誤
-ErrorFieldRequired=錯誤!需要輸入資料到'%s'欄位
+ErrorFieldRequired=欄位'%s'必須輸入
 ErrorFieldFormat=欄位'%s'有一個錯誤值
 ErrorFileDoesNotExists=檔案 %s 不存在
 ErrorFailedToOpenFile=無法打開檔案 : %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=不是定義的參數%
+ErrorCanNotCreateDir=無法建立檔案目錄%s
+ErrorCanNotReadDir=不能讀取檔案目錄%s
+ErrorConstantNotDefined=參數%s沒定義
 ErrorUnknown=未知錯誤
 ErrorSQL=SQL錯誤
 ErrorLogoFileNotFound=徽標文件'%s'沒有找到
-ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
 ErrorGoToModuleSetup=前往模塊設置來解決此
 ErrorFailedToSendMail=錯誤!無法傳送郵件（寄件人=%s、收件人=%s）。
 ErrorFileNotUploaded=文件沒有上傳。檢查大小不超過允許的最大值，即在磁盤上的可用空間是可用和有沒有這已經與in這個目錄同名文件。
@@ -64,12 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=錯誤!沒有定義 '%s' 幣別的營業
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=錯誤，無法保存文件。
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Max number of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=設定日期
 SelectDate=選擇日期
 SeeAlso=請參考 %s
 SeeHere=See here
+ClickHere=點擊這裏
+Here=Here
 Apply=Apply
 BackgroundColorByDefault=默認的背景顏色
 FileRenamed=The file was successfully renamed
@@ -185,6 +187,7 @@ ToLink=Link
 Select=選擇
 Choose=選擇
 Resize=調整大小
+ResizeOrCrop=Resize or Crop
 Recenter=Recenter
 Author=發起者
 User=用戶
@@ -325,8 +328,10 @@ Default=預設
 DefaultValue=預設值
 DefaultValues=Default values
 Price=價格
+PriceCurrency=Price (currency)
 UnitPrice=單價
 UnitPriceHT=單位價格（凈值）
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=單價
 PriceU=向上
 PriceUHT=單價
@@ -334,6 +339,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=總額
 AmountInvoice=發票金額
+AmountInvoiced=Amount invoiced
 AmountPayment=付款金額
 AmountHTShort=金額
 AmountTTCShort=金額（含稅）
@@ -353,6 +359,7 @@ AmountLT2ES=數額IRPF
 AmountTotal=總金額
 AmountAverage=平均金額
 PriceQtyMinHT=最低採購價格 （稅後）
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=百分比
 Total=總計
 SubTotal=銷售額合計
@@ -389,6 +396,8 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=營業稅率
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=平均
 Sum=總和
@@ -419,7 +428,8 @@ ActionRunningShort=In progress
 ActionDoneShort=成品
 ActionUncomplete=Uncomplete
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organisation
+CompanyFoundation=Company/Organization
+Accountant=Accountant
 ContactsForCompany=聯系方式/不會忽略這個第三者
 ContactsAddressesForCompany=此客戶(供應商)的聯絡人及地址清單
 AddressesForCompany=Addresses for this third party
@@ -427,6 +437,9 @@ ActionsOnCompany=關於這個第三方的行動
 ActionsOnMember=有關此成員的活動
 ActionsOnProduct=Events about this product
 NActionsLate=%s的後期
+ToDo=要做到
+Completed=Completed
+Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=篩選器
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
@@ -676,7 +689,7 @@ NoFileFound=沒有任何檔案或文件
 CurrentUserLanguage=當前語言
 CurrentTheme=當前主題
 CurrentMenuManager=Current menu manager
-Browser=Browser
+Browser=瀏覽器
 Layout=Layout
 Screen=Screen
 DisabledModules=禁用模組
@@ -704,6 +717,8 @@ WarningYouAreInMaintenanceMode=警告，你是在維護模式，因此，只有
 CoreErrorTitle=系統錯誤
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=信用卡
+ValidatePayment=驗證付款
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=與<b>%或學科</b>是強制性
 FieldsWithIsForPublic=<b>%與</b> s域的成員顯示在公開名單。如果你不想要這個，檢查“公共”框。
 AccordingToGeoIPDatabase=（根據geoip的轉換）
@@ -808,8 +823,8 @@ ConfirmMassDeletion=Bulk delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
 RelatedObjects=Related Objects
 ClassifyBilled=分類計費
+ClassifyUnbilled=Classify unbilled
 Progress=進展
-ClickHere=點擊這裏
 FrontOffice=Front office
 BackOffice=回到辦公室
 View=View
@@ -851,6 +866,8 @@ FileNotShared=File not shared to exernal public
 Project=項目
 Projects=Projects
 Rights=權限
+LineNb=Line no.
+IncotermLabel=Incoterms
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -890,7 +907,7 @@ Select2MoreCharacters=or more characters
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SearchIntoThirdparties=第三方
 SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
@@ -916,3 +933,11 @@ CommentDeleted=Comment deleted
 Everybody=每個人
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=指定給
diff --git a/htdocs/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang
index 49917d46ea6..7bf5f801891 100644
--- a/htdocs/langs/zh_TW/margins.lang
+++ b/htdocs/langs/zh_TW/margins.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - marges
 
 Margin=Margin
-Margins=Margins
+Margins=利潤
 TotalMargin=Total Margin
 MarginOnProducts=Margin / Products
 MarginOnServices=Margin / Services
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index a07fe7ea922..5f78a76f421 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -13,8 +13,6 @@ ListOfValidatedPublicMembers=驗證市民名單
 ErrorThisMemberIsNotPublic=該成員不公開
 ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成員（名稱<b>：%s後</b> ，登錄<b>：%s）</b>是已鏈接到第三方<b>的%s。</b>首先刪除這個鏈接，因為一個第三方不能被鏈接到只有一個成員（反之亦然）。
 ErrorUserPermissionAllowsToLinksToItselfOnly=出於安全原因，您必須被授予權限編輯所有用戶能夠連接到用戶的成員是不是你的。
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-CardContent=內容您的會員卡
 SetLinkToUser=用戶鏈接到Dolibarr
 SetLinkToThirdParty=鏈接到第三方Dolibarr
 MembersCards=議員打印卡
@@ -108,17 +106,33 @@ PublicMemberCard=市民卡會員
 SubscriptionNotRecorded=Subscription not recorded
 AddSubscription=Create subscription
 ShowSubscription=顯示訂閱
-SendAnEMailToMember=向會員發送信息的電子郵件
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=內容您的會員卡
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 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_MAIL_SUBJECT=電郵題目會員autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=電子郵箱會員autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=電郵題目會員驗證
-DescADHERENT_MAIL_VALID=會員的電子郵件驗證
-DescADHERENT_MAIL_COTIS_SUBJECT=電郵題目認購
-DescADHERENT_MAIL_COTIS=訂閱的電子郵件
-DescADHERENT_MAIL_RESIL_SUBJECT=電郵題目會員resiliation
-DescADHERENT_MAIL_RESIL=電子郵箱會員resiliation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
 DescADHERENT_MAIL_FROM=發件人的電子郵件自動電子郵件
 DescADHERENT_ETIQUETTE_TYPE=標簽的格式頁
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -177,3 +191,8 @@ NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index 8104651bd02..a3fee23cb53 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -43,6 +43,8 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateMissingFiles=Generate missing files
 SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
@@ -92,3 +94,4 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 3a6e459e87b..b9e2693c5a9 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=訊息驗證支付返回頁面
 MessageKO=取消支付返回頁面的訊息
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
@@ -78,8 +80,8 @@ LinkedObject=鏈接對象
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -214,6 +216,7 @@ StartUpload=開始上傳
 CancelUpload=取消上傳
 FileIsTooBig=文件過大
 PleaseBePatient=請耐心等待...
+NewPassword=New password
 ResetPassword=Reset password
 RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
 NewKeyIs=This is your new keys to login
@@ -243,3 +246,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=標題
 WEBSITE_DESCRIPTION=廠商品號/品名/商品描述
 WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
diff --git a/htdocs/langs/zh_TW/paypal.lang b/htdocs/langs/zh_TW/paypal.lang
index 84dc865dd64..1882ef50dd7 100644
--- a/htdocs/langs/zh_TW/paypal.lang
+++ b/htdocs/langs/zh_TW/paypal.lang
@@ -14,7 +14,7 @@ PaypalModeOnlyPaypal=PayPal only
 ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
 ThisIsTransactionId=這是交易編號<b>：%s</b>
 PAYPAL_ADD_PAYMENT_URL=當你郵寄一份文件，添加URL Paypal付款
-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=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
@@ -30,3 +30,6 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/zh_TW/printing.lang b/htdocs/langs/zh_TW/printing.lang
index 0ab8d1a77ac..902f506d7a5 100644
--- a/htdocs/langs/zh_TW/printing.lang
+++ b/htdocs/langs/zh_TW/printing.lang
@@ -49,4 +49,6 @@ DirectPrintingJobsDesc=This page lists printing jobs found for available printer
 GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index 1c2d22395ce..3dacb865df7 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -1,24 +1,24 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
+ManageLotSerial=使用批次/序號數字
+ProductStatusOnBatch=是的(需要批次/序號)
+ProductStatusNotOnBatch=不是(不使用批次/序號)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-EatByDate=Eat-by date
-SellByDate=Sell-by date
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+Batch=批次/序號
+atleast1batchfield=有效日期或銷售日期或批次/序號
+batch_number=批次/序號
+BatchNumberShort=批次/序號
+EatByDate=有效日期
+SellByDate=銷售日期
+DetailBatchNumber=批次/序號詳細資料
+printBatch=批次/序號: %s
+printEatby=有效日: %s
+printSellby=銷售日: %s
+printQty=數量: %d
+AddDispatchBatchLine=增加一行的保存期限
+WhenProductBatchModuleOnOptionAreForced=當批次/序號模組啟動，庫存的自動增/減模式會依已驗證的發出及人工調度強制增減且無法修改。其他的選項則依您的需求定義。
+ProductDoesNotUseBatchSerial=此產品不能使用批次/序號數字
+ProductLotSetup=批次/序號模組的設定
+ShowCurrentStockOfLot=顯示產品/批次的目前庫存
+ShowLogOfMovementIfLot=顯示產品/批次的移動記錄
+StockDetailPerBatch=每批次的庫存詳細資料
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 785cfdd5085..c1550dc445d 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -27,6 +27,7 @@ ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=產品或服務
 ProductsAndServices=產品與服務
 ProductsOrServices=產品或服務
+ProductsPipeServices=Products | Services
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
 ProductsNotOnSell=Products not for sale and not for purchase
@@ -122,6 +123,7 @@ ConfirmDeleteProductLine=確定要刪除這項產品？
 ProductSpecial=特別
 QtyMin=最低數量
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=沒有價格/數量確定了這個供應商/產品
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 9609b205361..97c7f572012 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -3,49 +3,49 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-ProjectsArea=Projects Area
+ProjectsArea=專案區
 ProjectStatus=Project status
-SharedProject=每個人
-PrivateProject=項目聯系人
+SharedProject=每位
+PrivateProject=專案通訊錄
 ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=所有項目
-MyProjectsDesc=This view is limited to projects you are a contact for.
-ProjectsPublicDesc=這種觀點提出了所有你被允許閱讀的項目。
+MyProjectsDesc=此檢視是您在專案中可連絡的
+ProjectsPublicDesc=此檢視顯示您被允許查閱的所有專案。
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=這種觀點提出的所有項目，您可閱讀任務。
-ProjectsDesc=這種觀點提出的所有項目（你的用戶權限批準你認為一切）。
+ProjectsDesc=此檢視顯示全部專案(您的用戶權限授予您檢視所有內容的權限)。
 TasksOnProjectsDesc=This view presents all tasks on 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.
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
-TasksPublicDesc=這種觀點提出的所有項目，您可閱讀任務。
-TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準你認為一切）。
+MyTasksDesc=此檢視是您在專案或任務中可連絡的
+OnlyOpenedProject=僅顯示開放專案(不顯示在草案或是已結案狀況的專案)
+ClosedProjectsAreHidden=不顯示已結專案
+TasksPublicDesc=此檢視顯示您被允許查閱的所有專案及任務。
+TasksDesc=此檢視所有專案及任務(您的用戶權限授予您查看所有內容的權限)。
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
-NewProject=新項目
-AddProject=Create project
-DeleteAProject=刪除一個項目
+NewProject=新專案
+AddProject=建立專案
+DeleteAProject=刪除一項專案
 DeleteATask=刪除任務
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
+ConfirmDeleteAProject=您確定要刪除此專案嗎？
+ConfirmDeleteATask=您確定要刪除此任務嗎？
 OpenedProjects=Open projects
 OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
-ShowProject=顯示項目
+ShowProject=顯示專案
 ShowTask=顯示任務
-SetProject=設置項目
-NoProject=沒有項目或擁有的定義
-NbOfProjects=鈮項目
+SetProject=設定專案
+NoProject=有定義的專案或擁有者
+NbOfProjects=專案號
 NbOfTasks=Nb of tasks
 TimeSpent=花費的時間
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=所花費的時間
-RefTask=任務編號
+RefTask=參考的任務
 LabelTask=標簽任務
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=用戶
@@ -55,19 +55,20 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=所花費的時間
 MyTimeSpent=我的時間花
+BillTime=Bill the time spent
 Tasks=任務
 Task=任務
 TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新任務
-AddTask=Create task
+AddTask=建立任務
 AddTimeSpent=Create time spent
 AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=活動
 Activities=任務/活動
 MyActivities=我的任務/活動
-MyProjects=我的項目
+MyProjects=我的專案
 MyProjectsArea=My projects Area
 DurationEffective=有效時間
 ProgressDeclared=Declared progress
@@ -77,7 +78,7 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 GanttView=Gantt View
-ListProposalsAssociatedProject=名單與項目有關的商業建議
+ListProposalsAssociatedProject=指定給專案的商業報價/提案列表清單
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
 ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=名單與項目有關的行動
 ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=對項目活動周
@@ -98,14 +100,15 @@ ActivityOnProjectThisMonth=本月初對項目活動
 ActivityOnProjectThisYear=今年對項目活動
 ChildOfProjectTask=兒童的項目/任務
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=不是所有者的私人項目
 AffectedTo=受影響
 CantRemoveProject=這個項目不能刪除，因為它是由一些（其他對象引用的發票，訂單或其他）。見參照資訊標簽。
 ValidateProject=驗證專案
 ConfirmValidateProject=Are you sure you want to validate this project?
-CloseAProject=關閉項目
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+CloseAProject=結束專案
+ConfirmCloseAProject=您確定要結束此專案？
+AlsoCloseAProject=也含已結專案(若您仍需要在此中專案中跟追產品任務，請持續開放)
 ReOpenAProject=打開的項目
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=項目聯系人
@@ -136,8 +139,9 @@ ConfirmCloneProject=Are you sure to clone this project?
 ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-ProjectModifiedInDolibarr=Project %s modified
+ProjectCreatedInDolibarr=專案 %s 已建立
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=專案 %s 已修改
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -151,8 +155,8 @@ OpportunityAmountAverageShort=Average Opp. amount
 OpportunityAmountWeigthedShort=Weighted Opp. amount
 WonLostExcluded=Won/Lost excluded
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=項目負責人
-TypeContact_project_external_PROJECTLEADER=項目負責人
+TypeContact_project_internal_PROJECTLEADER=專案負責人
+TypeContact_project_external_PROJECTLEADER=專案負責人
 TypeContact_project_internal_PROJECTCONTRIBUTOR=投稿
 TypeContact_project_external_PROJECTCONTRIBUTOR=投稿
 TypeContact_project_task_internal_TASKEXECUTIVE=執行任務
@@ -185,14 +189,14 @@ SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ManageOpportunitiesStatus=專案用於以下潛在/有機會的客戶
 ProjectNbProjectByMonth=Nb of created projects by month
 ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
-ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=依機會狀況開啟專案/潛在客戶
+ProjectsStatistics=專案/潛在客戶的統計
+TasksStatistics=專案/潛在客戶任務的統計
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
@@ -215,8 +219,11 @@ AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>S
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
-
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=About project %s
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index 734f1f41861..7c10e78720f 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -33,6 +33,7 @@ PropalStatusSigned=簽名（需要收費）
 PropalStatusNotSigned=不簽署（非公開）
 PropalStatusBilled=帳單
 PropalStatusDraftShort=草案
+PropalStatusValidatedShort=驗證
 PropalStatusClosedShort=關閉
 PropalStatusSignedShort=簽名
 PropalStatusNotSignedShort=未簽署
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index d5bc87d0bf8..6a82354edae 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -15,3 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
+SalariesStatistics=Statistiques salaires
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index ca76872c5c9..2df0946c2aa 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -8,7 +8,9 @@ WarehouseEdit=修改倉庫
 MenuNewWarehouse=新倉庫
 WarehouseSource=來源倉庫
 WarehouseSourceNotDefined=無定義倉庫，
+AddWarehouse=Create warehouse
 AddOne=新增
+DefaultWarehouse=Default warehouse
 WarehouseTarget=目標倉庫
 ValidateSending=刪除發送
 CancelSending=取消發送
@@ -22,6 +24,7 @@ Movements=轉讓
 ErrorWarehouseRefRequired=倉庫引用的名稱為必填
 ListOfWarehouses=倉庫名單
 ListOfStockMovements=庫存轉讓清單
+ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index 7813072e236..1830b2aa5e2 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/stripe.lang
@@ -35,6 +35,31 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card record
+ConfirmDeleteCard=Are you sure you want to delete this Card record?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index 178676d60f9..90df86c5a0e 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=費用列表
 NewTrip=新增費用
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organisation visited
+CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=金額或公里
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -21,17 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 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
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
 ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
@@ -74,6 +74,7 @@ EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 904163c1bcd..2fe1c29c80c 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -69,8 +69,8 @@ InternalUser=內部用戶
 ExportDataset_user_1=Dolibarr的用戶和屬性
 DomainUser=域用戶%s
 Reactivate=重新啟用
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=因為從權限授予一個用戶的一組繼承。
 Inherited=遺傳
 UserWillBeInternalUser=創建的用戶將是一個內部用戶（因為沒有聯系到一個特定的第三方）
@@ -93,6 +93,7 @@ NameToCreate=第三黨的名稱創建
 YourRole=您的角色
 YourQuotaOfUsersIsReached=你的活躍用戶達到配額！
 NbOfUsers=用戶數
+NbOfPermissions=Nb of permissions
 DontDowngradeSuperAdmin=只有超級管理員可以降級超級管理員
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 522d5abfc48..25796dda9f1 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -4,7 +4,9 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -34,14 +36,18 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=閱讀
+WritePerm=Write
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -55,7 +61,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -64,3 +70,15 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 45a11c17f9f..bbf2aef9b6a 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=要處理
 WithdrawalsReceipts=Direct debit orders
@@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=第三方銀行代碼
-NoInvoiceCouldBeWithdrawed=沒有發票withdrawed成功。檢查發票的公司是一個有效的禁令。
+NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
 ClassCredited=分類記
 ClassCreditedConfirm=你確定要分類這一撤離收據上記入您的銀行帳戶？
 TransData=數據傳輸
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -98,6 +98,10 @@ ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 0e61adcb279..caee19a2c34 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -45,11 +45,8 @@ if (! empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
+$langs->loadLangs(array("sendings","bills",'deliveries','orders'));
 
-$langs->load("sendings");
-$langs->load("bills");
-$langs->load('deliveries');
-$langs->load('orders');
 if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 
 $action=GETPOST('action', 'alpha');
@@ -77,9 +74,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be inclu
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('deliverycard','globalcard'));
 
+
 /*
  * Actions
  */
+
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
@@ -202,20 +201,13 @@ if ($action == 'update_extras')
 
 	if (! $error)
 	{
-		// Actions on extra fields (by external module or standard code)
-		// TODO le hook fait double emploi avec le trigger !!
-		$hookmanager->initHooks(array('livraisondao'));
-		$parameters = array('id' => $object->id);
-		$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook)) {
-			$result = $object->insertExtraFields('DELIVERY_MODIFY');
-			if ($result < 0)
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$error++;
-			}
-		} else if ($reshook < 0)
+		// Actions on extra fields
+		$result = $object->insertExtraFields('DELIVERY_MODIFY');
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
 			$error++;
+		}
 	}
 
 	if ($error)
@@ -252,9 +244,16 @@ if ($action == 'update_extras_line')
 }
 
 
+// Actions to build doc
+$upload_dir = $conf->expedition->dir_output.'/receipt';
+$permissioncreate = $user->rights->expedition->creer;
+include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+
 /*
  * Build document
  */
+/*
 if ($action == 'builddoc')	// En get ou en post
 {
 	// Save last template used to generate document
@@ -290,6 +289,7 @@ elseif ($action == 'remove_file')
 	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 }
+*/
 
 
 /*
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index d0d24d39144..46b3c113ff2 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -540,7 +540,7 @@ class Livraison extends CommonObject
 		global $conf;
 		$error = 0;
 
-		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if ($id > 0 && ! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
 		{
 			$livraisonline = new LivraisonLigne($this->db);
 			$livraisonline->array_options=$array_options;
diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php
index 434d57b43c2..fedf26e6a36 100644
--- a/htdocs/loan/calc.php
+++ b/htdocs/loan/calc.php
@@ -28,7 +28,7 @@ $default_sale_price              = "150000";
 $default_annual_interest_percent = 7.0;
 $default_year_term               = 30;
 $default_down_percent            = 10;
-$default_show_progress           = TRUE;
+$default_show_progress           = true;
 
 /* --------------------------------------------------- *
  * Initialize Variables
@@ -241,7 +241,7 @@ if ($form_complete && $monthly_payment)
 	print '</td>';
 	print '</tr>';
 	*/
-	
+
 	print '<tr valign="top" bgcolor="#9999FF">';
 	print '<td align="right">TOTAL Monthly Payment:</td>';
 	print '<td><b>' . number_format(($monthly_payment + $pmi_per_month + $residential_monthly_tax), "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '</b><br><font>';
@@ -352,7 +352,7 @@ if ($form_complete && $show_progress) {
 		print '<td align="right">' . number_format($remaining_balance, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '</td>';
 		print '</tr>';
 
-		($current_month % 12) ? $show_legend = FALSE : $show_legend = TRUE;
+		($current_month % 12) ? ($show_legend = false) : ($show_legend = true);
 
 		if ($show_legend) {
 			print '<tr>';
diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
index 96c8b5204b8..fbe1cecab2d 100644
--- a/htdocs/loan/calcmens.php
+++ b/htdocs/loan/calcmens.php
@@ -21,16 +21,10 @@
  * \file tvi/ajax/list.php
  * \brief File to return datables output
  */
-if (! defined('NOTOKENRENEWAL'))
-	define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))
-	define('NOREQUIREMENU', '1');
-	// if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))
-	define('NOREQUIREAJAX', '1');
-	// if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-	// if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
 
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 require '../main.inc.php';
 require DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 59b4da544db..53cf9e7cb82 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -702,7 +702,6 @@ if ($id > 0)
 	  		print '<td align="right">'.$langs->trans("LoanCapital").'</td>';
 	  		print '</tr>';
 
-			$var=True;
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 30f1efc69f7..54333029689 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -148,7 +148,7 @@ if ($object->id)
 
     print '<table class="border" width="100%">';
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
     print "</table>\n";
 
     print "</div>\n";
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index 24ea1ab72f9..7a6bee5d79f 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -37,7 +37,7 @@ $socid = GETPOST('socid', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'loan', '', '', '');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -91,6 +91,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -114,7 +119,9 @@ if ($resql)
     $newcardbutton='';
     if ($user->rights->loan->write)
     {
-    	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?action=create">'.$langs->trans('NewLoan').'</a>';
+    	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/loan/card.php?action=create">'.$langs->trans('NewLoan');
+    	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+    	$newcardbutton.= '</a>';
     }
 
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 206e3e64de7..47efb9c8cde 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -40,7 +40,7 @@ if ($user->societe_id) $socid=$user->societe_id;
 //$result = restrictedArea($user, 'facture', $id,'');
 
 $payment = new PaymentLoan($db);
-if ($id > 0) 
+if ($id > 0)
 {
 	$result=$payment->fetch($id);
 	if (! $result) dol_print_error($db,'Failed to get payment id '.$id);
@@ -76,7 +76,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->wri
 	$db->begin();
 
 	$result=$payment->valide();
-	
+
 	if ($result > 0)
 	{
 		$db->commit();
@@ -141,7 +141,7 @@ if ($action == 'delete')
 if ($action == 'valide')
 {
 	$facid = $_GET['facid'];
-	print $form->formconfirm('card.php?id='.$payment->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);	
+	print $form->formconfirm('card.php?id='.$payment->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
 }
 
 
@@ -220,13 +220,10 @@ if ($resql)
 
 	if ($num > 0)
 	{
-		$var=True;
-
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
 
-			
 			print '<tr class="oddeven">';
 			// Ref
 			print '<td>';
@@ -250,7 +247,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	
+
 
 	print "</table>\n";
 	$db->free($resql);
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index bea15f288a0..8faac08fb60 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -245,9 +245,6 @@ if ($action == 'create')
 	print '<td align="right">'.$langs->trans("Amount").'</td>';
 	print "</tr>\n";
 
-	$var=True;
-
-
 	print '<tr class="oddeven">';
 
 	if ($loan->datestart > 0)
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 359a7ea27a1..eaea0dc420c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -198,7 +198,7 @@ if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
 	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
 	$tmplist=explode(',',$tmpautoset[1]);
-	$cookiearrayvalue='';
+	$cookiearrayvalue=array();
 	foreach ($tmplist as $tmpkey)
 	{
 		$postkey=$tmpautoset[0].'_'.$tmpkey;
@@ -350,7 +350,7 @@ if (! defined('NOTOKENRENEWAL'))
 	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
 
 	// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-	$token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
+	$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
 	$_SESSION['newtoken'] = $token;
 }
 if ((! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
@@ -468,7 +468,7 @@ if (! defined('NOLOGIN'))
 		if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
 		{
 			$sessionkey = 'dol_antispam_value';
-			$ok=(array_key_exists($sessionkey, $_SESSION) === TRUE && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+			$ok=(array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
 			// Check code
 			if (! $ok)
@@ -1077,20 +1077,48 @@ if (! function_exists("llxHeader"))
  */
 function top_httphead($contenttype='text/html', $forcenocache=0)
 {
-	global $conf;
+	global $db, $conf, $hookmanager;
 
 	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
 	else header("Content-Type: ".$contenttype);
 	// Security options
 	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
 	header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
-	if (! empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
+	//header("X-XSS-Protection: 1");      		// XSS protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
+	if (! defined('FORCECSP'))
 	{
-		// For example, to restrict script, object, frames or img to some domains
-		// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com
-		// For example, to restrict everything to one domain, except object, ...
-		// default-src https://cdn.example.net; object-src 'none'
-		header("Content-Security-Policy: ".$conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY);
+		//if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
+		//{
+		//	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
+		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
+		//}
+		//else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+		$contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+
+		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+		$hookmanager->initHooks("main");
+
+		$parameters=array('contentsecuritypolicy'=>$contentsecuritypolicy);
+		$result=$hookmanager->executeHooks('setContentSecurityPolicy',$parameters);    // Note that $action and $object may have been modified by some hooks
+		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint;	// Replace CSP
+		else $contentsecuritypolicy .= $hookmanager->resPrint;				// Concat CSP
+
+		if (! empty($contentsecuritypolicy))
+		{
+			// For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
+			// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
+			// For example, to restrict everything to one domain, except 'object', ...:
+			// default-src https://cdn.example.net; object-src 'none'
+			// For example, to restrict everything to itself except img that can be on other servers:
+			// default-src 'self'; img-src *;
+			// Pre-existing site that uses too much inline code to fix but wants to ensure resources are loaded only over https and disable plugins:
+			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
+			header("Content-Security-Policy: ".$contentsecuritypolicy);
+		}
+	}
+	elseif (constant('FORCECSP'))
+	{
+		header("Content-Security-Policy: ".constant('FORCECSP'));
 	}
 	if ($forcenocache)
 	{
@@ -1493,10 +1521,15 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
-			if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
-			else  $toprightmenu=$hookmanager->resPrint;						// replace
+			if ($result == 0)
+				$toprightmenu.=$hookmanager->resPrint;		// add
+			else
+				$toprightmenu=$hookmanager->resPrint;						// replace
+		}
+		else
+		{
+			$toprightmenu.=$result;	// For backward compatibility
 		}
-		else $toprightmenu.=$result;	// For backward compatibility
 
 		// Link to module builder
 		if (! empty($conf->modulebuilder->enabled))
@@ -1548,6 +1581,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 			if ($helpbaseurl && $helppage)
 			{
 				$text='';
+	            if(!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
+                    $langs->load('admin');
+                    $appli .= '<br>' . $langs->trans("Database") . ': ' . $db->database_name;
+                }
 				$title=$appli.'<br>';
 				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
 				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
@@ -1629,7 +1666,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 		{
 			//$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-			$searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+			$searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY)?1:0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
 		}
 		else
 		{
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 559b5b13564..d37dfe0c83b 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -42,7 +42,7 @@ $action=GETPOST('action','alpha');
 /*
  * Action
  */
-if (preg_match('/set_(.*)/',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_set_const($db, $code, 1, 'yesno', 0, '', $conf->entity) > 0)
@@ -56,7 +56,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
     }
 }
 
-if (preg_match('/del_(.*)/',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 0952efb2507..d1c682540ff 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -205,10 +205,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 
 	dol_syslog(__FILE__, LOG_DEBUG);
 	$result = $db->query($sql);
-	if ($result) {
-		$nbtotalofrecords = $db->num_rows($result);
-	} else {
-		setEventMessages($db->lasterror, null, 'errors');
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
 	}
 }
 
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index b216db9d430..dfa97bd7536 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -283,8 +283,6 @@ if ($result)
 
 	if ($num > 0)
 	{
-		$var=True;
-
 		while ($i < $num /*&& $i < $conf->liste_limit*/)
 		{
 			$objp = $db->fetch_object($result);
@@ -304,8 +302,6 @@ if ($result)
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
 			}
 
-
-
 			print '<tr class="oddeven">';
 			if ($client) {
 		        print '<td>';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index ef99e593b82..ad1fc773bd3 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -258,8 +258,6 @@ if ($result)
 
 	if ($num > 0)
 	{
-		$var=True;
-
 		while ($i < $num /*&& $i < $conf->liste_limit*/)
 		{
 			$objp = $db->fetch_object($result);
@@ -278,8 +276,6 @@ if ($result)
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
 			}
 
-
-
 			print '<tr class="oddeven">';
 			if ($id > 0) {
 				print '<td>';
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 605a4272081..94eff1911e7 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -193,11 +193,9 @@ if ($id > 0 || ! empty($ref))
                 $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
 
                 if ($num > 0) {
-                    $var=True;
                     while ($i < $num /*&& $i < $conf->liste_limit*/) {
                         $objp = $db->fetch_object($result);
 
-
 						$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
 						$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 5d80814099d..eb61e4ec41f 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -199,7 +199,6 @@ if ($socid > 0)
 
     	if ($num > 0)
     	{
-    		$var=True;
     		while ($i < $num /*&& $i < $conf->liste_limit*/)
     		{
     			$objp = $db->fetch_object($result);
@@ -207,8 +206,6 @@ if ($socid > 0)
     			$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
     			$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
-
-
     			print '<tr class="oddeven">';
     			print '<td>';
     			$invoicestatic->id=$objp->facid;
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 51ca2b9debb..1048dde3c51 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -225,6 +225,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 
 			$string.= "'".$obj->Field."' =>array('type'=>'".$type."', 'label'=>'".$label."', 'enabled'=>1, 'visible'=>-2";
 			if ($notnull) $string.= ", 'notnull'=>".$notnull;
+			if ($fieldname == 'ref') $string.= ", 'showoncombobox'=>1";
 			$string.= ", 'position'=>".$i."),\n";
 			$string.="<br>";
 			$i+=5;
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 245f85070b3..789e4e469f9 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -65,14 +65,14 @@ class ActionsMyModule
 
 
 	/**
-	 *    Execute action
+	 * Execute action
 	 *
-	 *    @param	array			$parameters		Array of parameters
-	 *    @param	CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 *    @param	string			$action      	'add', 'update', 'view'
-	 *    @return	int         					<0 if KO,
-	 *                              				=0 if OK but we want to process standard actions too,
-	 *                              				>0 if OK and we want to replace standard actions.
+	 * @param	array			$parameters		Array of parameters
+	 * @param	CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param	string			$action      	'add', 'update', 'view'
+	 * @return	int         					<0 if KO,
+	 *                           				=0 if OK but we want to process standard actions too,
+	 *                            				>0 if OK and we want to replace standard actions.
 	 */
 	function getNomUrl($parameters,&$object,&$action)
 	{
@@ -84,7 +84,7 @@ class ActionsMyModule
 	/**
 	 * Overloading the doActions function : replacing the parent's function with the one below
 	 *
-	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   array           $parameters     Hook metadatas (context, etc...)
 	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
@@ -106,7 +106,7 @@ class ActionsMyModule
 		if (! $error) {
 			$this->results = array('myreturn' => 999);
 			$this->resprints = 'A text to show';
-			return 0;                                    // or return 1 to replace standard code
+			return 0; // or return 1 to replace standard code
 		} else {
 			$this->errors[] = 'Error message';
 			return -1;
@@ -117,7 +117,7 @@ class ActionsMyModule
 	/**
 	 * Overloading the doActions function : replacing the parent's function with the one below
 	 *
-	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   array           $parameters     Hook metadatas (context, etc...)
 	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
@@ -142,7 +142,7 @@ class ActionsMyModule
 	    if (! $error) {
 	        $this->results = array('myreturn' => 999);
 	        $this->resprints = 'A text to show';
-	        return 0;                                    // or return 1 to replace standard code
+	        return 0; // or return 1 to replace standard code
 	    } else {
 	        $this->errors[] = 'Error message';
 	        return -1;
@@ -153,7 +153,7 @@ class ActionsMyModule
 	/**
 	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
 	 *
-	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   array           $parameters     Hook metadatas (context, etc...)
 	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
@@ -172,7 +172,7 @@ class ActionsMyModule
 	    }
 
 	    if (! $error) {
-	        return 0;                                    // or return 1 to replace standard code
+	        return 0; // or return 1 to replace standard code
 	    } else {
 	        $this->errors[] = 'Error message';
 	        return -1;
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index a068715b521..b4abf60861e 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -192,7 +192,7 @@ class MyModuleApi extends DolibarrApi
      *
      * @url	POST myobjects/
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->myobject->create) {
 			throw new RestException(401);
@@ -218,7 +218,7 @@ class MyModuleApi extends DolibarrApi
      *
      * @url	PUT myobjects/{id}
      */
-    function put($id, $request_data = NULL)
+    function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->myobject->create) {
 			throw new RestException(401);
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index b6aa06cb273..9815d664ae3 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -335,62 +335,65 @@ class MyObject extends CommonObject
 	}
 
 	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *  Return label of the status
 	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string 			       Label of status
 	 */
 	function getLibStatut($mode=0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
 	/**
 	 *  Return the status
 	 *
-	 *  @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, 6=Long label + Picto
-	 *  @return string 			       	Label of status
+	 *  @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, 6=Long label + Picto
+	 *  @return string 			       Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode=0)
 	{
-		global $langs;
+		if (empty($this->labelstatus))
+		{
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelstatus[1] = $langs->trans('Enabled');
+			$this->labelstatus[0] = $langs->trans('Disabled');
+		}
 
 		if ($mode == 0)
 		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
+			return $this->labelstatus[$status];
 		}
 		if ($mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
+			return $this->labelstatus[$status];
 		}
 		if ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($this->labelstatus[$status],'statut4').' '.$this->labelstatus[$status];
+			if ($status == 0) return img_picto($this->labelstatus[$status],'statut5').' '.$this->labelstatus[$status];
 		}
 		if ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($this->labelstatus[$status],'statut4');
+			if ($status == 0) return img_picto($this->labelstatus[$status],'statut5');
 		}
 		if ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($this->labelstatus[$status],'statut4').' '.$this->labelstatus[$status];
+			if ($status == 0) return img_picto($this->labelstatus[$status],'statut5').' '.$this->labelstatus[$status];
 		}
 		if ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4');
+			if ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5');
 		}
 		if ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4');
+			if ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5');
 		}
 	}
 
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index b8b39dd6e8b..cd9a4b6035b 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -48,7 +48,7 @@ if (! $res) die("Include of main fails");
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-session_cache_limiter(FALSE);
+session_cache_limiter(false);
 
 // Load user to have $user->conf loaded (not done by default here because of NOLOGIN constant defined) and load permission if we need to use them in CSS
 /*if (empty($user->id) && ! empty($_SESSION['dol_login']))
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 73c1b23f938..48a039e4edf 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -22,22 +22,25 @@
  *		\brief      Page to create/edit/view myobject
  */
 
-//if (! defined('NOREQUIREUSER'))          define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))            define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))           define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))          define('NOREQUIRETRAN','1');
-//if (! defined('NOSCANGETFORINJECTION'))  define('NOSCANGETFORINJECTION','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');		// Do not check anti CSRF attack test
-//if (! defined('NOCSRFCHECK'))            define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test done when option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
-//if (! defined('NOSTYLECHECK'))           define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOIPCHECK'))              define('NOIPCHECK','1');				// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined('NOTOKENRENEWAL'))         define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))          define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))          define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))          define('NOREQUIREAJAX','1');         // Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-//if (! defined("MAIN_LANG_DEFAULT"))      define('MAIN_LANG_DEFAULT','auto');
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
+
 
 // Load Dolibarr environment
 $res=0;
@@ -118,7 +121,9 @@ if (empty($reshook))
 
 	$permissiontoadd = $user->rights->mymodule->write;
 	$permissiontodelete = $user->rights->mymodule->delete;
+	if (empty($backtopage)) $backtopage = dol_buildpath('/mymodule/myobject_card.php',1).'?id=__ID__';
 	$backurlforlist = dol_buildpath('/mymodule/myobject_list.php',1);
+	$triggermodname = 'MYMODULE_MODIFY';
 
 	// Actions cancel, add, update or delete
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 8ce85b8eee6..905f16d8780 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -81,8 +81,8 @@ $extralabels = $extrafields->fetch_name_optionals_label('myobject');
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/packages/" . dol_sanitizeFileName($object->id);
-if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/packages/" . dol_sanitizeFileName($object->ref);
+//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/myobject/" . dol_sanitizeFileName($object->id);
+if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/myobject/" . dol_sanitizeFileName($object->ref);
 
 
 /*
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index d941beb6e98..8d4cf6439a4 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -22,23 +22,23 @@
  *		\brief      List page for myobject
  */
 
-//if (! defined('NOREQUIREUSER'))          define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))            define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))           define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))          define('NOREQUIRETRAN','1');
-//if (! defined('NOSCANGETFORINJECTION'))  define('NOSCANGETFORINJECTION','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');		// Do not check anti CSRF attack test
-//if (! defined('NOCSRFCHECK'))            define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test done when option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
-//if (! defined('NOSTYLECHECK'))           define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOIPCHECK'))              define('NOIPCHECK','1');				// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined('NOTOKENRENEWAL'))         define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))          define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))          define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))          define('NOREQUIREAJAX','1');         // Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-//if (! defined("MAIN_LANG_DEFAULT"))      define('MAIN_LANG_DEFAULT','auto');
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');
-
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session)
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 
 // Load Dolibarr environment
 $res=0;
@@ -132,12 +132,12 @@ foreach($object->fields as $key => $val)
 	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->element]['label']) && count($extrafields->attributes[$object->element]['label']))
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 {
-	foreach($extrafields->attributes[$object->element]['label'] as $key => $val)
+	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
-		if (! empty($extrafields->attributes[$object->element]['list'][$key]))
-			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->element]['list'][$key])!=3 && $extrafields->attributes[$object->element]['perms'][$key]));
+		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -213,16 +213,16 @@ foreach($object->fields as $key => $val)
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->element]['label']))
-	foreach ($extrafields->attributes[$object->element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+if (! empty($extrafields->attributes[$object->table_element]['label']))
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->element]['label']) && count($extrafields->attributes[$object->element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."myobject_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('myobject').")";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity($object->element).")";
 else $sql.=" WHERE 1 = 1";
 foreach($search as $key => $val)
 {
@@ -242,15 +242,16 @@ $sql.=$hookmanager->resPrint;
 $sql.= " GROUP BY "
 foreach($object->fields as $key => $val)
 {
-    $sql.='t.'.$key.', ';
+	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->element]['label'])) {
-	foreach ($extrafields->attributes[$object->element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->element]['type'][$key] != 'separate' ? ",ef.".$key : '');
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 // Add where from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
+$sql=preg_replace('/, $/','', $sql);
 */
 
 $sql.=$db->order($sortfield,$sortorder);
@@ -259,19 +260,17 @@ $sql.=$db->order($sortfield,$sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
-// if total resultset is smaller then paging size (filtering), goto and load page 0
-if (($page * $limit) > $nbtotalofrecords)
-{
-	$page = 0;
-	$offset = 0;
-}
-// if total resultset is smaller the limit, no need to do paging.
+// if total resultset is smaller than limit, no need to do paging adn restart select with limits.
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
-	$resql = $result;
 	$num = $nbtotalofrecords;
 }
 else
@@ -350,7 +349,15 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
+$newcardbutton='';
+//if ($user->rights->mymodule->creer)
+//{
+	$newcardbutton='<a class="butActionNew" href="card.php?action=create">'.$langs->trans('New');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
+//}
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail="SendMyObjectRef";
@@ -439,9 +446,12 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine=0;
-foreach ($extrafields->attributes[$object->element]['computed'] as $key => $val)
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
 {
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
+	{
+		if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	}
 }
 
 
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index d2232019592..77934e68744 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -97,9 +97,17 @@ $fieldtosortuser=empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?'firstname':
 
 
 $newcardbutton='';
-if ($user->rights->opensurvey->read)
+if (!$user->rights->opensurvey->creer)
 {
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/opensurvey/wizard/index.php">'.$langs->trans('NewSurvey').'</a>';
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/opensurvey/wizard/index.php">'.$langs->trans('NewSurvey');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
+}
+else
+{
+	$newcardbutton='<a class="butActionNewRefused" href="#">'.$langs->trans('NewSurvey');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 
@@ -107,13 +115,6 @@ $sql = "SELECT p.id_sondage, p.fk_user_creat, p.format, p.date_fin, p.status, p.
 $sql.= " u.login, u.firstname, u.lastname";
 $sql.= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON u.rowid = p.fk_user_creat";
-// Count total nb of records
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}
 $sql.= " WHERE p.entity IN (".getEntity('survey').")";
 if ($search_status != '-1' && $search_status != '') $sql.=natural_search("p.status", $search_status, 2);
 if ($search_expired == 'expired') $sql.=" AND p.date_fin < '".$db->idate($now)."'";
@@ -128,6 +129,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -213,7 +219,7 @@ while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) break;		// Should not happen
-	
+
 	$sql2='select COUNT(*) as nb from '.MAIN_DB_PREFIX."opensurvey_user_studs where id_sondage='".$db->escape($obj->id_sondage)."'";
 	$resql2=$db->query($sql2);
 	if ($resql2)
diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php
index 0fdde4bbe40..f911321062b 100644
--- a/htdocs/opensurvey/wizard/index.php
+++ b/htdocs/opensurvey/wizard/index.php
@@ -18,12 +18,8 @@
  */
 
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index c34e964c522..4855799c508 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -630,8 +630,8 @@ function hash_call($methodName,$nvpStr)
     curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->PAYPAL_SSLVERSION)?1:$conf->global->PAYPAL_SSLVERSION));
 
     //turning off the server and peer verification(TrustManager Concept).
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
     curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
     curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
@@ -639,7 +639,7 @@ function hash_call($methodName,$nvpStr)
     curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
     curl_setopt($ch, CURLOPT_POST, 1);
 
-    //if USE_PROXY constant set to TRUE in Constants.php, then only proxy will be enabled.
+    //if USE_PROXY constant set to true in Constants.php, then only proxy will be enabled.
     if ($USE_PROXY)
     {
         dol_syslog("Paypal API hash_call set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index c544b68cf8d..166265ba247 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -175,11 +175,11 @@ if ($id > 0 || $ref)
     {
     	if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
     	{
-        	$morehtmlcenter.='<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+        	$morehtmlcenter.='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
     	}
     	else
     	{
-        	$morehtmlcenter.='<a class="butActionRefused" href="#">'.$langs->trans("AddAction").'</a>';
+        	$morehtmlcenter.='<a class="butActionNewRefused" href="#">'.$langs->trans("AddAction").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
     	}
     }
 
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index e24222da70e..cce0f4254a0 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -21,20 +21,14 @@
  * \file htdocs/product/ajax/products.php
  * \brief File to return Ajax response on product list request
  */
-if (! defined('NOTOKENRENEWAL'))
-	define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))
-	define('NOREQUIREMENU', '1');
-if (! defined('NOREQUIREHTML'))
-	define('NOREQUIREHTML', '1');
-if (! defined('NOREQUIREAJAX'))
-	define('NOREQUIREAJAX', '1');
-if (! defined('NOREQUIRESOC'))
-	define('NOREQUIRESOC', '1');
-if (! defined('NOCSRFCHECK'))
-	define('NOCSRFCHECK', '1');
-if (empty($_GET ['keysearch']) && ! defined('NOREQUIREHTML'))
-	define('NOREQUIREHTML', '1');
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (empty($_GET['keysearch']) && ! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
 
 require '../../main.inc.php';
 
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php
index 9951c71fcc3..ef6d461fc5c 100644
--- a/htdocs/product/canvas/service/tpl/list.tpl.php
+++ b/htdocs/product/canvas/service/tpl/list.tpl.php
@@ -89,10 +89,9 @@ if (empty($conf) || ! is_object($conf))
 <!-- FIELDS DATA -->
 
 <?php
-$var=True;
 foreach($datas as $line) {
 		?>
-	<tr <?php echo $bc[$var]; ?>>
+	<tr class="oddeven">
    		<?php
    		foreach($line as $key => $value) {
    			foreach($fieldlist as $field) {
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 28c9ab1b696..a0ab4508d9c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1097,7 +1097,7 @@ else
         $parameters=array('cols' => 3);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        if (empty($reshook))
         {
         	print $object->showOptionals($extrafields,'edit',$parameters);
         }
@@ -1310,7 +1310,7 @@ else
             print '</td></tr>';
 
 			// Batch number managment
-			if ($conf->productbatch->enabled) 
+			if ($conf->productbatch->enabled)
 			{
 				if ($object->isProduct() || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
@@ -1470,7 +1470,7 @@ else
             $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            if (empty($reshook))
             {
             	print $object->showOptionals($extrafields,'edit');
             }
@@ -1737,7 +1737,7 @@ else
 			print '</td></tr>';
 
             // Batch number management (to batch)
-            if (! empty($conf->productbatch->enabled)) 
+            if (! empty($conf->productbatch->enabled))
             {
 				if ($object->isProduct() || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
@@ -1771,7 +1771,7 @@ else
             }
 
             //Parent product.
-            if (!empty($conf->variants->enabled) && $object->isProduct()) {
+            if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 
                 $combination = new ProductCombination($db);
 
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 516c67f1fbe..8ba4eaaecc8 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -59,16 +59,16 @@ class Products extends DolibarrApi
      *
      * @param 	int 	$id     			ID of product
      * @param	int		$includestockdata	Load also information about stock (slower)
-     * @return 	array|mixed data without useless information
+     * @return 	array|mixed 				Data without useless information
 	 *
-     * @throws RestException
      * @throws 401
+     * @throws 403
      * @throws 404
      */
     function get($id, $includestockdata=0)
     {
         if(! DolibarrApiAccess::$user->rights->produit->lire) {
-			throw new RestException(401);
+			throw new RestException(403);
 		}
 
         $result = $this->product->fetch($id);
@@ -178,7 +178,7 @@ class Products extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int     ID of product
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->produit->creer) {
 			throw new RestException(401);
@@ -208,7 +208,7 @@ class Products extends DolibarrApi
      * @throws 401
      * @throws 404
      */
-    function put($id, $request_data = NULL)
+    function put($id, $request_data = null)
     {
     	global $conf;
 
@@ -340,7 +340,7 @@ class Products extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
+			throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));  
 		}
 
 		return $result;
@@ -374,7 +374,7 @@ class Products extends DolibarrApi
     	}
 
     	if ($result < 0) {
-    		throw new RestException(503, 'Error when retrieve prices list : '.$categories->error);
+    		throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
     	}
 
     	return array(
@@ -416,7 +416,7 @@ class Products extends DolibarrApi
     	}
 
     	if ($result < 0) {
-    		throw new RestException(503, 'Error when retrieve prices list : '.$categories->error);
+    		throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
     	}
 
     	throw new RestException(501, 'Feature not yet available');
@@ -451,7 +451,7 @@ class Products extends DolibarrApi
     	}
 
     	if ($result < 0) {
-    		throw new RestException(503, 'Error when retrieve prices list : '.$categories->error);
+    		throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
     	}
 
     	return array(
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index cd79259c9a2..2f035c6dc68 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -160,16 +160,16 @@ class Product extends CommonObject
 	//! Average price value for product entry into stock (PMP)
 	public $pmp;
 
-    	/**
+	/**
 	 * Stock alert
 	 * @var int
 	 */
-	public $seuil_stock_alerte;
+	public $seuil_stock_alerte=0;
 
 	/**
 	 * Ask for replenishment when $desiredstock < $stock_reel
 	 */
-	public $desiredstock;
+	public $desiredstock=0;
 
 	/*
 	 * Service expiration
@@ -185,13 +185,13 @@ class Product extends CommonObject
 	 * Status indicates whether the product is on sale '1' or not '0'
 	 * @var int
 	 */
-	public $status;
+	public $status=0;
 
 	/**
 	 * Status indicate whether the product is available for purchase '1' or not '0'
 	 * @var int
 	 */
-	public $status_buy;
+	public $status_buy=0;
 
 	/**
 	 * Status indicates whether the product is a finished product '1' or a raw material '0'
@@ -203,7 +203,7 @@ class Product extends CommonObject
 	 * We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
 	 * @var int
 	 */
-	public $status_batch;
+	public $status_batch=0;
 
 	/**
 	 * Customs code
@@ -227,10 +227,10 @@ class Product extends CommonObject
 	public $volume;
 	public $volume_units;
 
-	public $accountancy_code_buy;
-	public $accountancy_code_buy_intra;
-	public $accountancy_code_buy_export;
 	public $accountancy_code_sell;
+	public $accountancy_code_sell_intra;
+	public $accountancy_code_sell_export;
+	public $accountancy_code_buy;
 
 	/**
 	 * Main barcode
@@ -266,7 +266,7 @@ class Product extends CommonObject
 	//! Product ID already linked to a reference supplier
 	public $product_id_already_linked;
 
-	public $nbphoto;
+	public $nbphoto=0;
 
 	//! Contains detail of stock of product into each warehouse
 	public $stock_warehouse=array();
@@ -332,14 +332,7 @@ class Product extends CommonObject
 		global $langs;
 
 		$this->db = $db;
-		$this->status = 0;
-		$this->status_buy = 0;
-		$this->nbphoto = 0;
-		$this->stock_reel = 0;
-		$this->seuil_stock_alerte = 0;
-		$this->desiredstock = 0;
 		$this->canvas = '';
-		$this->status_batch=0;
 	}
 
 	/**
@@ -886,7 +879,7 @@ class Product extends CommonObject
 			$sql.= ", surface_units = " . ($this->surface_units!='' ? "'".$this->db->escape($this->surface_units)."'" : 'null');
 			$sql.= ", volume = " . ($this->volume!='' ? "'".$this->db->escape($this->volume)."'" : 'null');
 			$sql.= ", volume_units = " . ($this->volume_units!='' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
-			$sql.= ", fk_default_warehouse = " . (! empty($this->fk_default_warehouse) ? $this->db->escape($this->fk_default_warehouse) : 'null');
+			$sql.= ", fk_default_warehouse = " . ($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
 			$sql.= ", seuil_stock_alerte = " . ((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->db->escape($this->seuil_stock_alerte)."'" : "null");
 			$sql.= ", description = '" . $this->db->escape($this->description) ."'";
 			$sql.= ", url = " . ($this->url?"'".$this->db->escape($this->url)."'":'null');
@@ -926,22 +919,15 @@ class Product extends CommonObject
 
 				$action='update';
 
-				// Actions on extra fields (by external module or standard code)
-				$hookmanager->initHooks(array('productdao'));
-				$parameters=array('id'=>$this->id);
-				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-				if (empty($reshook))
+				// Actions on extra fields
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					$result=$this->insertExtraFields();
+					if ($result < 0)
 					{
-						$result=$this->insertExtraFields();
-						if ($result < 0)
-						{
-							$error++;
-						}
+						$error++;
 					}
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error && ! $notrigger)
 				{
@@ -1117,7 +1103,7 @@ class Product extends CommonObject
 				//If it is a parent product, then we remove the association with child products
 				$prodcomb = new ProductCombination($this->db);
 
-				if ($prodcomb->deleteByFkProductParent($id) < 0) {
+				if ($prodcomb->deleteByFkProductParent($user, $id) < 0) {
 					$error++;
 					$this->errors[] = 'Error deleting combinations';
 				}
@@ -2774,7 +2760,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
 		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal').")";
+		$sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -3528,6 +3514,7 @@ class Product extends CommonObject
         }
         if (! empty($conf->accounting->enabled) && $this->status_buy)
         {
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
         	$label.= '<br><b>' . $langs->trans('ProductAccountancyBuyCode') . ':</b> '. length_accountg($this->accountancy_code_buy);
         }
         if (! empty($this->entity))
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 93267538936..442eb3f53f3 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -227,7 +227,7 @@ if ($object->id)
     print '<table class="border tableforfield" width="100%">';
 
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index fc986a9e051..867a30faaeb 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -157,7 +157,7 @@ class PriceParser
 		$extrafields = new ExtraFields($this->db);
 		$extralabels = $extrafields->fetch_name_optionals_label('product', true);
 		$product->fetch_optionals();
-		foreach ($extrafields->attribute_label as $key=>$label)
+		foreach ($extrafields->attributes[$product->table_element]['label'] as $key=>$label)
 		{
 			$values["extrafield_".$key] = $product->array_options['options_'.$key];
 		}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index ebb7f9753dc..21439a1ac8a 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -852,7 +852,7 @@ SCRIPT;
 						{
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=add_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
 							print ' &nbsp; ';
-							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=ask_remove_pf&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_picto($langs->trans("Remove"),'disable.png').'</a>';
+							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=ask_remove_pf&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_picto($langs->trans("Remove"),'delete').'</a>';
 						}
 
 						print '</td>';
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index fd29143613a..1254af2213b 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -307,8 +307,6 @@ if ($result)
 
 		print '<tr class="liste_titre"><th colspan="'.$colnb.'">'.$transRecordedType.'</th></tr>';
 
-		$var=True;
-
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($result);
@@ -337,7 +335,7 @@ if ($result)
 			$product_static->label = $objp->label;
 			$product_static->type=$objp->fk_product_type;
 			$product_static->entity = $objp->entity;
-			$product_static->status_batch = $objp->tobatch; 
+			$product_static->status_batch = $objp->tobatch;
 			print $product_static->getNomUrl(1,'',16);
 			print "</td>\n";
 			print '<td>'.dol_trunc($objp->label,32).'</td>';
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index d41e3ea6d64..adf351e4013 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -42,7 +42,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 }
 else
 {
-	$result = restrictedArea($user, 'stock', $id, '', 'advance_inventory');
+	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
 // Initialize technical objects
@@ -82,8 +82,8 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 }
 else
 {
-	$permissiontoadd = $user->rights->stock->advance_inventory->create;
-	$permissiontodelete = $user->rights->stock->advance_inventory->write;
+	$permissiontoadd = $user->rights->stock->inventory_advance->create;
+	$permissiontodelete = $user->rights->stock->inventory_advance->write;
 }
 
 
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 95670698380..07f0aaa89e3 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -78,7 +78,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 }
 else
 {
-	$result = restrictedArea($user, 'stock', $objectid, '', 'advance_inventory');
+	$result = restrictedArea($user, 'stock', $objectid, '', 'inventory_advance');
 }
 
 // Initialize array of search criterias
@@ -104,12 +104,12 @@ foreach($object->fields as $key => $val)
 	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->element]['label']) && count($extrafields->attributes[$object->element]['label']))
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
 {
-	foreach($extrafields->attributes[$object->element]['label'] as $key => $val)
+	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
-		if (! empty($extrafields->attributes[$object->element]['list'][$key]))
-			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->element]['list'][$key])!=3 && $extrafields->attributes[$object->element]['perms'][$key]));
+		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -185,8 +185,8 @@ foreach($object->fields as $key => $val)
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->element]['label'])) {
-	foreach ($extrafields->attributes[$object->element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
 }
 // Add fields from hooks
 $parameters=array();
@@ -194,7 +194,7 @@ $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->element]['label']) && count($extrafields->attributes[$object->element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."myobject_extrafields as ef on (t.rowid = ef.fk_object)";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."myobject_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('myobject').")";
 else $sql.=" WHERE 1 = 1";
 foreach($search as $key => $val)
@@ -218,7 +218,7 @@ foreach($object->fields as $key => $val)
     $sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
-foreach ($extrafields->attributes[$object->element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->element]['type'][$key] != 'separate' ? ",ef.".$key : '');
+foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 // Add where from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
@@ -233,12 +233,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-}
-// if total resultset is smaller then paging size (filtering), goto and load page 0
-if (($page * $limit) > $nbtotalofrecords)
-{
-	$page = 0;
-	$offset = 0;
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 // if total resultset is smaller the limit, no need to do paging.
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
@@ -411,8 +410,8 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine=0;
-if (! empty($extrafields->attributes[$object->element]['computed'])) {
-	foreach ($extrafields->attributes[$object->element]['computed'] as $key => $val)
+if (! empty($extrafields->attributes[$object->table_element]['computed'])) {
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
 	{
 		if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
 	}
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 503fc6069cc..11be839aa4f 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2013-2016	Juanjo Menent           <jmenent@2byte.es>
@@ -180,12 +180,12 @@ $arrayfields=array(
 	'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Buy").')', 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->element]['label']) && count($extrafields->attributes[$object->element]['label']))
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
 {
-	foreach($extrafields->attributes[$object->element]['label'] as $key => $val)
+	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
-		if (! empty($extrafields->attributes[$object->element]['list'][$key]))
-			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->element]['list'][$key])!=3 && $extrafields->attributes[$object->element]['perms'][$key]));
+		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -220,7 +220,7 @@ if (empty($reshook))
 		$search_tosell="";
 		$search_tobuy="";
 		$search_tobatch='';
-		$search_type='';
+		//$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
 		$search_accountancy_code_sell='';
 		$search_accountancy_code_buy='';
 		$search_array_options=array();
@@ -271,22 +271,22 @@ else
 
 	$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
 	$sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
-	$sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy,';
+	$sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy,';
 	$sql.= ' p.datec as date_creation, p.tms as date_update, p.pmp,';
 	$sql.= ' MIN(pfp.unitprice) as minsellprice';
 	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= ', pac.rowid prod_comb_id';
 	}
 	// Add fields from extrafields
-	if (! empty($extrafields->attributes[$object->element]['label'])) {
-		foreach ($extrafields->attributes[$object->element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->element]['type'][$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+	if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 	}
 	// Add fields from hooks
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 	$sql.=$hookmanager->resPrint;
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
-	if (is_array($extrafields->attributes[$object->element]['label']) && count($extrafields->attributes[$object->element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields as ef on (p.rowid = ef.fk_object)";
+	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields as ef on (p.rowid = ef.fk_object)";
 	if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ
    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 	// multilang
@@ -317,28 +317,20 @@ else
 	if ($search_tobatch != '' && $search_tobatch >= 0)   $sql.= " AND p.tobatch = ".$db->escape($search_tobatch);
 	if ($search_accountancy_code_sell) $sql.= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
 	if ($search_accountancy_code_buy)  $sql.= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
-	// Add where from extra fields
-
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
-		$sql .= " AND pac.rowid IS NULL";
-	}
-
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) $sql .= " AND pac.rowid IS NULL";
 	// Add where from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-
 	// Add where from hooks
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 	$sql.=$hookmanager->resPrint;
 	$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.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
-	$sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy, p.pmp';
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
-		$sql .= ', pac.rowid';
-	}
+	$sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy, p.pmp';
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) $sql .= ', pac.rowid';
 	// Add fields from extrafields
-	if (! empty($extrafields->attributes[$object->element]['label'])) {
-		foreach ($extrafields->attributes[$object->element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->element]['type'][$key] != 'separate' ? ",ef.".$key : '');
+	if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
 	}
 	// Add fields from hooks
 	$parameters=array();
@@ -346,12 +338,19 @@ else
 	$sql.=$hookmanager->resPrint;
 	//if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte";    // Not used yet
 	$sql.= $db->order($sortfield,$sortorder);
+
 	$nbtotalofrecords = '';
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	{
 		$result = $db->query($sql);
 		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
 	}
+
 	$sql.= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -427,7 +426,9 @@ else
 		{
 			$label='NewProduct';
 			if($type == Product::TYPE_SERVICE) $label='NewService';
-			$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type='.$type.'">'.$langs->trans($label).'</a>';
+			$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type='.$type.'">'.$langs->trans($label);
+			$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+			$newcardbutton.= '</a>';
 		}
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
@@ -698,7 +699,7 @@ else
 					$sql = "SELECT label";
 					$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
 					$sql.= " WHERE fk_product=".$obj->rowid;
-					$sql.= " AND lang='". $langs->getDefaultLang() ."'";
+					$sql.= " AND lang='". $db->escape($langs->getDefaultLang()) ."'";
 					$sql.= " LIMIT 1";
 
 					$result = $db->query($sql);
@@ -719,6 +720,10 @@ else
 				$product_static->status_batch = $obj->tobatch;
 				$product_static->entity = $obj->entity;
 				$product_static->pmp = $obj->pmp;
+				$product_static->accountancy_code_sell = $obj->accountancy_code_sell;
+				$product_static->accountancy_code_sell_export = $obj->accountancy_code_sell_export;
+				$product_static->accountancy_code_sell_intra = $obj->accountancy_code_sell_intra;
+				$product_static->accountancy_code_buy = $obj->accountancy_code_buy;
 
 				if ((! empty($conf->stock->enabled) && $user->rights->stock->lire && $search_type != 1) || ! empty($conf->global->STOCK_DISABLE_OPTIM_LOAD))	// To optimize call of load_stock
 				{
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index f71601e7bc0..88b9f2080aa 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -56,7 +56,7 @@ $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if (! $sortfield) $sortfield="p.ref";
 if (! $sortorder) $sortorder="ASC";
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 
 // Load sale and categ filters
@@ -155,6 +155,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit + 1, $offset);
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index fc2632fe5e2..423d0f4015d 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -61,7 +61,7 @@ $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if (! $sortfield) $sortfield="p.ref";
 if (! $sortorder) $sortorder="ASC";
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 
 // Load sale and categ filters
@@ -167,6 +167,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit + 1, $offset);
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index dc3d9a9b7d6..2d01a2f6e9c 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -211,12 +211,10 @@ if ($id > 0 || ! empty($ref))
 
 				if ($num > 0)
 				{
-					$var=True;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($result);
 
-
 						print '<tr class="oddeven">';
 	 					print '<td>';
 	                    $orderstatic->id=$objp->commandeid;
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 4526af86f96..63bb9028a4e 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -220,12 +220,11 @@ if ($id > 0 || ! empty($ref)) {
 				print "</tr>\n";
 
 				if ($num > 0) {
-					$var = True;
+
 					while ( $i < $num && $i < $conf->liste_limit ) {
 						$objp = $db->fetch_object($result);
-						$var = ! $var;
 
-						print '<tr ' . $bc[$var] . '>';
+						print '<tr class="oddeven">';
 						print '<td>';
 						$supplierorderstatic->id = $objp->commandeid;
 						$supplierorderstatic->ref = $objp->ref;
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index ef3723e2e55..ed4d989011e 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -177,7 +177,6 @@ if ($id > 0 || ! empty($ref))
 
 			if ($num > 0)
 			{
-				$var=True;
 				while ($i < $num && $i < $conf->liste_limit)
 				{
 					$objp = $db->fetch_object($result);
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 794d939bc6e..47abbee30a0 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -234,7 +234,6 @@ if ($id > 0 || ! empty($ref))
 
                 if ($num > 0)
 				{
-                    $var=True;
                     while ($i < min($num,$conf->liste_limit))
 					{
                         $objp = $db->fetch_object($result);
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 47ca357b0cd..e17d03fe7e9 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -213,7 +213,6 @@ if ($id > 0 || ! empty($ref))
 
 				if ($num > 0)
 				{
-					$var = True;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($result);
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 3173a04ee55..36dcc945fe1 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -216,13 +216,11 @@ if ($id > 0 || ! empty($ref))
 
 				if ($num > 0)
 				{
-					$var = True;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($result);
-						$var = ! $var;
 
-						print '<tr ' . $bc[$var] . '>';
+						print '<tr class="oddeven">';
 						print '<td>';
 						$propalstatic->id=$objp->propalid;
 						$propalstatic->ref=$objp->ref;
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 07e8015d846..587d024b4c4 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -137,7 +137,7 @@ if ($id > 0 || ! empty($ref))
 			if (! $user->rights->societe->client->voir && ! $socid)
 				$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 			$sql .= " WHERE p.fk_soc = s.rowid";
-			$sql .= " AND p.entity IN (".getEntity('propal').")";
+			$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 			$sql .= " AND d.fk_supplier_proposal = p.rowid";
 			$sql .= " AND d.fk_product =" . $product->id;
 			if (! empty($search_month))
@@ -216,13 +216,11 @@ if ($id > 0 || ! empty($ref))
 
 				if ($num > 0)
 				{
-					$var = True;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($result);
-						$var = ! $var;
 
-						print '<tr ' . $bc[$var] . '>';
+						print '<tr class="oddeven">';
 						print '<td>';
 						$propalstatic->id=$objp->propalid;
 						$propalstatic->ref=$objp->ref;
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 1566e5d36c0..4fccbf4622f 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -460,7 +460,6 @@ else
 			{
 				$num = $db->num_rows($resql);
 				$i = 0;
-				$var=True;
 				while ($i < $num)
 				{
 					$objp = $db->fetch_object($resql);
@@ -491,7 +490,7 @@ else
 					$productstatic->label = $objp->produit;
 					$productstatic->type=$objp->type;
 					$productstatic->entity=$objp->entity;
-					$productstatic->status_batch=$objp->tobatch; 
+					$productstatic->status_batch=$objp->tobatch;
 					print $productstatic->getNomUrl(1,'stock',16);
 					print '</td>';
 
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index cb861f78575..16d21c02eb3 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -173,7 +173,7 @@ class StockMovements extends DolibarrApi
      * @return  int                         ID of stock movement
      */
     //function post($product_id, $warehouse_id, $qty, $lot='', $movementcode='', $movementlabel='', $price=0)
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->stock->creer) {
 			throw new RestException(401);
@@ -212,7 +212,7 @@ class StockMovements extends DolibarrApi
      * @return int
      */
     /*
-    function put($id, $request_data = NULL)
+    function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->stock->creer) {
 			throw new RestException(401);
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index fd2dc4b2328..10b76d22a25 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -158,7 +158,7 @@ class Warehouses extends DolibarrApi
      * @param array $request_data   Request data
      * @return int  ID of warehouse
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->stock->creer) {
 			throw new RestException(401);
@@ -183,7 +183,7 @@ class Warehouses extends DolibarrApi
      * @param array $request_data   Datas
      * @return int
      */
-    function put($id, $request_data = NULL)
+    function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->stock->creer) {
 			throw new RestException(401);
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index ab2b60f564a..f27dfa4a70e 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -249,6 +249,7 @@ class MouvementStock extends CommonObject
             	else   // If not found, we add record
             	{
             	    $productlot = new Productlot($this->db);
+            	    $productlot->entity = $conf->entity;
             	    $productlot->fk_product = $fk_product;
             	    $productlot->batch = $batch;
             	    // If we are here = first time we manage this batch, so we used dates provided by users to create lot
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 31c28eaa5b3..6167a967199 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -91,6 +91,7 @@ class Productlot extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
+		global $conf;
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -133,7 +134,7 @@ class Productlot extends CommonObject
 		$sql.= 'fk_user_modif,';
 		$sql.= 'import_key';
 		$sql .= ') VALUES (';
-		$sql .= ' '.(! isset($this->entity)?'NULL':$this->entity).',';
+		$sql .= ' '.(! isset($this->entity)?$conf->entity:$this->entity).',';
 		$sql .= ' '.(! isset($this->fk_product)?'NULL':$this->fk_product).',';
 		$sql .= ' '.(! isset($this->batch)?'NULL':"'".$this->db->escape($this->batch)."'").',';
 		$sql .= ' '.(! isset($this->eatby) || dol_strlen($this->eatby)==0?'NULL':"'".$this->db->idate($this->eatby)."'").',';
@@ -156,7 +157,17 @@ class Productlot extends CommonObject
 		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 
-			if (!$notrigger) {
+			// Actions on extra fields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+			
+			if (! $error && ! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
 
@@ -190,6 +201,7 @@ class Productlot extends CommonObject
 	 */
 	public function fetch($id = 0, $product_id = 0, $batch = '')
 	{
+		global $conf;
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT';
@@ -222,8 +234,7 @@ class Productlot extends CommonObject
 				//$this->ref = $obj->fk_product.'_'.$obj->batch;
 
 				$this->batch = $obj->batch;
-
-				$this->entity = $obj->entity;
+				$this->entity = (!empty($obj->entity)?$obj->entity:$conf->entity); // Prevent "null" entity 
 				$this->fk_product = $obj->fk_product;
 				$this->eatby = $this->db->jdate($obj->eatby);
 				$this->sellby = $this->db->jdate($obj->sellby);
@@ -313,6 +324,16 @@ class Productlot extends CommonObject
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
 
+		// Actions on extra fields
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+		{
+			$result=$this->insertExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
+		
 		if (!$error && !$notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 36f9e1a7f7c..a1414ab06ac 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -86,7 +86,6 @@ if ($result)
     {
         $entrepot=new Entrepot($db);
 
-        $var=True;
         while ($i < $num)
         {
             $objp = $db->fetch_object($result);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 29e5439b8e8..3d01e7a9f06 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -37,7 +37,7 @@ $search_ref=GETPOST("sref","alpha")?GETPOST("sref","alpha"):GETPOST("search_ref"
 $search_label=GETPOST("snom","alpha")?GETPOST("snom","alpha"):GETPOST("search_label","alpha");
 $search_status=GETPOST("search_status","int");
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield");
 $sortorder = GETPOST("sortorder");
 if (! $sortfield) $sortfield="e.ref";
@@ -133,7 +133,9 @@ if ($result)
 	$newcardbutton='';
 	if ($user->rights->stock->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans('MenuNewWarehouse').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans('MenuNewWarehouse');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index ebe1fbe5375..270217b33f9 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -64,7 +64,7 @@ if (!$sortfield) {
 if (!$sortorder) {
     $sortorder = 'ASC';
 }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 
 $listofdata=array();
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 6093a252cb6..883cd316c76 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,7 +69,7 @@ $search_user = trim(GETPOST("search_user"));
 $search_batch = trim(GETPOST("search_batch"));
 $search_qty = trim(GETPOST("search_qty"));
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -472,6 +473,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+    	$page = 0;
+    	$offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -864,7 +870,7 @@ if ($resql)
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
     $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 	if (! empty($arrayfields['m.datec']['checked']))     print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index f269e260b25..757d01868b5 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      All-3kcis       		 <contact@all-3kcis.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,6 +32,7 @@ if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@includ
 if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
 if (! $res) die("Include of main fails");
 // Change this following line to use the correct relative path from htdocs
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 include_once(DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php');
 include_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
@@ -70,6 +72,7 @@ if ($user->societe_id > 0)
 
 $object = new ProductLot($db);
 $extrafields = new ExtraFields($db);
+$formfile = new FormFile($db);
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
@@ -84,7 +87,8 @@ if ($id || $ref)
         $productid=$tmp[0];
         $batch=$tmp[1];
     }
-    $object->fetch($id, $productid, $batch);
+	$object->fetch($id, $productid, $batch);
+	$object->ref = $object->batch; // For document management ( it use $object->ref)
 }
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
@@ -95,6 +99,9 @@ $permissionnote = $user->rights->stock->creer; 		// Used by the include of actio
 $permissiondellink = $user->rights->stock->creer; 	// Used by the include of actions_dellink.inc.php
 $permissionedit = $user->rights->stock->creer; 		// Used by the include of actions_lineupdown.inc.php
 
+$usercanread = $user->rights->produit->lire;
+$usercancreate = $user->rights->produit->creer;
+$usercandelete = $user->rights->produit->supprimer;
 
 /*
  * Actions
@@ -131,20 +138,13 @@ if (empty($reshook))
 
         if (! $error)
         {
-            // Actions on extra fields (by external module or standard code)
-            $hookmanager->initHooks(array('productlotdao'));
-            $parameters = array('id' => $object->id);
-            $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
-            // some hooks
-            if (empty($reshook)) {
-                $result = $object->insertExtraFields('PRODUCT_LOT_MODIFY');
-       			if ($result < 0)
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$error++;
-				}
-            } else if ($reshook < 0)
-                $error++;
+            // Actions on extra fields
+            $result = $object->insertExtraFields('PRODUCT_LOT_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
         }
 
         if ($error)
@@ -260,6 +260,12 @@ if (empty($reshook))
 			else setEventMessages($object->error, null, 'errors');
 		}
 	}
+
+	// Actions to build doc
+    $upload_dir = $conf->productbatch->multidir_output[$conf->entity];
+    $permissioncreate = $usercancreate;
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
 }
 
 
@@ -396,6 +402,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 }
 
 
+
+/*
+ * Documents generes
+ */
+
+if (empty($action))
+{
+    print '<div class="fichecenter"><div class="fichehalfleft">';
+    print '<a name="builddoc"></a>'; // ancre
+
+    // Documents
+	$filedir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product_batch').dol_sanitizeFileName($object->ref);
+    $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+    $genallowed=$usercanread;
+    $delallowed=$usercancreate;
+
+	$var=true;
+
+    print $formfile->showdocuments('product_batch',dol_sanitizeFileName($object->ref),$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
+    $somethingshown=$formfile->numoffiles;
+
+    print '</div>';
+
+}
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
new file mode 100644
index 00000000000..be93256858f
--- /dev/null
+++ b/htdocs/product/stock/productlot_document.php
@@ -0,0 +1,175 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
+ * Copyright (C) 2013      Florian Henry          <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ * Copyright (C) 2018      All-3kcis       		 <contact@all-3kcis.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/product/stock/productlot_document.php
+ *       \ingroup    product
+ *       \brief      Page des documents joints sur les lots produits
+ */
+
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res) die("Include of main fails");
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+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';
+dol_include_once('/product/stock/class/productlot.class.php');
+
+$langs->load("other");
+$langs->load("products");
+
+$id     = GETPOST('id', 'int');
+$ref    = GETPOST('ref', 'alpha');
+$action = GETPOST('action','alpha');
+$confirm= GETPOST('confirm','alpha');
+
+// Security check
+$fieldvalue = (! empty($id) ? $id : '');
+$fieldtype =  'rowid';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit|service');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productlotdocuments'));
+
+// Get parameters
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="position_name";
+
+$modulepart='product_batch';
+$object = new Productlot($db);
+if ($id || $ref)
+{
+    if ($ref)
+    {
+        $tmp=explode('_',$ref);
+        $productid=$tmp[0];
+        $batch=$tmp[1];
+    }
+    $object->fetch($id, $productid, $batch);
+    $object->ref = $object->batch; // For document management ( it use $object->ref)
+
+    if (! empty($conf->productbatch->enabled)) $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, $modulepart).dol_sanitizeFileName($object->ref);
+}
+
+
+/*
+ * Actions
+ */
+
+$parameters=array('id'=>$id);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+
+	// Action submit/delete file/link
+	include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+}
+
+$permtoedit = $user->rights->produit->creer;
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+llxHeader('', $langs->trans('ProductLot'), '');
+
+
+if ($object->id)
+{
+
+	$head = productlot_prepare_head($object);
+	dol_fiche_head($head, 'documents', $langs->trans("Batch"), -1, 'barcode');
+
+
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	// 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'];
+	}
+
+
+    $linkback = '<a href="' . DOL_URL_ROOT . '/product/stock/productlot_list.php' . '">' . $langs->trans("BackToList") . '</a>';
+
+    $shownav = 1;
+    if ($user->societe_id && ! in_array('batch', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'batch');
+
+    print '<div class="fichecenter">';
+
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border tableforfield" width="100%">';
+
+    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+    print '</table>';
+
+    print '</div>';
+    print '<div style="clear:both"></div>';
+
+    dol_fiche_end();
+
+    $permission = ( $user->rights->produit->creer );
+    $param = '&id=' . $object->id;
+    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+
+
+}
+else
+{
+	print $langs->trans("ErrorUnknown");
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 1d1f6a89478..c9ac6269dbd 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018	   Ferran Marcet		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -252,6 +253,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -295,7 +301,7 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_products', 0, '', '', $limit);
 
 	$topicmail="Information";
 	$modelmail="productlot";
@@ -388,7 +394,7 @@ if ($resql)
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 5a61e8b2a98..360a12a7c69 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -65,7 +65,7 @@ $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 
 if (!$sortfield) {
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 8332da36eaa..c10e1117024 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -52,7 +52,7 @@ $search_datemonth = GETPOST('search_datemonth', 'int');
 $search_dateday = GETPOST('search_dateday', 'int');
 $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield");
 $sortorder = GETPOST("sortorder");
 if (!$sortorder) $sortorder = 'DESC';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 76e741faa1d..bfc7cd80a78 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -41,7 +41,7 @@ if (! $sortfield) $sortfield="e.ref";
 if (! $sortorder) $sortorder="ASC";
 $page = $_GET["page"];
 if ($page < 0) $page = 0;
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 
 $year = strftime("%Y",time());
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 43720614a2e..ec9a458634b 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -49,7 +49,8 @@ $projectid=isset($_GET["id"])?$_GET["id"]:$_POST["projectid"];
 
 // Security check
 $socid=0;
-if ($user->societe_id > 0) $socid=$user->societe_id;
+// For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->societe_id > 0) $socid=$user->societe_id;
 $result = restrictedArea($user, 'projet', $projectid);
 
 $now=dol_now();
@@ -70,6 +71,7 @@ $search_task_ref=GETPOST('search_task_ref', 'alpha');
 $search_task_label=GETPOST('search_task_label', 'alpha');
 $search_project_ref=GETPOST('search_project_ref', 'alpha');
 $search_thirdparty=GETPOST('search_thirdparty', 'alpha');
+$search_declared_progress=GETPOST('search_declared_progress', 'alpha');
 
 $monthofday=GETPOST('addtimemonth');
 $dayofday=GETPOST('addtimeday');
@@ -113,6 +115,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_task_label = '';
 	$search_project_ref = '';
 	$search_thirdparty = '';
+	$search_declared_progress = '';
 }
 if (GETPOST("button_search_x",'alpha') || GETPOST("button_search.x",'alpha') || GETPOST("button_search",'alpha'))
 {
@@ -331,6 +334,7 @@ if ($search_project_ref) $morewherefilter.=natural_search("p.ref", $search_proje
 if ($search_task_ref)    $morewherefilter.=natural_search("t.ref", $search_task_ref);
 if ($search_task_label)  $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label);
 if ($search_thirdparty)  $morewherefilter.=natural_search("s.nom", $search_thirdparty);
+if ($search_declared_progress)  $morewherefilter.=natural_search("t.progress", $search_declared_progress, 1);
 
 $tasksarray=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid?$search_usertoprocessid:0));    // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 if ($morewherefilter)	// Get all task without any filter, so we can show total of time spent for not visible tasks
@@ -357,6 +361,7 @@ $param.=($search_task_label?'&search_task_label='.$search_task_label:'');
 
 // Show navigation bar
 $nav ='<a class="inline-block valignmiddle" href="?year='.$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param.'">'.img_previous($langs->trans("Previous"))."</a>\n";
+$nav.=dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"%A").' ';
 $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"day")." </span>\n";
 $nav.='<a class="inline-block valignmiddle" href="?year='.$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
 $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
@@ -409,7 +414,7 @@ print '<div class="taskiddiv inline-block">';
 $formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
 print '</div>';
 print ' ';
-print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0, 'maxwidth200');
+print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0, 'maxwidth150onsmartphone');
 print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
@@ -433,9 +438,22 @@ $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.='<div class="inline-block hideonsmartphone">'.$langs->trans('User'). ' </div>';
 $includeonly='hierachyme';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_usertoprocessid?$search_usertoprocessid:$usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire?0:0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter.=$form->select_dolusers($search_usertoprocessid?$search_usertoprocessid:$usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire?0:0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200 marginleftonly');
 $moreforfilter.='</div>';
 
+if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
+{
+	$moreforfilter.='<div class="divsearchfield">';
+	$moreforfilter.='<div class="inline-block">'.$langs->trans('Project'). ' </div>';
+	$moreforfilter.='<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
+	$moreforfilter.='</div>';
+
+	$moreforfilter.='<div class="divsearchfield">';
+	$moreforfilter.='<div class="inline-block">'.$langs->trans('ThirdParty'). ' </div>';
+	$moreforfilter.='<input type="text" size="4" name="search_thirdparty" class="marginleftonly" value="'.dol_escape_htmltag($search_thirdparty).'">';
+	$moreforfilter.='</div>';
+}
+
 if (! empty($moreforfilter))
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -451,12 +469,11 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
-print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
-//print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
+if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
+if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
+print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
@@ -470,9 +487,8 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Project").'</td>';
-print '<td>'.$langs->trans("ThirdParty").'</td>';
-//print '<td>'.$langs->trans("RefTask").'</td>';
+if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td>'.$langs->trans("Project").'</td>';
+if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td>'.$langs->trans("ThirdParty").'</td>';
 print '<td>'.$langs->trans("Task").'</td>';
 print '<td align="right" class="leftborder plannedworkload maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
@@ -498,7 +514,8 @@ if (! empty($conf->global->MAIN_DEFAULT_WORKING_DAYS))
 	}
 }
 
-$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse);	// $daytoparse is a date with hours = 0
+$statusofholidaytocheck = '3';
+$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse, $statusofholiday);	// $daytoparse is a date with hours = 0
 $isavailable[$daytoparse]=$isavailablefordayanduser;			// in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
 $tmparray = dol_getdate($daytoparse,true);	// detail of current day
@@ -522,7 +539,7 @@ print '<td class="center">'.$langs->trans("Note").'</td>';
 print '<td class="center"></td>';
 print "</tr>\n";
 
-$colspan = 8;
+$colspan = 6+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);;
 
 if ($conf->use_javascript_ajax)
 {
@@ -607,13 +624,9 @@ if (count($tasksarray) > 0)
 	if ($isdiff)
 	{
 		print '<tr class="oddeven othertaskwithtime">';
-        print '<td colspan="3">';
+		print '<td colspan="'.($colspan-1).'" class="opacitymedium">';
 		print $langs->trans("OtherFilteredTasks");
 		print '</td>';
-		print '<td align="right" class="leftborder plannedworkload"></td>';
-		print '<td></td>';
-		print '<td></td>';
-		print '<td></td>';
 		print '<td class="leftborder"></td>';
 		print '<td class="center">';
 		$timeonothertasks=($totalforeachday[$daytoparse] - $totalforvisibletasks[$daytoparse]);
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index b7d731d786b..e535b2fecf0 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -49,7 +49,8 @@ $projectid=isset($_GET["id"])?$_GET["id"]:$_POST["projectid"];
 
 // Security check
 $socid=0;
-if ($user->societe_id > 0) $socid=$user->societe_id;
+// For external user, no check is done on company because readability is managed by public status of project and assignement.
+// if ($user->societe_id > 0) $socid=$user->societe_id;
 $result = restrictedArea($user, 'projet', $projectid);
 
 $now=dol_now();
@@ -70,6 +71,7 @@ $search_task_ref=GETPOST('search_task_ref', 'alpha');
 $search_task_label=GETPOST('search_task_label', 'alpha');
 $search_project_ref=GETPOST('search_project_ref', 'alpha');
 $search_thirdparty=GETPOST('search_thirdparty', 'alpha');
+$search_declared_progress=GETPOST('search_declared_progress', 'alpha');
 
 $startdayarray=dol_get_first_day_week($day, $month, $year);
 
@@ -124,6 +126,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_task_label = '';
 	$search_project_ref = '';
 	$search_thirdparty = '';
+	$search_declared_progress = '';
 }
 if (GETPOST("button_search_x",'alpha') || GETPOST("button_search.x",'alpha') || GETPOST("button_search",'alpha'))
 {
@@ -290,6 +293,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 			$param.=($search_project_ref?'&search_project_ref='.$search_project_ref:'');
 			$param.=($search_usertoprocessid > 0?'&search_usertoprocessid='.$search_usertoprocessid:'');
 			$param.=($search_thirdparty?'&search_thirdparty='.$search_thirdparty:'');
+			$param.=($search_declared_progress?'&search_declared_progress='.$search_declared_progress:'');
 			$param.=($search_task_ref?'&search_task_ref='.$search_task_ref:'');
 			$param.=($search_task_label?'&search_task_label='.$search_task_label:'');
 
@@ -333,6 +337,7 @@ if ($search_project_ref) $morewherefilter.=natural_search("p.ref", $search_proje
 if ($search_task_ref)    $morewherefilter.=natural_search("t.ref", $search_task_ref);
 if ($search_task_label)  $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label);
 if ($search_thirdparty)  $morewherefilter.=natural_search("s.nom", $search_thirdparty);
+if ($search_declared_progress)  $morewherefilter.=natural_search("t.progress", $search_declared_progress, 1);
 
 $tasksarray=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid?$search_usertoprocessid:0));    // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 if ($morewherefilter)	// Get all task without any filter, so we can show total of time spent for not visible tasks
@@ -411,7 +416,7 @@ print '<div class="taskiddiv inline-block">';
 $formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
 print '</div>';
 print ' ';
-print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0, 'maxwidth200');
+print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0, 'maxwidth150onsmartphone');
 print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
@@ -445,7 +450,9 @@ for ($idw=0; $idw<7; $idw++)
 	//print dol_print_date($dayinloopwithouthours, 'dayhour').' ';
 	//print dol_print_date($dayinloopfromfirstdaytoshow, 'dayhour').'<br>';
 
-	$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $dayinloopfromfirstdaytoshow);
+	$statusofholidaytocheck = '3';
+
+	$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $dayinloopfromfirstdaytoshow, $statusofholidaytocheck);
 	$isavailable[$dayinloopfromfirstdaytoshow]=$isavailablefordayanduser;			// in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 }
 
@@ -471,6 +478,19 @@ if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
 $moreforfilter.=$form->select_dolusers($search_usertoprocessid?$search_usertoprocessid:$usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire?0:0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
 
+if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
+{
+	$moreforfilter.='<div class="divsearchfield">';
+	$moreforfilter.='<div class="inline-block">'.$langs->trans('Project'). ' </div>';
+	$moreforfilter.='<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
+	$moreforfilter.='</div>';
+
+	$moreforfilter.='<div class="divsearchfield">';
+	$moreforfilter.='<div class="inline-block">'.$langs->trans('ThirdParty'). ' </div>';
+	$moreforfilter.='<input type="text" size="4" name="search_thirdparty" class="marginleftonly" value="'.dol_escape_htmltag($search_thirdparty).'">';
+	$moreforfilter.='</div>';
+}
+
 if (! empty($moreforfilter))
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -485,12 +505,11 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
-print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
-//print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
+if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
+if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
+print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 for ($idw=0;$idw<7;$idw++)
@@ -505,9 +524,8 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Project").'</td>';
-print '<td>'.$langs->trans("ThirdParty").'</td>';
-//print '<td>'.$langs->trans("RefTask").'</td>';
+if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td>'.$langs->trans("Project").'</td>';
+if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td>'.$langs->trans("ThirdParty").'</td>';
 print '<td>'.$langs->trans("Task").'</td>';
 print '<td align="right" class="leftborder plannedworkload maxwidth75">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").'</td>';
@@ -540,7 +558,7 @@ for ($idw=0; $idw<7; $idw++)
 print '<td></td>';
 print "</tr>\n";
 
-$colspan=7;
+$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
 
 if ($conf->use_javascript_ajax)
 {
@@ -634,7 +652,7 @@ if (count($tasksarray) > 0)
 	if ($isdiff)
 	{
 		print '<tr class="oddeven othertaskwithtime">';
-        print '<td colspan="'.$colspan.'">';
+        print '<td colspan="'.$colspan.'" class="opacitymedium">';
 		print $langs->trans("OtherFilteredTasks");
 		print '</td>';
 		for ($idw = 0; $idw < 7; $idw++)
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index b1cf4d9773b..4135d547be3 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -274,12 +274,11 @@ elseif ($action == 'updateoptions')
 			$conf->global->PROJECT_USE_SEARCH_TO_SELECT = $companysearch;
 		}
 	}
-}
-else if ($action == "linkOtherCompany")
-{
-	$projectToSelect = GETPOST('projectToSelect');
-
-	dolibarr_set_const($db, 'PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY', $projectToSelect, 'chaine', 0, '', $conf->entity);	//Allow to disable this configuration if empty value
+	if (GETPOST('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY'))
+	{
+		$projectToSelect = GETPOST('projectToSelect','alpha');
+		dolibarr_set_const($db, 'PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY', $projectToSelect, 'chaine', 0, '', $conf->entity);	//Allow to disable this configuration if empty value
+	}
 }
 
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 00266b74e9c..e73db5a9155 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -629,7 +629,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -869,7 +869,7 @@ elseif ($object->id > 0)
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
@@ -1055,7 +1055,7 @@ elseif ($object->id > 0)
                         if (parseFloat(oldpercent) != 100) { jQuery("#opp_percent").val(oldpercent); }
                         else { jQuery("#opp_percent").val(defaultpercent); }
                     }
-                    else 
+                    else
                     {
                     	if ((parseFloat(jQuery("#opp_percent").val()) < parseFloat(defaultpercent)));
                     	{
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index bf98938074d..ab157bf237c 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -179,7 +179,7 @@ class Projects extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int     ID of project
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->projet->creer) {
 			  throw new RestException(401, "Insuffisant rights");
@@ -300,7 +300,7 @@ class Projects extends DolibarrApi
      * @return int
      */
     /*
-    function postLine($id, $request_data = NULL) {
+    function postLine($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->projet->creer) {
 		  	throw new RestException(401);
 		  }
@@ -362,7 +362,7 @@ class Projects extends DolibarrApi
      * @return object
      */
     /*
-    function putLine($id, $lineid, $request_data = NULL) {
+    function putLine($id, $lineid, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->projet->creer) {
 		  	throw new RestException(401);
 		  }
@@ -418,7 +418,7 @@ class Projects extends DolibarrApi
      *
      * @return int
      */
-    function put($id, $request_data = NULL) {
+    function put($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->projet->creer) {
 		  	throw new RestException(401);
 		  }
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 81e28663cc4..3125546c10a 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -187,7 +187,7 @@ class Tasks extends DolibarrApi
      * @param   array   $request_data   Request data
      * @return  int     ID of project
      */
-    function post($request_data = NULL)
+    function post($request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->projet->creer) {
 			  throw new RestException(401, "Insuffisant rights");
@@ -305,7 +305,7 @@ class Tasks extends DolibarrApi
      * @return int
      */
     /*
-    function postLine($id, $request_data = NULL) {
+    function postLine($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->projet->creer) {
 		  	throw new RestException(401);
 		  }
@@ -367,7 +367,7 @@ class Tasks extends DolibarrApi
      * @return object
      */
     /*
-    function putLine($id, $lineid, $request_data = NULL) {
+    function putLine($id, $lineid, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->projet->creer) {
 		  	throw new RestException(401);
 		  }
@@ -422,7 +422,7 @@ class Tasks extends DolibarrApi
      *
      * @return int
      */
-    function put($id, $request_data = NULL) {
+    function put($id, $request_data = null) {
       if(! DolibarrApiAccess::$user->rights->projet->creer) {
 		  	throw new RestException(401);
 		  }
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ba200ddcfb0..d6456a4cacf 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -223,7 +223,7 @@ class Project extends CommonObject
         }
 
         // Update extrafield
-        if (!$error) {
+        if (! $error) {
         	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
         	{
         		$result=$this->insertExtraFields();
@@ -234,13 +234,13 @@ class Project extends CommonObject
         	}
         }
 
-        if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
+        if (! $error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
         {
             $res = $this->setValid($user);
             if ($res < 0) $error++;
         }
 
-        if (!$error)
+        if (! $error)
         {
             $this->db->commit();
             return $ret;
@@ -320,7 +320,7 @@ class Project extends CommonObject
                 	}
                 }
 
-                if (! $error && !$notrigger)
+                if (! $error && ! $notrigger)
                 {
                 	// Call trigger
                 	$result=$this->call_trigger('PROJECT_MODIFY',$user);
@@ -1723,23 +1723,26 @@ class Project extends CommonObject
     {
         global $conf, $langs;
 
-        $mine=0; $socid=$user->societe_id;
-
-        $projectsListId = $this->getProjectsAuthorizedForUser($user,$mine?$mine:($user->rights->projet->all->lire?2:0),1,$socid);
+        // For external user, no check is done on company because readability is managed by public status of project and assignement.
+        //$socid=$user->societe_id;
 
+        if (! $user->rights->projet->all->lire) $projectsListId = $this->getProjectsAuthorizedForUser($user,0,1,$socid);
+        
         $sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
         $sql.= " FROM (".MAIN_DB_PREFIX."projet as p";
         $sql.= ")";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+        // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+        //if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= " WHERE p.fk_statut = 1";
         $sql.= " AND p.entity IN (".getEntity('project', 0).')';
-        if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+        if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-
+        // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+        //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+        
+        //print $sql;
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 28b3c9b12f3..4177895bc7c 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -333,6 +333,18 @@ class Task extends CommonObject
 		$resql = $this->db->query($sql);
 		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
+		// Update extrafield
+		if (! $error) {
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
+
 		if (! $error)
 		{
 			if (! $notrigger)
@@ -344,18 +356,6 @@ class Task extends CommonObject
 			}
 		}
 
-		//Update extrafield
-		if (!$error) {
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-			{
-				$result=$this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
-			}
-		}
-
 		if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
 		{
 			// We remove directory
@@ -1826,28 +1826,31 @@ class Task extends CommonObject
 	{
 		global $conf, $langs;
 
-		$mine=0; $socid=$user->societe_id;
-
+		// For external user, no check is done on company because readability is managed by public status of project and assignement.
+		//$socid=$user->societe_id;
+		
 		$projectstatic = new Project($this->db);
-		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid);
-
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+		
 		// List of tasks (does not care about permissions. Filtering will be done later)
 		$sql = "SELECT p.rowid as projectid, p.fk_statut as projectstatus,";
 		$sql.= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
 		$sql.= " t.dateo as date_start, t.datee as datee";
 		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
 		$sql.= " AND p.fk_statut = 1";
 		$sql.= " AND t.fk_projet = p.rowid";
 		$sql.= " AND t.progress < 100";         // tasks to do
-		if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 		if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
+		// if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		
 		//print $sql;
 		$resql=$this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index fbf9574bd75..4677e409f35 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -138,7 +138,7 @@ if ($object->id > 0)
 
 	// Files infos
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 	print "</table>\n";
 
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 0c1e86c8ab5..2f43701c73d 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -80,7 +80,8 @@ if (! empty($conf->use_javascript_ajax))
 	);
 }
 
-$title=$langs->trans("Project").' - '.$langs->trans("Gantt").($object->ref?' - '.$object->ref.' '.$object->name:'');
+//$title=$langs->trans("Gantt").($object->ref?' - '.$object->ref.' '.$object->name:'');
+$title=$langs->trans("Gantt");
 if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=($object->ref?$object->ref.' '.$object->name.' - ':'').$langs->trans("Gantt");
 $help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader("",$title,$help_url,'',0,0,$arrayofjs,$arrayofcss);
@@ -93,7 +94,7 @@ if (($id > 0 && is_numeric($id)) || ! empty($ref))
 	//$userDelete = $object->restrictedProjectArea($user,'delete');
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
-    $tab='gantt';
+    $tab='tasks';
 
     $head=project_prepare_head($object);
     dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
@@ -187,43 +188,32 @@ if (($id > 0 && is_numeric($id)) || ! empty($ref))
     print '<div class="clearboth"></div>';
 
     dol_fiche_end();
+
+    print '<br>';
 }
 
-
-/*
- * Buttons actions
- */
-
-if ($id > 0 && is_numeric($id))
+// Link to create task
+if ($user->rights->projet->all->creer || $user->rights->projet->creer)
 {
-
-	print '<div class="tabsAction">';
-
-	if ($user->rights->projet->all->creer || $user->rights->projet->creer)
+	if ($object->public || $userWrite > 0)
 	{
-	    if ($object->public || $userWrite > 0)
-	    {
-	        print '<a class="butAction" href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id.'&action=create'.$param.'&tab=gantt&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'</a>';
-	    }
-	    else
-	    {
-	        print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'</a>';
-	    }
+		$linktocreatetask = '<a class="butActionNew" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}
 	else
 	{
-	    print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
+		$linktocreatetask = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}
-
-	print '</div>';
-
-	print '<br>';
 }
 else
 {
-	print_fiche_titre($langs->trans("GanttView"));
+	$linktocreatetask = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 }
 
+$linktolist='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id.'">'.$langs->trans("GoToListOfTasks").'<span class="paddingleft fa fa-list-ul valignmiddle"></span></a>';
+
+//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
+print load_fiche_titre($title, $linktolist.' &nbsp; '.$linktocreatetask, 'title_generic.png');
+
 
 // Get list of tasks in tasksarray and taskarrayfiltered
 // We need all tasks (even not limited to a user because a task to user
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index a702432998e..79280868ecb 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -20,10 +20,7 @@
  *		\brief      Fichier de javascript de traduction pour JSGantt
  */
 
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))     define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
 if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
 if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
 if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
 if (! defined('NOLOGIN'))         define('NOLOGIN',1);
@@ -31,7 +28,6 @@ if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
-
 require_once __DIR__.'/../main.inc.php';
 
 // Define mime type
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index e57eab2d109..94a3850fe33 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015 	   Claudio Aschieri     <c.aschieri@19.coop>
+ * Copyright (C) 2018 	   Ferran Marcet	    <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -372,6 +373,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
@@ -441,7 +447,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 $newcardbutton='';
 if ($user->rights->projet->creer)
 {
-	$newcardbutton = '<a class="butAction" href="'.DOL_URL_ROOT.'/projet/card.php?action=create">'.$langs->trans('NewProject').'</a>';
+	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/projet/card.php?action=create">'.$langs->trans('NewProject');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -657,7 +665,7 @@ if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 67504974759..5f6c526d1d5 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -322,7 +322,7 @@ foreach ($data_all_year as $val)
 	while ($year && $oldyear > $year+1)
 	{	// If we have empty year
 		$oldyear--;
-		
+
 		print '<tr '.$bc[$var].' height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@@ -334,7 +334,7 @@ foreach ($data_all_year as $val)
 		print '<td align="right">0</td>';
 		print '</tr>';
 	}
-	
+
 	print '<tr '.$bc[$var].' height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
@@ -352,7 +352,7 @@ print '</table>';
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
-$stringtoshow.= '<table class="border" width="100%"><tr valign="top"><td align="center">';
+$stringtoshow.= '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
 	$stringtoshow.= $px1->show();
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 4a5bcdab70b..69c62416e9b 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -31,8 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
-$langs->load("users");
-$langs->load("projects");
+$langs->loadLangs(array("users", "projects"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -77,7 +76,9 @@ $planned_workload=$planned_workloadhour*3600+$planned_workloadmin*60;
 $userAccess=0;
 
 
-
+$parameters=array('id'=>$id);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 /*
  * Actions
  */
@@ -416,7 +417,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields_task->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields_task,'edit');
 	}
@@ -462,16 +463,16 @@ else if ($id > 0 || ! empty($ref))
 	{
 		if ($object->public || $userWrite > 0)
 		{
-			$linktocreatetask = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'</a>';
+			$linktocreatetask = '<a class="butActionNew" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 		}
 		else
 		{
-			$linktocreatetask = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'</a>';
+			$linktocreatetask = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 		}
 	}
 	else
 	{
-		$linktocreatetask = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
+		$linktocreatetask = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}
 
 
@@ -487,7 +488,7 @@ else if ($id > 0 || ! empty($ref))
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	$title=$langs->trans("ListOfTasks");
-	$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$object->id.'&withproject=1">'.$langs->trans("GoToListOfTimeConsumed").'</a>';
+	$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1">'.$langs->trans("GoToGanttView").'<span class="paddingleft fa fa-calendar-minus-o valignmiddle"></span></a>';
 
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'title_generic.png');
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 9e14c462bef..4766f0687b7 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2006-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2018	   Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -326,6 +327,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
@@ -393,7 +399,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 $newcardbutton='';
 if ($user->rights->projet->creer)
 {
-	$newcardbutton = '<a class="butAction" href="'.DOL_URL_ROOT.'/projet/tasks.php?action=create">'.$langs->trans('NewTask').'</a>';
+	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/projet/tasks.php?action=create">'.$langs->trans('NewTask');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -579,7 +587,7 @@ if (! empty($arrayfields['t.progress']['checked']))      print_liste_field_titre
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
@@ -719,7 +727,7 @@ while ($i < min($num,$limit))
 			$showlineingray=0;$showproject=1;
 			print '<td class="center">';
 			if ($showlineingray) print '<i>';
-			else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
+			else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.($showproject?'':'&withproject=1').'">';
 			if ($obj->duration_effective) print convertSecondToTime($obj->duration_effective,$timespentoutputformat);
 			else print '--:--';
 			if ($showlineingray) print '</i>';
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index b03d01a8006..d030f858f4e 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -199,7 +199,7 @@ print '</table>';
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
-$stringtoshow.= '<table class="border" width="100%"><tr valign="top"><td align="center">';
+$stringtoshow.= '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; }
 else {
 	$stringtoshow.= $px1->show();
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 10f64869257..735b5a81195 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -60,6 +60,9 @@ $projectstatic = new Project($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
+$parameters=array('id'=>$id);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 /*
  * Actions
@@ -413,7 +416,7 @@ if ($id > 0 || ! empty($ref))
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			if (empty($reshook))
 			{
 				print $object->showOptionals($extrafields,'edit');
 			}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index e61d3ceb8ce..86a2027b3b7 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -319,7 +320,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		if ($withproject)
 		{
 			// Tabs for project
-			$tab='tasks';
+			if (empty($id)) $tab='timespent';
+			else $tab='tasks';
 			$head=project_prepare_head($projectstatic);
 			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
 
@@ -419,16 +421,16 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			{
     				if ($projectstatic->public || $userWrite > 0)
     			    {
-    			    	$linktocreatetime = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?withproject=1'.($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTimeSpent').'</a>';
+    			    	$linktocreatetime = '<a class="butActionNew" href="'.$_SERVER['PHP_SELF'].'?withproject=1'.($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTimeSpent').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
     			    }
     			    else
     			    {
-    			    	$linktocreatetime = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTime').'</a>';
+    			    	$linktocreatetime = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTime').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
     			    }
     			}
     			else
     			{
-    				$linktocreatetime = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTime').'</a>';
+    				$linktocreatetime = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTime').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
     			}
 			//}
 		}
@@ -694,9 +696,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 				print '<!-- List of time spent for project -->'."\n";
 
 				$title=$langs->trans("ListTaskTimeUserProject");
-			    $linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
+			    //$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
 			    //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
-			    print load_fiche_titre($title,$linktotasks.' &nbsp; '.$linktocreatetime, 'title_generic.png');
+			    print load_fiche_titre($title, $linktocreatetime, 'title_generic.png');
 			}
 
 			$i = 0;
@@ -867,8 +869,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		if (! empty($arrayfields['t.task_date']['checked']))
 		{
 			print '<td class="liste_titre">';
-			if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-			print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
+			if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
 			$formother->select_year($search_year,'search_year',1, 20, 5);
 			print '</td>';
 		}
@@ -919,7 +921,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 		*/
 	    // Hook fields
-    	$parameters=array('arrayfields'=>$arrayfields);
+		$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
         $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
     	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch ');
@@ -948,7 +950,11 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			print '<td class="nowrap">';
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
     			{
-    				print $form->select_date(($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
+    				if (empty($task_time->task_date_withhour))
+    				{
+    					print $form->select_date(($date2?$date2:$date1),'timeline',3,3,2,"timespent_date",1,0,1);
+    				}
+    				else print $form->select_date(($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
     			}
     			else
     			{
@@ -1085,7 +1091,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print $hookmanager->resPrint;
 
             // Action column
-			print '<td class="center"">';
+			print '<td class="center nowraponall">';
 			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 			{
 				print '<input type="hidden" name="lineid" value="'.$_GET['lineid'].'">';
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index c8f7f05ff23..72f1a6b9242 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -28,18 +28,15 @@
  *              &id=..., &idfrom=..., &idto=...
  */
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOLOGIN'))        define("NOLOGIN",1);		// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK'))    define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 
 // C'est un wrapper, donc header vierge
+
 /**
  * Header function
  *
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index 36b21c514e9..b11bf4cc42f 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -27,9 +27,7 @@ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOLOGIN'))   define('NOLOGIN','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOLOGIN'))        define('NOLOGIN','1');
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 3780481e23c..3d8057cbe85 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -73,14 +73,10 @@ if ($resql)
 		print "<td align=\"right\">".$langs->trans("Amount")."</TD>";
 		print "</TR>\n";
 
-		$var=True;
-		$bc[1]='bgcolor="#f5f5f5"';
-		$bc[0]='bgcolor="#f0f0f0"';
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
 
-			
 			print '<tr class="oddeven">';
 			if ($objp->public)
 			{
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 1ba869796ed..b92e84b8352 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -35,8 +35,9 @@
  *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOLOGIN'))		define("NOLOGIN",1);		// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK'))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOIPCHECK'))		define('NOIPCHECK','1');	// Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
@@ -59,11 +60,7 @@ $backtopage=GETPOST('backtopage','alpha');
 $action=GETPOST('action','alpha');
 
 // Load translation files
-$langs->load("main");
-$langs->load("members");
-$langs->load("companies");
-$langs->load("install");
-$langs->load("other");
+$langs->loadLangs(array("main","members","companies","install","other"));
 
 // Security check
 if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
@@ -76,6 +73,8 @@ if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
 
 $extrafields = new ExtraFields($db);
 
+$object = new Adherent($db);
+
 
 /**
  * Show header for new member
@@ -358,7 +357,7 @@ if ($action == 'add')
                 if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'all')
                 {
                     $urlback=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
+                    if (price2num(GETPOST('amount','alpha'))) $urlback.='&amount='.price2num(GETPOST('amount','alpha'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                     if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
                     {
@@ -375,51 +374,51 @@ if ($action == 'add')
             	else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
                 {
                     $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
+                    if (price2num(GETPOST('amount','alpha'))) $urlback.='&amount='.price2num(GETPOST('amount','alpha'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
-                    if (! empty($conf->global->PAYBOX_SECURITY_TOKEN))
+                    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
                     {
-                    	if (! empty($conf->global->PAYBOX_SECURITY_TOKEN_UNIQUE))
+                    	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                     	{
-                    		$urlback.='&securekey='.urlencode(dol_hash($conf->global->PAYBOX_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2));
+                    		$urlback.='&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2));
                     	}
                     	else
                     	{
-                    		$urlback.='&securekey='.urlencode($conf->global->PAYBOX_SECURITY_TOKEN);
+                    		$urlback.='&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                     	}
                     }
                 }
                 else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
                     $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
+                    if (price2num(GETPOST('amount','alpha'))) $urlback.='&amount='.price2num(GETPOST('amount','alpha'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
-                    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+                    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
                     {
-                        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+                    	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
-                    	    $urlback.='&securekey='.urlencode(dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2));
+                        	$urlback.='&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2));
                         }
                         else
                         {
-                            $urlback.='&securekey='.urlencode($conf->global->PAYPAL_SECURITY_TOKEN);
+                        	$urlback.='&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
                 }
 				else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
                 {
                     $urlback=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
-                    if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
+                    if (price2num(GETPOST('amount','alpha'))) $urlback.='&amount='.price2num(GETPOST('amount','alpha'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
-                    if (! empty($conf->global->STRIPE_SECURITY_TOKEN))
+                    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
                     {
-                        if (! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+                    	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
-                    	    $urlback.='&securekey='.urlencode(dol_hash($conf->global->STRIPE_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2));
+                        	$urlback.='&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2));
                         }
                         else
                         {
-                            $urlback.='&securekey='.urlencode($conf->global->STRIPE_SECURITY_TOKEN);
+                        	$urlback.='&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
                 }
@@ -487,17 +486,17 @@ llxHeaderVierge($langs->trans("NewSubscription"));
 
 print load_fiche_titre($langs->trans("NewSubscription"), '', '', 0, 0, 'center');
 
-print '<div class="center subscriptionformhelptext">';
+
+print '<div align="center">';
+print '<div id="divsubscribe">';
+
+print '<div class="center subscriptionformhelptext justify">';
 if (! empty($conf->global->MEMBER_NEWFORM_TEXT)) print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
 else print $langs->trans("NewSubscriptionDesc",$conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
 print '</div>';
 
 dol_htmloutput_errors($errmsg);
 
-print '<div align="center">';
-print '<div id="divsubscribe">';
-
-
 // Print form
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" / >';
@@ -631,13 +630,8 @@ print '</td></tr>'."\n";
 print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
 // Public
 print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
-// Extrafields
-foreach($extrafields->attribute_label as $key=>$value)
-{
-    print "<tr><td>".$value."</td><td>";
-    print $extrafields->showInputField($key,GETPOST('options_'.$key));
-    print "</td></tr>\n";
-}
+// Other attributes
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 // Comments
 print '<tr>';
 print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index f21a4d1a338..5dee0eb49a3 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -24,8 +24,9 @@
  * 	\brief      File to show a public card of a member
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOLOGIN'))		define("NOLOGIN",1);		// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK'))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOIPCHECK'))		define('NOIPCHECK','1');	// Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
@@ -107,7 +108,7 @@ if ($id > 0)
 			print $form->showphoto('memberphoto', $object, 64);
 			print '</td></tr>'."\n";
 		}
-		//  foreach($objecto->attribute_label as $key=>$value){
+		//  foreach($extrafields->attributes[$object->table_element]['label'] as $key=>$value){
 		//    print "<tr><td>$value</td><td>".$object->array_options["options_$key"]."&nbsp;</td></tr>\n";
 		//  }
 
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index ef42b4e8d56..1f9a4406028 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -24,8 +24,9 @@
  *  \brief      File sample to list members
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOLOGIN'))		define("NOLOGIN",1);		// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK'))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOIPCHECK'))		define('NOIPCHECK','1');	// Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
@@ -81,7 +82,7 @@ function llxFooterVierge()
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -139,7 +140,6 @@ if ($result)
 	print_liste_field_titre("Photo", $_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder,'public_');
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < $num && $i < $conf->liste_limit)
 	{
 		$objp = $db->fetch_object($result);
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 742b949e27c..32cb5f2e1ba 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -66,22 +66,28 @@ if (GETPOST('ajoutcomment','alpha'))
 
 	$error=0;
 
-	if (! GETPOST('comment','none'))
+	$comment = GETPOST("comment",'none');
+	$comment_user = GETPOST('commentuser','nohtml');
+
+	if (! $comment)
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
 	}
-	if (! GETPOST('commentuser','nohtml'))
+	if (! $comment_user)
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
 	}
 
+	if (! in_array($comment_user, $listofvoters))
+	{
+		setEventMessages($langs->trans("UserMustBeSameThanUserUsedToVote"), null, 'errors');
+		$error++;
+	}
+
 	if (! $error)
 	{
-		$comment = GETPOST("comment",'none');
-		$comment_user = GETPOST('commentuser','nohtml');
-
 		$resql = $object->addComment($comment, $comment_user);
 
 		if (! $resql) dol_print_error($db);
@@ -729,8 +735,12 @@ if ($comments)
 	print "<br><b>" . $langs->trans("CommentsOfVoters") . ":</b><br>\n";
 
 	foreach ($comments as $obj) {
+		// ligne d'un usager pré-authentifié
+		//$mod_ok = (in_array($obj->name, $listofvoters));
+
 		print '<div class="comment"><span class="usercomment">';
-		if (in_array($obj->usercomment, $listofvoters)) print '<a href="'.$_SERVER["PHP_SELF"].'?deletecomment='.$obj->id_comment.'&sondage='.$numsondage.'"> '.img_picto('', 'delete.png').'</a> ';
+		if (in_array($obj->usercomment, $listofvoters)) print '<a href="'.$_SERVER["PHP_SELF"].'?deletecomment='.$obj->id_comment.'&sondage='.$numsondage.'"> '.img_picto('', 'delete.png', '', false, 0, 0, '', 'nomarginleft').'</a> ';
+		//else print img_picto('', 'ellipsis-h', '', false, 0, 0, '', 'nomarginleft').' ';
 		print dol_htmlentities($obj->usercomment).':</span> <span class="comment">'.dol_nl2br(dol_htmlentities($obj->comment))."</span></div>";
 	}
 }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 389daafcd15..78cf69d8337 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -222,7 +222,7 @@ if (! empty($conf->paypal->enabled))
 		            $TAXAMT=urldecode($resArray["TAXAMT"]);
 		            $NOTE=urldecode($resArray["NOTE"]);
 
-		            $ispaymentok=True;
+		            $ispaymentok=true;
 		        }
 		        else
 		        {
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index a53f812611a..0250bb2c39f 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -28,11 +28,16 @@ This page is a sample of page using Dolibarr HTML widget methods. It is designed
 $form=new Form($db);
 
 // Test1: form->select_date using tzuser date
-print "Test 1: We must have here current hour for user (must match hour on browser). Note: Check your are logged so user TZ and DST are known.";
+print "Test 1a: We must have here current date and hour for user (must match hour on browser). Note: Check your are logged so user TZ and DST are known.";
 $offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
 $offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
 print " (dol_tz=".$offsettz." dol_dst=".$dol_dst.")<br>\n";
-$form->select_date('', 'test1', 1, 1, 0);
+$form->select_date(dol_now(), 'test1a', 1, 1, 0);
+
+print '<br><br>'."\n";
+
+print "Test 1b: We must have here current date with hours to 00:00.<br>";
+$form->select_date('', 'test1b', 1, 1, 0);
 
 print '<br><br>'."\n";
 
diff --git a/htdocs/public/ticketsup/create_ticket.php b/htdocs/public/ticketsup/create_ticket.php
index a0cb6f787ac..a6fc6778f96 100644
--- a/htdocs/public/ticketsup/create_ticket.php
+++ b/htdocs/public/ticketsup/create_ticket.php
@@ -1,7 +1,6 @@
 <?php
-/*
- * Copyright (C) - 2013-2016    Jean-François FERRY    <hello@librethic.io>
- *                    2016            Christophe Battarel <christophe@altairis.fr>
+/* Copyright (C) 2013-2016    Jean-François FERRY <hello@librethic.io>
+ * Copyright (C) 2016         Christophe Battarel <christophe@altairis.fr>
  *
  * 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
@@ -18,37 +17,22 @@
  */
 
 /**
- *     Display public form to add new ticket
- *
- *    @package ticketsup
+ *       \file       htdocs/public/ticketsup/index.php
+ *       \ingroup    ticketsup
+ *       \brief      Display public form to add new ticket
  */
-if (!defined('NOREQUIREUSER')) {
-    define('NOREQUIREUSER', '1');
-}
 
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (!defined('NOTOKENRENEWAL')) {
-    define('NOTOKENRENEWAL', '1');
-}
-
-if (!defined('NOREQUIREMENU')) {
-    define('NOREQUIREMENU', '1');
-}
-// If there is no menu to show
-if (!defined('NOREQUIREHTML')) {
-    define('NOREQUIREHTML', '1');
-}
-// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOLOGIN'))        define("NOLOGIN", 1);     // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))    define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/actions_ticketsup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/html.formticketsup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticketsup/lib/ticketsup.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticketsup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ticketsup.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
@@ -66,11 +50,17 @@ $action = GETPOST('action', 'alpha');
 
 $object = new Ticketsup($db);
 
+$extrafields = new ExtraFields($db);
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+
 /*
- * Add file in email form
+ * Actions
  */
+
+// Add file in email form
 if (GETPOST('addfile') && !GETPOST('add_ticket')) {
-    ////$res = $object->fetch('',GETPOST('track_id'));
+    ////$res = $object->fetch('','',GETPOST('track_id'));
     ////if($res > 0)
     ////{
     include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
@@ -86,13 +76,9 @@ if (GETPOST('addfile') && !GETPOST('add_ticket')) {
     ////}
 }
 
-/*
- * Remove file in email form
- */
+// Remove file
 if (GETPOST('removedfile') && !GETPOST('add_ticket')) {
-    ////$res = $object->fetch('',GETPOST('track_id'));
-    ////if($res > 0)
-    ////{
+
     include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
     // Set tmp directory
@@ -100,9 +86,8 @@ if (GETPOST('removedfile') && !GETPOST('add_ticket')) {
     $upload_dir_tmp = $vardir . '/temp';
 
     // TODO Delete only files that was uploaded from email form
-    dol_remove_file_process($_POST['removedfile'], 0);
+    dol_remove_file_process($_POST['removedfile'], 0, 0);
     $action = 'create_ticket';
-    ////}
 }
 if ($action == 'create_ticket' && GETPOST('add_ticket')) {
     $error = 0;
@@ -127,11 +112,11 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
         }
     }
 
-    if (!GETPOST("subject")) {
+    if (!GETPOST("subject","none")) {
         $error++;
         array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
         $action = '';
-    } elseif (!GETPOST("message")) {
+    } elseif (!GETPOST("message","none")) {
         $error++;
         array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("message")));
         $action = '';
@@ -149,13 +134,13 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
 
         $object->track_id = generate_random_id(16);
 
-        $object->subject = GETPOST("subject");
-        $object->message = GETPOST("message");
+        $object->subject = GETPOST("subject","none");
+        $object->message = GETPOST("message","none");
         $object->origin_email = $origin_email;
 
-        $object->type_code = GETPOST("type_code");
-        $object->category_code = GETPOST("category_code");
-        $object->severity_code = GETPOST("severity_code");
+        $object->type_code = GETPOST("type_code", 'az09');
+        $object->category_code = GETPOST("category_code", 'az09');
+        $object->severity_code = GETPOST("severity_code", 'az09');
         if (is_array($searched_companies)) {
             $object->fk_soc = $searched_companies[0]->id;
         }
@@ -165,18 +150,17 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
             $usertoassign = $contacts[0]->id;
         }
 
-        if (!empty($conf->global->TICKETS_EXTRAFIELDS_PUBLIC) && $conf->global->TICKETS_EXTRAFIELDS_PUBLIC == "1") {
-            $extrafields = new ExtraFields($db);
-            $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-            $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-        }
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 
         // Generate new ref
         $object->ref = $object->getDefaultRef();
         if (!is_object($user)) {
             $user = new User($db);
         }
-        $id = $object->create($user, 1); // Disable trigger for email (send by this page)
+
+        $object->context['disableticketsupemail']=1;		// Disable emails sent by ticketsup trigger when creation is done from this page, emails are already sent later
+
+        $id = $object->create($user);
         if ($id <= 0) {
             $error++;
             $errors = ($object->error ? array($object->error) : $object->errors);
@@ -188,9 +172,20 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
             if ($usertoassign > 0) {
                 $object->add_contact($usertoassign, "SUPPORTCLI", 'external', $notrigger = 0);
             }
+        }
 
-            $object->db->commit();
+        if (! $error)
+        {
+        	$object->db->commit();
+        	$action = "infos_success";
+        } else {
+	    	$object->db->rollback();
+	    	setEventMessage($object->errors, 'errors');
+	    	$action = 'create_ticket';
+	    }
 
+	    if (! $error)
+	    {
             $res = $object->fetch($id);
             if ($res) {
                 // Create form object
@@ -209,18 +204,19 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
                 $mimetype = $attachedfiles['mimes'];
 
                 // Send email to customer
+
                 $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketNewEmailSubject');
                 $message .= ($conf->global->TICKETS_MESSAGE_MAIL_NEW ? $conf->global->TICKETS_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')) . "\n\n";
                 $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket') . "\n";
 
-                $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/ticketsup/public/view.php', 2)) . '?track_id=' . $object->track_id;
+                $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/public/ticketsup/view.php', 2)) . '?track_id=' . $object->track_id;
                 $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="' . $url_public_ticket . '">' . $object->track_id . '</a>') . "\n";
                 $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl') . "\n\n";
 
                 $message .= dol_nl2br($infos_new_ticket);
                 $message .= $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE : $langs->transnoentities('TicketMessageMailSignatureText');
 
-                $sendto = GETPOST('email');
+                $sendto = GETPOST('email','alpha');
 
                 $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '>';
                 $replyto = $from;
@@ -242,74 +238,95 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
                     $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
                 }
 
-                /* Send email to admin */
+
+                // Send email to TICKETS_NOTIFICATION_EMAIL_TO
+
                 $sendto = $conf->global->TICKETS_NOTIFICATION_EMAIL_TO;
-                $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketNewEmailSubjectAdmin');
-                $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id) . "\n\n";
-                $message_admin .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
-                $message_admin .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
-                $message_admin .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
-                $message_admin .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
-                $message_admin .= '<li>' . $langs->trans('From') . ' : ' . $object->origin_email . '</li>';
-                if (is_array($object->array_options) && count($object->array_options) > 0) {
-                    foreach ($object->array_options as $key => $value) {
-                        $message_admin .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
-                    }
-                }
-                $message_admin .= '</ul>';
-                $message_admin .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
-                $message_admin .= '<p><a href="' . dol_buildpath('/ticketsup/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
 
-                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '>';
-                $replyto = $from;
+                if ($sendto)
+                {
+	                $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketNewEmailSubjectAdmin');
+	                $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id) . "\n\n";
+	                $message_admin .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
+	                $message_admin .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
+	                $message_admin .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
+	                $message_admin .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
+	                $message_admin .= '<li>' . $langs->trans('From') . ' : ' . $object->origin_email . '</li>';
 
-                $message_admin = dol_nl2br($message_admin);
+	                if (is_array($extrafields->attributes[$object->table_element]['label']))
+	                {
+	                	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	                	{
+	                		$enabled = 1;
+	                		if ($qualified && isset($extrafields->attributes[$object->table_element]['list'][$key]))
+	                		{
+	                			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
+	                		}
+	                		$perms = 1;
+	                		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))
+	                		{
+	                			$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
+	                		}
 
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
-                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-                }
-                include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
-                $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-                if ($mailfile->error) {
-                    setEventMessage($mailfile->error, 'errors');
-                } else {
-                    $result = $mailfile->sendfile();
-                }
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
-                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-                }
+	                		$qualified=true;
+	                		if (empty($enabled) || $enabled == 2) $qualified = false;
+	                		if (empty($perms)) $qualified = false;
+	                		if ($qualified) $message_admin .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+	                	}
+	                }
 
-                // Copy files into ticket directory
-                $destdir = $conf->ticketsup->dir_output . '/' . $object->track_id;
-                if (!dol_is_dir($destdir)) {
-                    dol_mkdir($destdir);
-                }
-                foreach ($filename as $i => $val) {
-                    dol_move($filepath[$i], $destdir . '/' . $filename[$i], 0, 1);
-                    $formmail->remove_attached_files($i);
+	                $message_admin .= '</ul>';
+	                $message_admin .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
+	                $message_admin .= '<p><a href="' . dol_buildpath('/ticketsup/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
+
+	                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '>';
+	                $replyto = $from;
+
+	                $message_admin = dol_nl2br($message_admin);
+
+	                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+	                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+	                }
+	                include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+	                $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+	                if ($mailfile->error) {
+	                    setEventMessage($mailfile->error, 'errors');
+	                } else {
+	                    $result = $mailfile->sendfile();
+	                }
+	                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+	                }
                 }
             }
 
+            // Copy files into ticket directory
+            $destdir = $conf->ticketsup->dir_output . '/' . $object->track_id;
+            if (! dol_is_dir($destdir)) {
+            	dol_mkdir($destdir);
+            }
+            foreach ($filename as $i => $val) {
+            	dol_move($filepath[$i], $destdir . '/' . $filename[$i], 0, 1);
+            	$formmail->remove_attached_files($i);
+            }
+
             setEventMessage($langs->trans('YourTicketSuccessfullySaved'));
-            $action = "infos_success";
-        } else {
-            $object->db->rollback();
-            setEventMessage($object->errors, 'errors');
-            $action = 'create_ticket';
         }
     } else {
         setEventMessage($object->errors, 'errors');
     }
 }
 
-/***************************************************
- * PAGE
- *
- ****************************************************/
+
+
+/*
+ * View
+ */
 
 $arrayofjs = array();
-$arrayofcss = array('/opensurvey/css/style.css', '/ticketsup/css/styles.css', '/ticketsup/css/bg.css.php');
+$arrayofcss = array('/opensurvey/css/style.css', '/ticketsup/css/styles.css.php');
+
 llxHeaderTicket($langs->trans("CreateTicket"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 $form = new Form($db);
@@ -332,9 +349,6 @@ if ($action != "infos_success") {
     $formticket->withemail = 1;
     $formticket->ispublic = 1;
     $formticket->withfile = 2;
-    if (!empty($conf->global->TICKETS_EXTRAFIELDS_PUBLIC)) {
-        $formticket->withextrafields = $conf->global->TICKETS_EXTRAFIELDS_PUBLIC;
-    }
     $formticket->action = 'create_ticket';
 
     $formticket->param = array('returnurl' => $_SERVER['PHP_SELF']);
@@ -343,24 +357,19 @@ if ($action != "infos_success") {
         $defaultref = '';
     }
 
-    print load_fiche_titre($langs->trans('NewTicket'), '', 'ticketsup-32@ticketsup', 0);
+    print load_fiche_titre($langs->trans('NewTicket'), '', '', 0, 0, 'marginleftonly');
 
-    print '<div class="info">' . $langs->trans('TicketPublicInfoCreateTicket') . '</div>';
+    print '<div class="info marginleftonly marginrightonly">' . $langs->trans('TicketPublicInfoCreateTicket') . '</div>';
     $formticket->showForm();
 } else {
-    print '<div class="ok">' . $langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '<strong>' . $object->track_id . '</strong>');
+    print '<div class="info center">' . $langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '<strong>' . $object->track_id . '</strong>');
     print '<br>';
     print $langs->trans('PleaseRememberThisId');
 }
 print '</div>';
 
-/***************************************************
- * LINKED OBJECT BLOCK
- *
- * Put here code to view linked object
- ****************************************************/
-//$somethingshown=$object->showLinkedObjectBlock();
-
 // End of page
-$db->close();
+
 llxFooter('');
+
+$db->close();
diff --git a/htdocs/public/ticketsup/index.php b/htdocs/public/ticketsup/index.php
index 8352282c4af..a7649576275 100644
--- a/htdocs/public/ticketsup/index.php
+++ b/htdocs/public/ticketsup/index.php
@@ -16,36 +16,19 @@
  */
 
 /**
- *       \file       ticketsup/public/index.php
- *        \ingroup    ticketsup
- *        \brief      Public file to add and manage ticket
+ *       \file       htdocs/public/ticketsup/index.php
+ *       \ingroup    ticketsup
+ *       \brief      Public file to add and manage ticket
  */
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK')) {
-    define('NOCSRFCHECK', '1');
-}
-// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');            // Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');        // Do not check anti POST attack test
-if (!defined('NOREQUIREMENU')) {
-    define('NOREQUIREMENU', '1');
-}
-// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');            // If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (!defined("NOLOGIN")) {
-    define("NOLOGIN", '1');
-}
-// If this page is public (can be called outside logged session)
+if (!defined('NOCSRFCHECK'))   define('NOCSRFCHECK', '1');
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
+if (!defined("NOLOGIN"))       define("NOLOGIN", '1');				// If this page is public (can be called outside logged session)
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/actions_ticketsup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/html.formticketsup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticketsup/lib/ticketsup.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticketsup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ticketsup.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 
 // Load traductions files requiredby by page
@@ -66,7 +49,7 @@ $form = new Form($db);
 $formticket = new FormTicketsup($db);
 
 $arrayofjs = array();
-$arrayofcss = array('/ticketsup/css/styles.css', '/ticketsup/css/bg.css.php');
+$arrayofcss = array('/ticketsup/css/styles.css.php');
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 if (!$conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) {
diff --git a/htdocs/public/ticketsup/list.php b/htdocs/public/ticketsup/list.php
index 34413168bc0..9a930bc78b0 100644
--- a/htdocs/public/ticketsup/list.php
+++ b/htdocs/public/ticketsup/list.php
@@ -16,9 +16,9 @@
  */
 
 /**
- *       \file       ticketsup/public/index.php
- *        \ingroup    ticketsup
- *        \brief      Public file to add and manage ticket
+ *       \file       htdocs/public/ticketsup/list.php
+ *       \ingroup    ticketsup
+ *       \brief      Public file to add and manage ticket
  */
 
 if (!defined('NOCSRFCHECK')) {
@@ -36,13 +36,11 @@ if (!defined("NOLOGIN")) {
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/actions_ticketsup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/html.formticketsup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticketsup/lib/ticketsup.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticketsup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ticketsup.lib.php';
 
 // Load traductions files requiredby by page
-$langs->load("companies");
-$langs->load("other");
-$langs->load("ticketsup");
+$langs->loadLangs(array("companies","other","ticketsup"));
 
 // Get parameters
 $track_id = GETPOST('track_id', 'alpha');
@@ -62,6 +60,13 @@ if (isset($_SESSION['email_customer'])) {
 
 $object = new ActionsTicketsup($db);
 
+
+
+
+/*
+ * Actions
+ */
+
 if ($action == "view_ticketlist") {
     $error = 0;
     $display_ticket_list = false;
@@ -84,7 +89,8 @@ if ($action == "view_ticketlist") {
     }
 
     if (!$error) {
-        $ret = $object->fetch('', $track_id);
+    	$ret = $object->fetch('', '', $track_id);
+
         if ($ret && $object->dao->id > 0) {
             // vérifie si l'adresse email est bien dans les contacts du ticket
             $contacts = $object->dao->liste_contact(-1, 'external');
@@ -120,12 +126,14 @@ if ($action == "view_ticketlist") {
         $action = '';
     }
 }
+
 $object->doActions($action);
 
-/***************************************************
- * VIEW
- *
- ****************************************************/
+
+
+/*
+ * View
+ */
 
 $form = new Form($db);
 $user_assign = new User($db);
@@ -133,7 +141,7 @@ $user_create = new User($db);
 $formticket = new FormTicketsup($db);
 
 $arrayofjs = array();
-$arrayofcss = array('/ticketsup/css/styles.css', '/ticketsup/css/bg.css.php');
+$arrayofcss = array('/ticketsup/css/styles.css.php');
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 if (!$conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) {
@@ -144,11 +152,13 @@ if (!$conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) {
 
 print '<div style="margin: 0 auto; width:60%">';
 
-if ($action == "view_ticketlist") {
+if ($action == "view_ticketlist")
+{
+
     if ($display_ticket_list) {
         // Filters
         $search_fk_status = GETPOST("search_fk_status", 'alpha');
-        $search_subject = GETPOST("search_subject");
+        $search_subject = GETPOST("search_subject", 'alpha');
         $search_type = GETPOST("search_type", 'alpha');
         $search_category = GETPOST("search_category", 'alpha');
         $search_severity = GETPOST("search_severity", 'alpha');
@@ -156,7 +166,7 @@ if ($action == "view_ticketlist") {
         $search_fk_user_assign = GETPOST("search_fk_user_assign", 'int');
 
         // Store current page url
-        $url_page_current = dol_buildpath('/ticketsup/public/list.php', 1);
+        $url_page_current = dol_buildpath('/public/ticketsup/list.php', 1);
 
         // Do we click on purge search criteria ?
         if (GETPOST("button_removefilter_x")) {
@@ -200,10 +210,10 @@ if ($action == "view_ticketlist") {
         );
 
         // Extra fields
-        if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
-            foreach ($extrafields->attribute_label as $key => $val) {
-                if ($extrafields->attribute_type[$key] != 'separate') {
-                    $arrayfields["ef." . $key] = array('label' => $extrafields->attribute_label[$key], 'checked' => $extrafields->attribute_list[$key], 'position' => $extrafields->attribute_pos[$key], 'enabled' => $extrafields->attribute_perms[$key]);
+        if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+        	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+        		if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
+        			$arrayfields["ef." . $key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => $extrafields->attributes[$object->table_element]['list'][$key], 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => $extrafields->attributes[$object->table_element]['perms'][$key]);
                 }
             }
         }
@@ -264,15 +274,13 @@ if ($action == "view_ticketlist") {
         $limit = $conf->liste_limit;
 
         $page = GETPOST("page", 'int');
-        if ($page == -1) {
-            $page = 0;
-        }
+        if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
         $offset = $limit * $page;
         $pageprev = $page - 1;
         $pagenext = $page + 1;
 
         // Request SQL
-        $sql = "SELECT";
+        $sql = "SELECT DISTINCT";
         $sql .= " t.rowid,";
         $sql .= " t.ref,";
         $sql .= " t.track_id,";
@@ -293,11 +301,12 @@ if ($action == "view_ticketlist") {
         $sql .= " t.datec,";
         $sql .= " t.date_read,";
         $sql .= " t.date_close,";
-        $sql .= " t.tms";
-        $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
+        $sql .= " t.tms,";
+        $sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
         // Add fields for extrafields
-        foreach ($extrafields->attribute_list as $key => $val) {
-        	$sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef." . $key . ' as options_' . $key : '');
+        if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+        	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+        		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key . ' as options_' . $key : '');
         }
         $sql .= " FROM " . MAIN_DB_PREFIX . "ticketsup as t";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_ticketsup_type as type ON type.code=t.type_code";
@@ -309,16 +318,16 @@ if ($action == "view_ticketlist") {
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id=t.rowid";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_contact as tc ON ec.fk_c_type_contact=tc.rowid";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople sp ON ec.fk_socpeople=sp.rowid";
-        if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+        if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "ticketsup_extrafields as ef on (t.rowid = ef.fk_object)";
         }
         $sql .= " WHERE t.entity IN (" . getEntity('ticketsup') . ")";
-        $sql .= " AND tc.source = 'external'";
-        $sql .= " AND tc.element='" . $object->dao->element . "'";
-        $sql .= " AND tc.active=1";
-        $sql .= " AND (sp.email='" . $db->escape($_SESSION['email_customer']) . "'";
+        $sql .= " AND ((tc.source = 'external'";
+        $sql .= " AND tc.element='" . $db->escape($object->dao->element) . "'";
+        $sql .= " AND tc.active=1)";
+        $sql .= " OR (sp.email='" . $db->escape($_SESSION['email_customer']) . "'";
         $sql .= " OR s.email='" . $db->escape($_SESSION['email_customer']) . "'";
-        $sql .= " OR t.origin_email='" . $db->escape($_SESSION['email_customer']) . "')";
+        $sql .= " OR t.origin_email='" . $db->escape($_SESSION['email_customer']) . "'))";
         // Manage filter
         if (!empty($filter)) {
             foreach ($filter as $key => $value) {
@@ -337,7 +346,7 @@ if ($action == "view_ticketlist") {
                 }
             }
         }
-        $sql .= " GROUP BY t.track_id";
+        //$sql .= " GROUP BY t.track_id";
         $sql .= " ORDER BY " . $sortfield . ' ' . $sortorder;
 
         $resql = $db->query($sql);
@@ -350,7 +359,7 @@ if ($action == "view_ticketlist") {
             $resql = $db->query($sql);
             if ($resql) {
                 $num = $db->num_rows($resql);
-                print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticketsup-32@ticketsup');
+                print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticketsup');
 
                 /*
                 * Search bar
@@ -407,8 +416,8 @@ if ($action == "view_ticketlist") {
                     print_liste_field_titre($arrayfields['t.tms']['label'], $url_page_current, 't.tms', '', $param, '', $sortfield, $sortorder);
                 }
                 // Extra fields
-                if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
-                    foreach ($extrafields->attribute_label as $key => $val) {
+                if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+                	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
                         if (!empty($arrayfields["ef." . $key]['checked'])) {
                             $align = $extrafields->getAlignFlag($key);
                             print_liste_field_titre($extralabels[$key], $url_page_current, "ef." . $key, "", $param, ($align ? 'align="' . $align . '"' : ''), $sortfield, $sortorder);
@@ -442,9 +451,9 @@ if ($action == "view_ticketlist") {
 
                 // Status
                 if (!empty($arrayfields['t.fk_statut']['checked'])) {
-                    print '<td>';
+                    print '<td class="liste_titre">';
                     $selected = ($search_fk_status != "non_closed" ? $search_fk_status : '');
-                    $object->printSelectStatus($selected);
+                    //$object->printSelectStatus($selected);
                     print '</td>';
                 }
 
@@ -489,24 +498,23 @@ if ($action == "view_ticketlist") {
                 }
 
                 // Extra fields
-                if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
-                    foreach ($extrafields->attribute_label as $key => $val) {
+                if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+                	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
                         if (!empty($arrayfields["ef." . $key]['checked'])) {
                             print '<td class="liste_titre"></td>';
                         }
                     }
                 }
 
-                print '<td class="liste_titre" align="right">';
+                print '<td class="liste_titre nowraponall" align="right">';
                 print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
                 print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
                 print '</td>';
                 print '</tr>';
 
-                $var = true;
-                while ($obj = $db->fetch_object($resql)) {
-                    $var = !$var;
-                    print "<tr " . $bc[$var] . ">";
+                while ($obj = $db->fetch_object($resql))
+                {
+                    print '<tr class="oddeven">';
 
                     // Date ticket
                     if (!empty($arrayfields['t.datec']['checked'])) {
@@ -582,11 +590,11 @@ if ($action == "view_ticketlist") {
                     // Message author
                     if (!empty($arrayfields['t.fk_user_create']['checked'])) {
                         print '<td>';
-                        if ($obj->fk_user_create) {
+                        if ($obj->fk_user_create > 0) {
                             $user_create->firstname = (!empty($obj->user_create_firstname) ? $obj->user_create_firstname : '');
                             $user_create->name = (!empty($obj->user_create_lastname) ? $obj->user_create_lastname : '');
                             $user_create->id = (!empty($obj->fk_user_create) ? $obj->fk_user_create : '');
-                            print $user_create->getFullName();
+                            print $user_create->getFullName($langs);
                         } else {
                             print $langs->trans('Email');
                         }
@@ -596,11 +604,11 @@ if ($action == "view_ticketlist") {
                     // Assigned author
                     if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
                         print '<td>';
-                        if ($obj->fk_user_assign) {
+                        if ($obj->fk_user_assig > 0) {
                             $user_assign->firstname = (!empty($obj->user_assign_firstname) ? $obj->user_assign_firstname : '');
                             $user_assign->lastname = (!empty($obj->user_assign_lastname) ? $obj->user_assign_lastname : '');
                             $user_assign->id = (!empty($obj->fk_user_assign) ? $obj->fk_user_assign : '');
-                            print $user_assign->getFullName();
+                            print $user_assign->getFullName($langs);
                         } else {
                             print $langs->trans('None');
                         }
@@ -612,8 +620,8 @@ if ($action == "view_ticketlist") {
                     }
 
                     // Extra fields
-                    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
-                        foreach ($extrafields->attribute_label as $key => $val) {
+                    if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+                    	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
                             if (!empty($arrayfields["ef." . $key]['checked'])) {
                                 print '<td';
                                 $align = $extrafields->getAlignFlag($key);
@@ -635,7 +643,7 @@ if ($action == "view_ticketlist") {
                 print '</table>';
                 print '</form>';
 
-                print '<form method="post" id="form_view_ticket" name="form_view_ticket" enctype="multipart/form-data" action="' . dol_buildpath('/ticketsup/public/view.php', 1) . '" style="display:none;">';
+                print '<form method="post" id="form_view_ticket" name="form_view_ticket" enctype="multipart/form-data" action="' . dol_buildpath('/public/ticketsup/view.php', 1) . '" style="display:none;">';
                 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
                 print '<input type="hidden" name="action" value="view_ticket">';
                 print '<input type="hidden" name="btn_view_ticket_list" value="1">';
diff --git a/htdocs/public/ticketsup/view.php b/htdocs/public/ticketsup/view.php
index c0069d9f6ee..5f039d87ea5 100644
--- a/htdocs/public/ticketsup/view.php
+++ b/htdocs/public/ticketsup/view.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *       \file       ticketsup/public/index.php
+ *       \file       htdocs/public/ticketsup/index.php
  *       \ingroup    ticketsup
  *       \brief      Public file to add and manage ticket
  */
@@ -36,13 +36,11 @@ if (!defined("NOLOGIN")) {
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/actions_ticketsup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/html.formticketsup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticketsup/lib/ticketsup.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticketsup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ticketsup.lib.php';
 
 // Load traductions files requiredby by page
-$langs->load("companies");
-$langs->load("other");
-$langs->load("ticketsup");
+$langs->loadLangs(array("companies","other","ticketsup"));
 
 // Get parameters
 $track_id = GETPOST('track_id', 'alpha');
@@ -58,6 +56,11 @@ if (isset($_SESSION['email_customer'])) {
 
 $object = new ActionsTicketsup($db);
 
+
+/*
+ * Actions
+ */
+
 if ($action == "view_ticket" || $action == "add_message" || $action == "close" || $action == "confirm_public_close" || $action == "new_public_message") {
     $error = 0;
     $display_ticket = false;
@@ -80,7 +83,7 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
     }
 
     if (!$error) {
-        $ret = $object->fetch('', $track_id);
+        $ret = $object->fetch('', '', $track_id);
         if ($ret && $object->dao->id > 0) {
             // vérifie si l'adresse email est bien dans les contacts du ticket
             $contacts = $object->dao->liste_contact(-1, 'external');
@@ -116,16 +119,18 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
 }
 $object->doActions($action);
 
-/***************************************************
- * VIEW
- *
- ****************************************************/
+
+
+/*
+ * View
+ */
 
 $form = new Form($db);
 $formticket = new FormTicketsup($db);
 
 $arrayofjs = array();
-$arrayofcss = array('/ticketsup/css/styles.css', '/ticketsup/css/bg.css.php');
+$arrayofcss = array('/ticketsup/css/styles.css.php');
+
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 if (!$conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) {
@@ -151,17 +156,17 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
         print '<table class="border" style="width:100%">';
 
         // Ref
-        print '<tr><td style="width:40%">' . $langs->trans("Ref") . '</td><td>';
+        print '<tr><td class="titlefield">' . $langs->trans("Ref") . '</td><td>';
         print $object->dao->ref;
         print '</td></tr>';
 
         // Tracking ID
-        print '<tr><td style="width:40%">' . $langs->trans("TicketTrackId") . '</td><td>';
+        print '<tr><td>' . $langs->trans("TicketTrackId") . '</td><td>';
         print $object->dao->track_id;
         print '</td></tr>';
 
         // Subject
-        print '<tr><td><strong>' . $langs->trans("Subject") . '</strong></td><td>';
+        print '<tr><td>' . $langs->trans("Subject") . '</td><td>';
         print $object->dao->subject;
         print '</td></tr>';
 
@@ -218,7 +223,7 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
         }
 
         // User assigned
-        print '<tr><td>' . $langs->trans("UserAssignedTo") . '</td><td>';
+        print '<tr><td>' . $langs->trans("AssignedTo") . '</td><td>';
         if ($object->dao->fk_user_assign > 0) {
             $fuser = new User($db);
             $fuser->fetch($object->dao->fk_user_assign);
@@ -253,7 +258,7 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
             $formticket->withfile = 2;
             $formticket->showMessageForm('100%');
         } else {
-            print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" enctype="multipart/form-data" action="' . dol_buildpath('/ticketsup/public/list.php', 1) . '">';
+            print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" enctype="multipart/form-data" action="' . dol_buildpath('/public/ticketsup/list.php', 1) . '">';
             print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
             print '<input type="hidden" name="action" value="view_ticketlist">';
             print '<input type="hidden" name="track_id" value="'.$object->dao->track_id.'">';
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 0558268913d..795dffeb4ea 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -22,12 +22,12 @@
  *		\author	    Laurent Destailleur
  */
 
-define('NOTOKENRENEWAL',1); // Disables token renewal
-define("NOLOGIN",1);
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+if (! defined('NOLOGIN'))        define("NOLOGIN",1);
+if (! defined('NOCSRFCHECK'))    define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 
 /**
  * Header empty
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index 694eaaf344f..36e93d00faf 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -21,12 +21,12 @@
  *		\brief      Page to output style page. Called with <link rel="stylesheet" href="styles.css.php?websiteid=123" type="text/css" />
  */
 
-define('NOTOKENRENEWAL',1); // Disables token renewal
-define("NOLOGIN",1);
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+if (! defined('NOLOGIN'))        define("NOLOGIN",1);
+if (! defined('NOCSRFCHECK'))    define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 
 /**
  * Header empty
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 6e3d1896a71..afdc26db622 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -285,7 +285,7 @@ if ($action == 'create' || $object->fetch($id) > 0)
 		$parameters=array('objectsrc' => $objectsrc);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 7db33a9bfae..7c3999db7c9 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -119,23 +119,15 @@ class Dolresource extends CommonObject
     	{
     		$action='create';
 
-    		// Actions on extra fields (by external module or standard code)
-    		// 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
-    		if (empty($reshook))
-    		{
-    			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-    			{
-    				$result=$this->insertExtraFields();
-    				if ($result < 0)
-    				{
-    					$error++;
-    				}
-    			}
+    		// Actions on extra fields
+   			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+   			{
+   				$result=$this->insertExtraFields();
+   				if ($result < 0)
+   				{
+   					$error++;
+   				}
     		}
-    		else if ($reshook < 0) $error++;
     	}
 
     	if (! $error)
@@ -305,23 +297,15 @@ class Dolresource extends CommonObject
 		{
 			$action='update';
 
-			// Actions on extra fields (by external module or standard code)
-			// 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
-			if (empty($reshook))
+			// Actions on extra fields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 		}
 
 		// Commit or rollback
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 64ac151fede..43b5a852b10 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -125,7 +125,7 @@ if ($object->id)
 	print '</tr>';
 
     print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
     print '</table>';
 
     print '</div>';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 927975e9c26..a49d8b6030e 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -199,7 +199,9 @@ if($ret == -1) {
 	$newcardbutton='';
 	if ($user->rights->resource->write)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans('MenuResourceAdd').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans('MenuResourceAdd');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret+1, $nbtotalofrecords,'title_generic.png', 0, $newcardbutton, '', $limit);
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 7866ffbf0be..ecbefe2cb1d 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -263,6 +263,20 @@ if ($action == 'sethideinactivethirdparty')
 		dol_print_error($db);
 	}
 }
+if($action=='setonsearchandlistgooncustomerorsuppliercard'){
+       $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value','int');
+       $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard,'yesno',0,'',$conf->entity);
+       if (! $res > 0) $error++;
+       if (! $error)
+       {
+               setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+       }
+       else
+       {
+               setEventMessages($langs->trans("Error"), null, 'errors');
+       }
+}
+
 
 /*
  * 	View
@@ -775,6 +789,24 @@ else
 print '</a></td>';
 print '</tr>';
 
+/*print '<tr class="oddeven">';
+print '<td width="80%">'.$langs->trans("OnSearchAndListGoOnCustomerOrSupplierCard").'</td>';
+print '<td>&nbsp</td>';
+print '<td align="center">';
+if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD))
+{
+       print '<a href="'.$_SERVER['PHP_SELF'].'?action=setonsearchandlistgooncustomerorsuppliercard&value=0">';
+       print img_picto($langs->trans("Activated"),'switch_on');
+
+}
+else
+{
+       print '<a href="'.$_SERVER['PHP_SELF'].'?action=setonsearchandlistgooncustomerorsuppliercard&value=1">';
+       print img_picto($langs->trans("Disabled"),'switch_off');
+}
+print '</a></td>';
+print '</tr>';
+*/
 
 /*
 // COMPANY_USE_SEARCH_TO_SELECT
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index c286ec7e6f7..f992206ef23 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -159,12 +159,14 @@ if ($socid > 0)
 	//print '</div>';
 
 
-	$buttoncreate='';
+	$newcardbutton='';
     if (! empty($conf->agenda->enabled))
     {
     	if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
     	{
-        	$buttoncreate.='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+        	$newcardbutton.='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction");
+        	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        	$newcardbutton.= '</a>';
     	}
     }
 
@@ -176,8 +178,8 @@ if ($socid > 0)
         if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
         if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 
-		print load_fiche_titre($langs->trans("ActionsOnCompany"), $buttoncreate, '');
-        //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $buttoncreate, '', 0, 1, 1);
+		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
+        //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
 
         // List of all actions
 		$filters=array();
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index bc16a30d7da..4bbc5807166 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -56,7 +56,7 @@ $mesg=''; $error=0; $errors=array();
 $action		= (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view');
 $cancel		= GETPOST('cancel','alpha');
 $backtopage	= GETPOST('backtopage','alpha');
-$confirm		= GETPOST('confirm');
+$confirm	= GETPOST('confirm','alpha');
 
 $socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
 if ($user->societe_id) $socid=$user->societe_id;
@@ -1399,7 +1399,7 @@ else
 			$langs->load('categories');
 
 			// Customer
-			if ($object->prospect || $object->client) {
+			if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
 				print '<tr><td class="toptd">' . fieldLabel('CustomersCategoriesShort', 'custcats') . '</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
 				print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null,
@@ -1431,7 +1431,7 @@ else
         $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        if (empty($reshook))
         {
         	print $object->showOptionals($extrafields,'edit');
         }
@@ -1949,7 +1949,9 @@ else
 
             // Capital
             print '<tr><td>'.fieldLabel('Capital','capital').'</td>';
-	        print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+	        print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
+	        print dol_escape_htmltag(price($object->capital));
+	        print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
 
 			// Assign a Name
             print '<tr>';
@@ -1974,7 +1976,7 @@ else
 			if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 			{
 				// Customer
-				if ($object->prospect || $object->client) {
+				if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
 					print '<tr><td>' . fieldLabel('CustomersCategoriesShort', 'custcats') . '</td>';
 					print '<td colspan="3">';
 					$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, null, null, null, 1);
@@ -2018,7 +2020,7 @@ else
             $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            if (empty($reshook))
             {
             	print $object->showOptionals($extrafields,'edit');
             }
@@ -2368,7 +2370,7 @@ else
 		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 		{
 			// Customer
-			if ($object->prospect || $object->client) {
+			if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
 				print '<tr><td>' . $langs->trans("CustomersCategoriesShort") . '</td>';
 				print '<td>';
 				print $form->showCategories($object->id, 'customer', 1);
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 3270bc144c2..508fe892ebe 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -194,7 +194,7 @@ class Contacts extends DolibarrApi
 	 * @param   array   $request_data   Request datas
 	 * @return  int     ID of contact
 	 */
-	function post($request_data = NULL) {
+	function post($request_data = null) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
 			throw new RestException(401, 'No permission to create/update contacts');
@@ -219,7 +219,7 @@ class Contacts extends DolibarrApi
 	 * @param array $request_data   Datas
 	 * @return int
 	 */
-	function put($id, $request_data = NULL) {
+	function put($id, $request_data = null) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
 			throw new RestException(401, 'No permission to create/update contacts');
@@ -282,7 +282,7 @@ class Contacts extends DolibarrApi
 	 *
 	 * @url	POST {id}/createUser
 	 */
-	function createUser($id, $request_data = NULL) {
+	function createUser($id, $request_data = null) {
 	    //if (!DolibarrApiAccess::$user->rights->user->user->creer) {
 	    //throw new RestException(401);
 	    //}
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 1cdfabf7fca..73c782ddf7c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -199,7 +199,7 @@ class Thirdparties extends DolibarrApi
 	 * @param array $request_data   Request datas
 	 * @return int  ID of thirdparty
 	 */
-	function post($request_data = NULL)
+	function post($request_data = null)
 	{
 		if(! DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -223,7 +223,7 @@ class Thirdparties extends DolibarrApi
 	 * @param array $request_data   Datas
 	 * @return int
 	 */
-	function put($id, $request_data = NULL)
+	function put($id, $request_data = null)
 	{
 		if(! DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 6db71eb4218..59eea72c2c7 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -29,9 +29,9 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
  */
 class Client extends Societe
 {
-    var $next_prev_filter="te.client in (1,2,3)";	// Used to add a filter in Form::showrefnav method
+    public $next_prev_filter="te.client in (1,2,3)";	// Used to add a filter in Form::showrefnav method
 
-    var $cacheprospectstatus=array();
+    public $cacheprospectstatus=array();
 
 
 	/**
@@ -42,6 +42,9 @@ class Client extends Societe
     function __construct($db)
     {
         $this->db = $db;
+
+        $this->client = 3;
+        $this->fournisseur = 0;
     }
 
     /**
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 6a6dfa4d38c..4403d5b8fde 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -268,8 +268,9 @@ class CompanyPaymentMode extends CommonObject
 	 */
 	public function fetch($id, $ref = null, $socid = 0, $type = '')
 	{
-		if ($socid) $sql.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
-		if ($type)  $sql.= " AND type = '".$this->db->escape($type)."'";
+		$morewhere = '';
+		if ($socid) $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
+		if ($type)  $morewhere.= " AND type = '".$this->db->escape($type)."'";
 
 		$result = $this->fetchCommon($id, $ref, $morewhere);
 		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 62cb8956169..32f29522268 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -107,22 +107,22 @@ class Societe extends CommonObject
 	 * Thirdparty status : 0=activity ceased, 1= in activity
 	 * @var int
 	 */
-	var $status;
+	public $status=1;
 
 	/**
 	 * Id of department
 	 * @var int
 	 */
-	var $state_id;
-	var $state_code;
-	var $state;
+	public $state_id;
+	public $state_code;
+	public $state;
 
 	/**
 	 * Id of region
 	 * @var int
 	 */
-	var $region_code;
-	var $region;
+	public $region_code;
+	public $region;
 
 	/**
 	 * State code
@@ -130,54 +130,54 @@ class Societe extends CommonObject
 	 * @deprecated Use state_code instead
 	 * @see state_code
 	 */
-	var $departement_code;
+	public $departement_code;
 
 	/**
 	 * @var string
 	 * @deprecated Use state instead
 	 * @see state
 	 */
-	var $departement;
+	public $departement;
 
 	/**
 	 * @var string
 	 * @deprecated Use country instead
 	 * @see country
 	 */
-	var $pays;
+	public $pays;
 
 	/**
 	 * Phone number
 	 * @var string
 	 */
-	var $phone;
+	public $phone;
 	/**
 	 * Fax number
 	 * @var string
 	 */
-	var $fax;
+	public $fax;
 	/**
 	 * Email
 	 * @var string
 	 */
-	var $email;
+	public $email;
 	/**
 	 * Skype username
 	 * @var string
 	 */
-	var $skype;
+	public $skype;
 	/**
 	 * Webpage
 	 * @var string
 	 */
-	var $url;
+	public $url;
 
 	//! barcode
 	/**
 	 * Barcode value
 	 * @var string
 	 */
-	var $barcode;
+	public $barcode;
 
 	// 6 professional id (usage depends on country)
 
@@ -185,68 +185,68 @@ class Societe extends CommonObject
 	 * Professional ID 1 (Ex: Siren in France)
 	 * @var string
 	 */
-	var $idprof1;
+	public $idprof1;
 
 	/**
 	 * Professional ID 2 (Ex: Siret in France)
 	 * @var string
 	 */
-	var $idprof2;
+	public $idprof2;
 
 	/**
 	 * Professional ID 3 (Ex: Ape in France)
 	 * @var string
 	 */
-	var $idprof3;
+	public $idprof3;
 
 	/**
 	 * Professional ID 4 (Ex: RCS in France)
 	 * @var string
 	 */
-	var $idprof4;
+	public $idprof4;
 
 	/**
 	 * Professional ID 5
 	 * @var string
 	 */
-	var $idprof5;
+	public $idprof5;
 
 	/**
 	 * Professional ID 6
 	 * @var string
 	 */
-	var $idprof6;
+	public $idprof6;
 
-	var $prefix_comm;
+	public $prefix_comm;
 
-	var $tva_assuj;
+	public $tva_assuj=1;
 	/**
 	 * Intracommunitary VAT ID
 	 * @var string
 	 */
-	var $tva_intra;
+	public $tva_intra;
 
 	// Local taxes
-	var $localtax1_assuj;
-	var $localtax1_value;
-	var $localtax2_assuj;
-	var $localtax2_value;
+	public $localtax1_assuj;
+	public $localtax1_value;
+	public $localtax2_assuj;
+	public $localtax2_value;
 
-	var $managers;
-	var $capital;
-	var $typent_id;
-	var $typent_code;
-	var $effectif;
-	var $effectif_id;
-	var $forme_juridique_code;
-	var $forme_juridique;
+	public $managers;
+	public $capital;
+	public $typent_id=0;
+	public $typent_code;
+	public $effectif;
+	public $effectif_id=0;
+	public $forme_juridique_code;
+	public $forme_juridique=0;
 
-	var $remise_percent;
-	var $remise_supplier_percent;
-	var $mode_reglement_supplier_id;
-	var $cond_reglement_supplier_id;
-	var $fk_prospectlevel;
-	var $name_bis;
+	public $remise_percent;
+	public $remise_supplier_percent;
+	public $mode_reglement_supplier_id;
+	public $cond_reglement_supplier_id;
+	public $fk_prospectlevel;
+	public $name_bis;
 
 	//Log data
 
@@ -254,127 +254,127 @@ class Societe extends CommonObject
 	 * Date of last update
 	 * @var string
 	 */
-	var $date_modification;
+	public $date_modification;
 	/**
 	 * User that made last update
 	 * @var string
 	 */
-	var $user_modification;
+	public $user_modification;
 	/**
 	 * Date of creation
 	 * @var string
 	 */
-	var $date_creation;
+	public $date_creation;
 	/**
 	 * User that created the thirdparty
 	 * @var User
 	 */
-	var $user_creation;
+	public $user_creation;
 
 
-	var $specimen;
+	public $specimen;
 
 	/**
 	 * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
 	 * @var int
 	 */
-	var $client;
+	public $client=0;
 	/**
 	 * 0=no prospect, 1=prospect
 	 * @var int
 	 */
-	var $prospect;
+	public $prospect=0;
 	/**
 	 * 0=no supplier, 1=supplier
 	 * @var int
 	 */
-	var $fournisseur;
+	public $fournisseur;
 
 	/**
 	 * Client code. E.g: CU2014-003
 	 * @var string
 	 */
-	var $code_client;
+	public $code_client;
 
 	/**
 	 * Supplier code. E.g: SU2014-003
 	 * @var string
 	 */
-	var $code_fournisseur;
+	public $code_fournisseur;
 
 	/**
 	 * Accounting code for client
 	 * @var string
 	 */
-	var $code_compta;
+	public $code_compta;
 
 	/**
 	 * Accounting code for suppliers
 	 * @var string
 	 */
-	var $code_compta_fournisseur;
+	public $code_compta_fournisseur;
 
 	/**
 	 * @var string
 	 * @deprecated Note is split in public and private notes
 	 * @see note_public, note_private
 	 */
-	var $note;
+	public $note;
 
 	/**
 	 * Private note
 	 * @var string
 	 */
-	var $note_private;
+	public $note_private;
 
 	/**
 	 * Public note
 	 * @var string
 	 */
-	var $note_public;
+	public $note_public;
 
 	//! code statut prospect
-	var $stcomm_id;
-	var $statut_commercial;
+	public $stcomm_id;
+	public $statut_commercial;
 
 	/**
 	 * Assigned price level
 	 * @var int
 	 */
-	var $price_level;
-	var $outstanding_limit;
+	public $price_level;
+	public $outstanding_limit;
 
 	/**
 	 * Min order amounts
 	 */
-	var $order_min_amount;
-	var $supplier_order_min_amount;
+	public $order_min_amount;
+	public $supplier_order_min_amount;
 
 	/**
 	 * Id of sales representative to link (used for thirdparty creation). Not filled by a fetch, because we can have several sales representatives.
 	 * @var int
 	 */
-	var $commercial_id;
+	public $commercial_id;
 	/**
 	 * Id of parent thirdparty (if one)
 	 * @var int
 	 */
-	var $parent;
+	public $parent;
 	/**
 	 * Default language code of thirdparty (en_US, ...)
 	 * @var string
 	 */
-	var $default_lang;
+	public $default_lang;
 
-	var $ref;
-	var $ref_int;
+	public $ref;
+	public $ref_int;
 	/**
 	 * External user reference.
 	 * This is to allow external systems to store their id and make self-developed synchronizing functions easier to
 	 * build.
 	 * @var string
 	 */
-	var $ref_ext;
+	public $ref_ext;
 
 	/**
 	 * Import key.
@@ -382,45 +382,39 @@ class Societe extends CommonObject
 	 * to an import process
 	 * @var string
 	 */
-	var $import_key;
+	public $import_key;
 
 	/**
 	 * Supplier WebServices URL
 	 * @var string
 	 */
-	var $webservices_url;
+	public $webservices_url;
 
 	/**
 	 * Supplier WebServices Key
 	 * @var string
 	 */
-	var $webservices_key;
+	public $webservices_key;
 
-	var $logo;
-	var $logo_small;
-	var $logo_mini;
+	public $logo;
+	public $logo_small;
+	public $logo_mini;
 
-	var $array_options;
+	public $array_options;
 
 	// Incoterms
-	var $fk_incoterms;
-	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
+	public $fk_incoterms;
+	public $location_incoterms;
+	public $libelle_incoterms;  //Used into tooltip
 
 	// Multicurrency
-	var $fk_multicurrency;
-	var $multicurrency_code;
+	public $fk_multicurrency;
+	public $multicurrency_code;
 
 
 	// END MODULEBUILDER PROPERTIES
 
 
-	/**
-	 * To contains a clone of this when we need to save old properties of object
-	 *  @var Societe
-	 */
-	var $oldcopy;
-
 	/**
 	 *    Constructor
 	 *
@@ -961,7 +955,7 @@ class Societe extends CommonObject
 			$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
 			if (isset($this->stcomm_id))
 			{
-				$sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
+				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id)  ? $this->stcomm_id : "0");
 			}
 			$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
 
@@ -1056,23 +1050,15 @@ class Societe extends CommonObject
 
 				$action='update';
 
-				// Actions on extra fields (by external module or standard code)
-				// TODO le hook fait double emploi avec le trigger !!
-				$hookmanager->initHooks(array('thirdpartydao'));
-				$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))
+				// Actions on extra fields
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					$result=$this->insertExtraFields();
+					if ($result < 0)
 					{
-						$result=$this->insertExtraFields();
-						if ($result < 0)
-						{
-							$error++;
-						}
+						$error++;
 					}
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error && $call_trigger)
 				{
@@ -1981,6 +1967,13 @@ class Societe extends CommonObject
 
 		$name=$this->name?$this->name:$this->nom;
 
+		if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
+
+             if(empty($option) && $this->client > 0) $option = 'customer';
+             if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
+         }
+
+
 		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
 		{
 			if (($this->client) && (! empty ( $this->code_client ))
@@ -2407,7 +2400,7 @@ class Societe extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
+				if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
 				else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
 			}
 			return $contact_property;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 1a6a4be6199..0d13c45e5bd 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -39,7 +39,7 @@ $object = new Societe($db);
 if ($socid > 0) $object->fetch($socid);
 
 // Sort & Order fields
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 2cab1da971f..e393fa64a2c 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -150,7 +150,7 @@ if ($object->id)
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 	// Total size
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 	print '</table>';
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 448f526df4a..58043bc511c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -485,6 +485,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -504,6 +509,17 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
+	if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
+              if( $obj->client > 0) {
+                       header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
+                       exit;
+               }
+               if( $obj->fournisseur > 0){
+                       header("Location: ".DOL_URL_ROOT.'/fourn/card.php?socid='.$id);
+                       exit;
+               }
+       }
+
 	header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
 	exit;
 }
@@ -583,7 +599,9 @@ if ($user->rights->societe->creer)
 		if($type == 'f') $label='NewSupplier';
 	}
 
-	$newcardbutton = '<a class="butAction" href="'.DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter.'">'.$langs->trans($label).'</a>';
+	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter.'">'.$langs->trans($label);
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 31622c1b9d9..cd8212ae327 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -432,6 +432,11 @@ if ($result > 0)
     {
         $result = $db->query($sql);
         $nbtotalofrecords = $db->num_rows($result);
+        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+        {
+        	$page = 0;
+        	$offset = 0;
+        }
     }
 
     $sql.= $db->plimit($limit+1, $offset);
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index 1a46f62d202..3326e431178 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -85,13 +85,11 @@ if ($result)
 	print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
 	print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
 	print "</tr>\n";
-	$var=True;
+
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
 
-
-
 		print '<tr class="oddeven">';
 		print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
 		print "<td>".dolGetFirstLastname($obj->firstname, $obj->lastname)."</td>\n";
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index a63d55c5e8f..0baffe090d2 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -469,8 +469,8 @@ if (empty($reshook))
 			'use_companybankid'=>GETPOST('companybankid'),
 			'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
 		);
-		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid'));
-		$_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid'));
+		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid','int'), 'alpha');
+		$_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid','int'), 'alpha');
 	}
 
 	$id = $socid;
@@ -784,6 +784,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print '</table>';
 	print '</div>';
 
+	dol_fiche_end();
+
 	print '<br>';
 
 	// List of Stripe payment modes
@@ -792,7 +794,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$morehtmlright='';
 		if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
 		{
-			$morehtmlright='<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard">'.$langs->trans("Add").'</a>';
+			$morehtmlright='<a class="butActionNew" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard">'.$langs->trans("Add").' <span class="fa fa-plus-circle valignmiddle"></span></a>';
 		}
 		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc?' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, '');
 
@@ -1041,12 +1043,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	// List of bank accounts
 	print '<br>';
 
-	$morehtmlright='<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
+	$morehtmlright='<a class="butActionNew" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").' <span class="fa fa-plus-circle valignmiddle"></span></a>';
 
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, '');
 
 	$rib_list = $object->get_all_rib();
-	$var = false;
 	if (is_array($rib_list))
 	{
 		print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -1235,11 +1236,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		dol_print_error($db);
 	}
 
-	dol_fiche_end();
-
 
 	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
 	{
+		print '<br>';
+
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
@@ -1251,10 +1252,26 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$genallowed=$user->rights->societe->lire;
 		$delallowed=$user->rights->societe->creer;
 
-		$var=true;
-
 		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
 
+		// Show direct download link
+		if (! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))
+		{
+			$companybankaccounttemp = new CompanyBankAccount($db);
+			$companypaymentmodetemp = new CompanyPaymentMode($db);
+			$result = $companypaymentmodetemp->fetch(0, null, $object->id, 'ban');
+
+			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+			$ecmfile = new EcmFiles($db);
+			$result = $ecmfile->fetch(0, '', '', '', '', $companybankaccounttemp->table_element, $companypaymentmodetemp->id);
+			if ($result > 0)
+			{
+				$companybankaccounttemp->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
+				print '<br><!-- Link to download main doc -->'."\n";
+				print showDirectDownloadLink($companybankaccounttemp).'<br>';
+			}
+		}
+
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index fc864bd5e01..e35cf186ae3 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -235,7 +235,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 	$sortfield = GETPOST("sortfield", 'alpha');
 	$sortorder = GETPOST("sortorder", 'alpha');
-    $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+    $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 	$page = GETPOST("page", 'int');
 	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 	$offset = $limit * $page;
@@ -452,11 +452,9 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 
-			$var = True;
-
 			foreach ( $prodcustprice->lines as $line ) {
 
-				print '<tr'. $bc[$var].'>';
+				print '<tr class="oddeven">';
 				$staticprod = new Product($db);
 				$staticprod->fetch($line->fk_product);
 
@@ -558,11 +556,9 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
         if (count($prodcustprice->lines) > 0)
         {
-            $var = False;
-
             foreach ($prodcustprice->lines as $line)
             {
-                print "<tr " . $bc[$var] . ">";
+                print '<tr class="oddeven">';
 
                 $staticprod = new Product($db);
                 $staticprod->fetch($line->fk_product);
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 6b3e833abb0..dfe78041f8a 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -253,7 +253,6 @@ if ($id > 0 || ! empty($ref))
 					print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
 					print "</tr>\n";
 
-					$var=True;
 					$i=0;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
@@ -269,7 +268,6 @@ if ($id > 0 || ! empty($ref))
 
 						$companyname=$objp->company;
 
-
 						print '<tr class="oddeven">';
 
 						// Ref
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 1f3e69a674c..97b31e09010 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2007      Patrick Raguin  		<patrick.raguin@gmail.com>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2018      Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -220,12 +221,16 @@ print '</div>';
 
 dol_fiche_end();
 
-$morehtmlcenter = '';
+$newcardbutton = '';
 if (! empty($conf->website->enabled)) {
 	if (! empty($user->rights->societe->lire)) {
-		$morehtmlcenter .= '<a class="butAction" href="' . DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">' . $langs->trans("AddWebsiteAccount") . '</a>';
+		$newcardbutton .= '<a class="butActionNew" href="' . DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">' . $langs->trans("AddWebsiteAccount");
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	} else {
-		$morehtmlcenter .= '<a class="butActionRefused" href="#">' . $langs->trans("AddAction") . '</a>';
+		$newcardbutton .= '<a class="butActionNewRefused" href="#">' . $langs->trans("AddAction");
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 }
 
@@ -287,6 +292,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -322,7 +332,7 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="id" value="'.$id.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $morehtmlcenter, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
 
 $topicmail="Information";
 $modelmail="websiteaccount";
@@ -401,7 +411,7 @@ foreach($objectwebsiteaccount->fields as $key => $val)
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index a60d608c0de..62ca1000822 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -46,9 +46,7 @@ $action = GETPOST('action','alpha');
 if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
-	$result = dolibarr_set_const($db, "STRIPE_LIVE", GETPOST('STRIPE_LIVE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+
 	if (empty($conf->stripeconnect->enabled)) {
 		$result = dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY", GETPOST('STRIPE_TEST_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
 		if (! $result > 0)
@@ -78,6 +76,9 @@ if ($action == 'setvalue' && $user->admin)
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0)
 		$error ++;
+  $result = dolibarr_set_const($db, "STRIPE_MINIMAL_3DSECURE", GETPOST('STRIPE_MINIMAL_3DSECURE', 'int'), 'chaine', 0, '', $conf->entity);
+	if (! $result > 0)
+		$error ++;  
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0)
 		$error ++;
@@ -97,6 +98,7 @@ if ($action == 'setvalue' && $user->admin)
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_WAREHOUSE", (GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') > 0 ? GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0)
 		$error ++;
+
 	// Payment token for URL
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0)
@@ -265,6 +267,11 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
 	print '</td></tr>';
 }
 
+// Minimal amount for force 3Dsecure if it's optionnal
+print '<tr class="oddeven"><td>';
+print $langs->trans("STRIPE_MINIMAL_3DSECURE").'</td><td>';
+print '<input class="flat" name="STRIPE_MINIMAL_3DSECURE" size="3" value="' .$conf->global->STRIPE_MINIMAL_3DSECURE . '">'.$langs->getCurrencySymbol($conf->currency).'</td></tr>';
+
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
 {
 	// Stock for automatic decrement
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 39a3c3bb28b..90779d24962 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -38,7 +38,7 @@ $socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $rowid = GETPOST("rowid",'alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 6ed703d7a92..3b53b4572f0 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -217,7 +217,7 @@ class Stripe extends CommonObject
 		//$sql.= " AND sa.entity IN (".getEntity('societe').")";
 		$sql.= " AND sa.type = 'card'";
 
-		dol_syslog(get_class($this) . "::fetch search stripe card id for paymentmode id=".$object->id, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::fetch search stripe card id for paymentmode id=".$object->id.", stripeacc=".$stripeacc, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -225,13 +225,15 @@ class Stripe extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 				$cardref = $obj->stripe_card_ref;
+				dol_syslog("*************".$cardref);
 				if ($cardref)
 				{
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
 							$card = $cu->sources->retrieve($cardref);
 						} else {
-							$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));
+							//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
+							$card = $cu->sources->retrieve($cardref);
 						}
 					}
 					catch(Exception $e)
@@ -334,10 +336,10 @@ class Stripe extends CommonObject
 				$obj = $this->db->fetch_object($result);
 				$key = $obj->fk_soc;
 			} else {
-				$key = NULL;
+				$key = null;
 			}
 		} else {
-			$key = NULL;
+			$key = null;
 		}
 
 		$arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php
index 4eeae97ee71..68a695e2f33 100644
--- a/htdocs/stripe/payment.php
+++ b/htdocs/stripe/payment.php
@@ -32,6 +32,7 @@
 // Load Dolibarr environment
 $res=@include("../main.inc.php");                                // For root directory
 if (! $res) $res=@include("../../main.inc.php");
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -240,42 +241,43 @@ if (empty($reshook))
 	if ($action == 'confirm_paiement' && $confirm == 'yes')
 	{
 
-  	    $error=0;
+		$error=0;
 
-	    $datepaye = dol_now();
+		$datepaye = dol_now();
 
-	    $db->begin();
+		$db->begin();
 
-	    // Clean parameters amount if payment is for a credit note
-	    if (GETPOST('type') == 2)
-	    {
-		    foreach ($amounts as $key => $value)	// How payment is dispatch
-		    {
-		    	$newvalue = price2num($value,'MT');
-		    	$amounts[$key] = -$newvalue;
-		    }
+		// Clean parameters amount if payment is for a credit note
+		if (GETPOST('type') == 2)
+		{
+			foreach ($amounts as $key => $value)	// How payment is dispatch
+			{
+				$newvalue = price2num($value,'MT');
+				$amounts[$key] = -$newvalue;
+			}
 
 			foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatch
-		    {
-		    	$newvalue = price2num($value,'MT');
-		    	$multicurrency_amounts[$key] = -$newvalue;
-		    }
-	    }
+			{
+				$newvalue = price2num($value,'MT');
+				$multicurrency_amounts[$key] = -$newvalue;
+			}
+		}
 
-	    if (! empty($conf->banque->enabled))
-	    {
-	    	// Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
-	    	if (GETPOST('accountid') <= 0)
-	    	{
-	    		setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
-	    		$error++;
-	    	}
-	    }
-$facture = new Facture($db);
-$facture->fetch($facid);
-$facture->fetch_thirdparty();
+		if (! empty($conf->banque->enabled))
+		{
+			// Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
+			if (GETPOST('accountid') <= 0)
+			{
+				setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
+				$error++;
+			}
+		}
 
- $error = 0;
+		$facture = new Facture($db);
+		$facture->fetch($facid);
+		$facture->fetch_thirdparty();
+
+		$error = 0;
 
 		if (is_object($stripe) && $stripeacc)
 		{
@@ -286,56 +288,59 @@ $facture->fetch_thirdparty();
 			}
 		}
 
-$stripeamount=0;
-		    foreach ($amounts as $key => $value)	// How payment is dispatch
-		    {
-$stripeamount+=price2num($value,'MT');
-}
+		$stripeamount=0;
+		foreach ($amounts as $key => $value)	// How payment is dispatch
+		{
+			$stripeamount+=price2num($value,'MT');
+		}
 
-if (preg_match('/acct_/i',$source))
-{
-$paiementcode ="VIR";
-}
-elseif (preg_match('/card_/i',$source))
-{
-$paiementcode ="CB";
-}
-elseif (preg_match('/src_/i',$source))
-{
-$customer2 = \Stripe\Customer::retrieve($customer->id,array("stripe_account" => $stripe->getStripeAccount($entity)));
-$src = $customer2->sources->retrieve("$source");
-if ($src->type=='card'){
-$paiementcode ="CB";
-}
-}
-$societe = new Societe($db);
-$societe->fetch($facture->socid);
-        dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
+		if (preg_match('/acct_/i',$source))
+		{
+			$paiementcode ="VIR";
+		}
+		elseif (preg_match('/card_/i',$source))
+		{
+			$paiementcode ="CB";
+		}
+		elseif (preg_match('/src_/i',$source))
+		{
+	
+		        $customer2 = $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
+			$src = $customer2->sources->retrieve("$source");
+			if ($src->type=='card')
+			{
+				$paiementcode ="CB";
+			}
+		}
 
-$charge=$stripe->CreatePaymentStripe($stripeamount,"EUR","invoice",$facid,$source,$customer->id,$stripe->getStripeAccount($conf->entity));
+		$societe = new Societe($db);
+		$societe->fetch($facture->socid);
+		dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
 
-    if (!$error)
-    {
-	    // Creation of payment line
-	    $paiement = new Paiement($db);
-	    $paiement->datepaye     = $datepaye;
-	    $paiement->amounts      = $amounts;   // Array with all payments dispatching
-	    $paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
-	    $paiement->paiementid   = dol_getIdFromCode($db,$paiementcode,'c_paiement');
-	    $paiement->num_paiement = $charge->message;
-	    $paiement->note         = GETPOST('comment');
-    }
+		$charge=$stripe->CreatePaymentStripe($stripeamount,"EUR","invoice",$facid,$source,$customer->id,$stripe->getStripeAccount($conf->entity));
 
-	    if (! $error)
-	    {
+		if (!$error)
+		{
+			// Creation of payment line
+			$paiement = new Paiement($db);
+			$paiement->datepaye     = $datepaye;
+			$paiement->amounts      = $amounts;   // Array with all payments dispatching
+			$paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
+			$paiement->paiementid   = dol_getIdFromCode($db,$paiementcode,'c_paiement');
+			$paiement->num_paiement = $charge->message;
+			$paiement->note         = GETPOST('comment');
+		}
 
-	    	$paiement_id = $paiement->create($user, 0);
-	    	if ($paiement_id < 0)
-	        {
-	            setEventMessages($paiement->error, $paiement->errors, 'errors');
-	            $error++;
-	        }
-      if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($facture->lines))
+		if (! $error)
+		{
+
+			$paiement_id = $paiement->create($user, 0);
+			if ($paiement_id < 0)
+			{
+				setEventMessages($paiement->error, $paiement->errors, 'errors');
+				$error++;
+			}
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($facture->lines))
 			{
 				$outputlangs = $langs;
 				$newlang = '';
@@ -349,53 +354,53 @@ $charge=$stripe->CreatePaymentStripe($stripeamount,"EUR","invoice",$facid,$sourc
 				$ret = $facture->fetch($facid); // Reload to get new records
 
 				$facture->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
 			}
 
-	    }
+		}
 
-	    if (! $error)
-	    {
-	    	$label='(CustomerInvoicePayment)';
-	    	if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
-	        $result=$paiement->addPaymentToBank($user,'payment',$label,GETPOST('accountid'),'','');
-	        if ($result < 0)
-	        {
-	            setEventMessages($paiement->error, $paiement->errors, 'errors');
-	            $error++;
-	        }
-          elseif (GETPOST('closepaidinvoices')=='on') {
-          $facture->set_paid($user);
-          }
-	    }
+		if (! $error)
+		{
+			$label='(CustomerInvoicePayment)';
+			if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
+			$result=$paiement->addPaymentToBank($user,'payment',$label,GETPOST('accountid'),'','');
+			if ($result < 0)
+			{
+				setEventMessages($paiement->error, $paiement->errors, 'errors');
+				$error++;
+			}
+			elseif (GETPOST('closepaidinvoices')=='on') {
+				$facture->set_paid($user);
+			}
+		}
 
-	    if (! $error)
-	    {
-	        $db->commit();
+		if (! $error)
+		{
+			$db->commit();
 
-	        // If payment dispatching on more than one invoice, we keep on summary page, otherwise go on invoice card
-	        $invoiceid=0;
-	        foreach ($paiement->amounts as $key => $amount)
-	        {
-	            $facid = $key;
-	            if (is_numeric($amount) && $amount <> 0)
-	            {
-	                if ($invoiceid != 0) $invoiceid=-1; // There is more than one invoice payed by this payment
-	                else $invoiceid=$facid;
-	            }
-	        }
-	        if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
-	        else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
-	        header('Location: '.$loc);
-	        exit;
-	    }
-	    else
-	    {
-      $loc = dol_buildpath('/stripeconnect/payment.php?facid='.$facid.'&action=create&error='.$e->getMessage().'', 1);
-	        $db->rollback();
-          header('Location: '.$loc);
-	    }
+			// If payment dispatching on more than one invoice, we keep on summary page, otherwise go on invoice card
+			$invoiceid=0;
+			foreach ($paiement->amounts as $key => $amount)
+			{
+				$facid = $key;
+				if (is_numeric($amount) && $amount <> 0)
+				{
+					if ($invoiceid != 0) $invoiceid=-1; // There is more than one invoice payed by this payment
+					else $invoiceid=$facid;
+				}
+			}
+			if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
+			else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
+			header('Location: '.$loc);
+			exit;
+		}
+		else
+		{
+			$loc = DOL_URL_ROOT.'/stripeconnect/payment.php?facid='.$facid.'&action=create&error='.$e->getMessage();
+			$db->rollback();
 
+			header('Location: '.$loc);
+			exit;
+		}
 	}
 }
 
@@ -418,7 +423,7 @@ else {
 }
 
 if (GETPOST('error')){
-	setEventMessages(GETPOST('error'), NULL, 'errors');
+	setEventMessages(GETPOST('error'), null, 'errors');
 }
 
 if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
@@ -1060,7 +1065,7 @@ print '</tr>';
 if (! GETPOST('action'))
 {
     if ($page == -1) $page = 0 ;
-    $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+    $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
     $offset = $limit * $page ;
 
     if (! $sortorder) $sortorder='DESC';
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 6628a3b46cd..28848106361 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -38,7 +38,7 @@ $socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $rowid = GETPOST("rowid",'alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 8d9429051f8..cea668cfae2 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -87,10 +87,8 @@ print '<td align="center">'.$langs->trans("Required").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-$var=True;
 foreach($extrafields->attribute_type as $key => $value)
 {
-
     print '<tr class="oddeven">';
     print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
     print "<td>".$extrafields->attribute_label[$key]."</td>\n";
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 75a0374a14c..41101ec7759 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -91,10 +91,8 @@ print '<td align="center">'.$langs->trans("Required").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-$var=True;
 foreach($extrafields->attribute_type as $key => $value)
 {
-
     print '<tr class="oddeven">';
     print "<td>".$extrafields->attribute_label[$key]."</td>\n";
     print "<td>".$key."</td>\n";
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index ade114f11b3..3ff366173fc 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -67,6 +67,7 @@ $action = GETPOST('action', 'alpha');
 $origin = GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
 $confirm = GETPOST('confirm', 'alpha');
+$projectid = GETPOST('projectid', 'int');
 $lineid = GETPOST('lineid', 'int');
 $contactid = GETPOST('contactid','int');
 
@@ -265,7 +266,7 @@ if (empty($reshook))
 					$object->remise_percent = GETPOST('remise_percent');
 					$object->remise_absolue = GETPOST('remise_absolue');
 					$object->socid = GETPOST('socid');
-					$object->fk_project = GETPOST('projectid');
+					$object->fk_project = GETPOST('projectid','int');
 					$object->modelpdf = GETPOST('model');
 					$object->author = $user->id; // deprecated
 					$object->note = GETPOST('note','none');
@@ -283,7 +284,7 @@ if (empty($reshook))
 				$object->cond_reglement_id = GETPOST('cond_reglement_id');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id');
 				$object->fk_account = GETPOST('fk_account', 'int');
-				$object->fk_project = GETPOST('projectid');
+				$object->fk_project = GETPOST('projectid','int');
 				$object->modelpdf = GETPOST('model');
 				$object->author = $user->id; // deprecated
 				$object->note = GETPOST('note','none');
@@ -527,8 +528,8 @@ if (empty($reshook))
 		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$ref_supplier = GETPOST('fourn_ref','alpha');
-
-		if (GETPOST('prod_entry_mode') == 'free')
+		$prod_entry_mode = GETPOST('prod_entry_mode');
+		if ($prod_entry_mode == 'free')
 		{
 			$idprod=0;
 			$price_ht = GETPOST('price_ht');
@@ -543,6 +544,7 @@ if (empty($reshook))
 
 		$qty = GETPOST('qty' . $predef);
 		$remise_percent = GETPOST('remise_percent' . $predef);
+		$price_ht_devise = GETPOST('multicurrency_price_ht');
 
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
@@ -556,17 +558,17 @@ if (empty($reshook))
 			}
 		}
 
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$error ++;
 		}
 
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && $price_ht == '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
+		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht == '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error ++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
+		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
 			$error ++;
 		}
@@ -581,16 +583,14 @@ if (empty($reshook))
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
 			// Ecrase $txtva par celui du produit
-			if ((GETPOST('prod_entry_mode') != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
+			if ($prod_entry_mode != 'free' && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 			{
 				$productsupplier = new ProductFournisseur($db);
 
-				if (empty($conf->global->SUPPLIER_PROPOSAL_WITH_NOPRICEDEFINED))	// TODO this test seems useless
-				{
-					$idprod=0;
-					if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-99;	// Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
-				}
-				if (preg_match('/^idprod_([0-9]+)$/',GETPOST('idprodfournprice'), $reg))
+				$idprod=0;
+				if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-99;	// Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+
+				if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice'), $reg))
 				{
 					$idprod=$reg[1];
 					$res=$productsupplier->fetch($idprod);
@@ -608,12 +608,16 @@ if (empty($reshook))
 
 				if ($idprod > 0)
 				{
-					$pu_ht = $productsupplier->fourn_pu;
-					$price_base_type = $productsupplier->fourn_price_base_type;
-					$type = $productsupplier->type;
 					$label = $productsupplier->label;
+
 					$desc = $productsupplier->description;
 					if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
+
+					$pu_ht = $productsupplier->fourn_pu;
+
+					$type = $productsupplier->type;
+					$price_base_type = ($productsupplier->fourn_price_base_type?$productsupplier->fourn_price_base_type:'HT');
+
 					$ref_supplier = $productsupplier->ref_supplier;
 
 					$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
@@ -665,7 +669,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 				}
 			}
-			else if((GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='') && empty($error))    // Free product
+			else if((GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='') && empty($error))    // Free product.  // $price_ht is already set
 			{
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -683,20 +687,19 @@ if (empty($reshook))
 				$localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 				$localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-				if (GETPOST('price_ht')!=='')
+				if ($price_ht !== '')
 				{
-					$price_base_type = 'HT';
-					$ht = price2num(GETPOST('price_ht'));
-					$ttc = 0;
+					$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 				}
 				else
 				{
-					$ttc = price2num(GETPOST('price_ttc'));
-					$ht = $ttc / (1 + ($tva_tx / 100));
-					$price_base_type = 'HT';
+					$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+					$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 				}
+				$price_base_type = 'HT';
+				$pu_ht_devise = price2num($price_ht_devise, 'MU');
 
-				$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_supplier, $fk_unit);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_supplier, $fk_unit);
 				//$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, $array_options, $fk_unit);
 			}
 
@@ -772,6 +775,7 @@ if (empty($reshook))
 
 	// Mise a jour d'une ligne dans la demande de prix
 	else if ($action == 'updateligne' && $user->rights->supplier_proposal->creer && GETPOST('save') == $langs->trans("Save")) {
+
 		// Define info_bits
 		$info_bits = 0;
 		if (preg_match('/\*/', GETPOST('tva_tx')))
@@ -810,6 +814,16 @@ if (empty($reshook))
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');
 		if (! empty($productid)) {
+
+			$productsupplier = new ProductFournisseur($db);
+			if (! empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
+			{
+				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $productid, 'none', GETPOST('socid','int')) < 0 )
+				{
+					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
+				}
+			}
+
 			$product = new Product($db);
 			$res = $product->fetch($productid);
 
@@ -893,7 +907,7 @@ if (empty($reshook))
 
 	// Set project
 	else if ($action == 'classin' && $user->rights->supplier_proposal->creer) {
-		$object->setProject($_POST['projectid']);
+		$object->setProject(GETPOST('projectid'),'int');
 	}
 
 	// Delai de livraison
@@ -1123,9 +1137,7 @@ if ($action == 'create')
 
 		$formproject = new FormProjets($db);
 
-		$projectid = 0;
-		if ($origin == 'project')
-			$projectid = ($originid ? $originid : 0);
+		if ($origin == 'project') $projectid = ($originid ? $originid : 0);
 
 		print '<tr>';
 		print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
@@ -1151,7 +1163,7 @@ if ($action == 'create')
 	$parameters = array('colspan' => ' colspan="3"');
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
@@ -1674,7 +1686,9 @@ if ($action == 'create')
 
 	// Add free products/services form
 	global $forceall, $senderissupplier, $dateSelector;
-	$forceall=1; $senderissupplier=2; $dateSelector=0;     // $senderissupplier=2 is same than 1 but disable test on minimum qty.
+	$forceall=1; $dateSelector=0;
+	$senderissupplier=2;	// $senderissupplier=2 is same than 1 but disable test on minimum qty.
+	if (! empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier=1;
 
 	if (! empty($object->lines))
 		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index ce70fe996d3..a39fba04b81 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -124,9 +124,9 @@ class SupplierProposal extends CommonObject
 
     var $cond_reglement_code;
     var $mode_reglement_code;
-    var $remise;
-    var $remise_percent;
-    var $remise_absolue;
+    var $remise = 0;
+    var $remise_percent = 0;
+    var $remise_absolue = 0;
 
     var $products=array();
     var $extraparams=array();
@@ -185,24 +185,11 @@ class SupplierProposal extends CommonObject
         global $conf,$langs;
 
         $this->db = $db;
+
         $this->socid = $socid;
         $this->id = $supplier_proposalid;
-        $this->products = array();
-        $this->remise = 0;
-        $this->remise_percent = 0;
-        $this->remise_absolue = 0;
 
-        $langs->load("supplier_proposal");
-        $this->labelstatut[0]=$langs->trans("SupplierProposalStatusDraft");
-        $this->labelstatut[1]=$langs->trans("SupplierProposalStatusValidated");
-        $this->labelstatut[2]=$langs->trans("SupplierProposalStatusSigned");
-        $this->labelstatut[3]=$langs->trans("SupplierProposalStatusNotSigned");
-        $this->labelstatut[4]=$langs->trans("SupplierProposalStatusClosed");
-        $this->labelstatut_short[0]=$langs->trans("SupplierProposalStatusDraftShort");
-        $this->labelstatut_short[1]=$langs->trans("Opened");
-        $this->labelstatut_short[2]=$langs->trans("SupplierProposalStatusSignedShort");
-        $this->labelstatut_short[3]=$langs->trans("SupplierProposalStatusNotSignedShort");
-        $this->labelstatut_short[4]=$langs->trans("SupplierProposalStatusClosedShort");
+        $this->products = array();
     }
 
 
@@ -407,10 +394,72 @@ class SupplierProposal extends CommonObject
         // Check parameters
         if ($type < 0) return -1;
 
-        if ($this->statut == 0)
+        if ($this->statut == self::STATUS_DRAFT)
         {
             $this->db->begin();
 
+            if ($fk_product > 0)
+            {
+            	if (! empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
+            	{
+            		// Check quantity is enough
+            		dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
+            		$prod = new Product($this->db, $fk_product);
+            		if ($prod->fetch($fk_product) > 0)
+            		{
+            			$product_type = $prod->type;
+            			$label = $prod->label;
+
+            			// We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
+            			// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+            			$result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid));   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+            			if ($result > 0)
+            			{
+            				$pu = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
+            				$ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
+            				// is remise percent not keyed but present for the product we add it
+            				if ($remise_percent == 0 && $prod->remise_percent !=0)
+            					$remise_percent =$prod->remise_percent;
+            			}
+            			if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
+            			{
+            				$langs->load("errors");
+            				$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+            				$this->db->rollback();
+            				dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+            				//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
+            				//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
+            				return -1;
+            			}
+            			if ($result == -1)
+            			{
+            				$langs->load("errors");
+            				$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+            				$this->db->rollback();
+            				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
+            				return -1;
+            			}
+            			if ($result < -1)
+            			{
+            				$this->error=$prod->error;
+            				$this->db->rollback();
+            				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
+            				return -1;
+            			}
+            		}
+            		else
+            		{
+            			$this->error=$prod->error;
+            			$this->db->rollback();
+            			return -1;
+            		}
+            	}
+            }
+            else
+            {
+            	$product_type = $type;
+            }
+
             // Calcul du total TTC et de la TVA pour la ligne a partir de
             // qty, pu, remise_percent et txtva
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
@@ -838,8 +887,8 @@ class SupplierProposal extends CommonObject
         $sql.= ", '".$this->db->escape($this->note_private)."'";
         $sql.= ", '".$this->db->escape($this->note_public)."'";
         $sql.= ", '".$this->db->escape($this->modelpdf)."'";
-        $sql.= ", ".$this->cond_reglement_id;
-        $sql.= ", ".$this->mode_reglement_id;
+        $sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
+        $sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
         $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
         $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"null");
         $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
@@ -960,24 +1009,17 @@ class SupplierProposal extends CommonObject
                     {
                     	$action='update';
 
-                    	// Actions on extra fields (by external module or standard code)
-                    	$hookmanager->initHooks(array('supplier_proposaldao'));
-                    	$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++;
-                    			}
-                    		}
+                    	// Actions on extra fields
+                   		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                   		{
+                   			$result=$this->insertExtraFields();
+                   			if ($result < 0)
+                   			{
+                   				$error++;
+                   			}
                     	}
-                    	else if ($reshook < 0) $error++;
 
-                        if (! $notrigger)
+                        if (! $erro && ! $notrigger)
                         {
                             // Call trigger
                             $result=$this->call_trigger('PROPAL_SUPPLIER_CREATE',$user);
@@ -2079,9 +2121,24 @@ class SupplierProposal extends CommonObject
      */
 	function LibStatut($statut,$mode=1)
     {
-		global $langs;
-		$langs->load("supplier_proposal");
+    	// Init/load array of translation of status
+    	if (empty($this->labelstatut) || empty($this->labelstatut_short))
+    	{
+    		global $langs;
+    		$langs->load("supplier_proposal");
+    		$this->labelstatut[0]=$langs->trans("SupplierProposalStatusDraft");
+    		$this->labelstatut[1]=$langs->trans("SupplierProposalStatusValidated");
+    		$this->labelstatut[2]=$langs->trans("SupplierProposalStatusSigned");
+    		$this->labelstatut[3]=$langs->trans("SupplierProposalStatusNotSigned");
+    		$this->labelstatut[4]=$langs->trans("SupplierProposalStatusClosed");
+    		$this->labelstatut_short[0]=$langs->trans("SupplierProposalStatusDraftShort");
+    		$this->labelstatut_short[1]=$langs->trans("Opened");
+    		$this->labelstatut_short[2]=$langs->trans("SupplierProposalStatusSignedShort");
+    		$this->labelstatut_short[3]=$langs->trans("SupplierProposalStatusNotSignedShort");
+    		$this->labelstatut_short[4]=$langs->trans("SupplierProposalStatusClosedShort");
+    	}
 
+    	$statuttrans='';
 		if ($statut==0) $statuttrans='statut0';
 		if ($statut==1) $statuttrans='statut1';
 		if ($statut==2) $statuttrans='statut3';
@@ -2116,16 +2173,16 @@ class SupplierProposal extends CommonObject
 
         $sql = "SELECT p.rowid, p.ref, p.datec as datec";
         $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
+        if (!$user->rights->societe->client->voir && !$user->socid)
         {
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." p.entity = ".$conf->entity;
+        $sql.= $clause." p.entity IN (".getEntity('supplier_proposal').")";
         if ($mode == 'opened') $sql.= " AND p.fk_statut = 1";
         if ($mode == 'signed') $sql.= " AND p.fk_statut = 2";
-        if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+        if ($user->socid) $sql.= " AND p.fk_soc = ".$user->socid;
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -2273,13 +2330,13 @@ class SupplierProposal extends CommonObject
         $sql = "SELECT count(p.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
+        if (!$user->rights->societe->client->voir && !$user->socid)
         {
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = "AND";
         }
-        $sql.= " ".$clause." p.entity = ".$conf->entity;
+        $sql.= " ".$clause." p.entity IN (".getEntity('supplier_proposal').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -2885,7 +2942,7 @@ class SupplierProposalLine extends CommonObjectLine
             	}
             }
 
-            if (! $notrigger)
+            if (! $error && ! $notrigger)
             {
                 // Call trigger
                 $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT',$user);
@@ -3061,7 +3118,7 @@ class SupplierProposalLine extends CommonObjectLine
         		}
         	}
 
-            if (! $notrigger)
+            if (! $error && ! $notrigger)
             {
                 // Call trigger
                 $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE',$user);
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 36c1df7329c..2be5dae222b 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -152,7 +152,7 @@ if ($object->id > 0)
 	print '<table class="border"width="100%">';
 
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 	print '</table>';
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 4b25dfb82ac..17565e7f140 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -84,7 +84,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE p.fk_soc = s.rowid";
-$sql.= " AND p.entity = ".$conf->entity;
+$sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
 if ($user->societe_id) $sql.=' AND p.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " AND p.fk_statut IN (0,1,2,3,4)";
@@ -184,11 +184,10 @@ if (! empty($conf->supplier_proposal->enabled))
 		if ($num)
 		{
 			$i = 0;
-			$var = True;
 			while ($i < $num)
 			{
-
 				$obj = $db->fetch_object($resql);
+
 				print '<tr class="oddeven">';
 
 				$supplier_proposalstatic->id=$obj->rowid;
@@ -242,10 +241,8 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-		$var = True;
 		while ($i < $num)
 		{
-
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -303,7 +300,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
 	$sql.= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.entity = ".$conf->entity;
+	$sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
 	$sql.= " AND p.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;
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 09cbd063e64..aa5c7e70ab3 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -82,7 +82,7 @@ $month=GETPOST("month");
 $yearvalid=GETPOST("yearvalid");
 $monthvalid=GETPOST("monthvalid");
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -332,6 +332,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
@@ -389,7 +394,9 @@ if ($resql)
 	$newcardbutton='';
 	if($user->rights->supplier_proposal->creer)
 	{
-		$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create">'.$langs->trans('NewAskPrice').'</a>';
+		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create">'.$langs->trans('NewAskPrice');
+		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton.= '</a>';
 	}
 
 	// Lignes des champs de filtre
@@ -470,13 +477,13 @@ if ($resql)
 	if (! empty($arrayfields['sp.ref']['checked']))
 	{
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" size="12" name="search_societe" value="'.$search_societe.'">';
+		print '<input class="flat" type="text" size="12" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
@@ -507,7 +514,7 @@ if ($resql)
 	{
 		print '<td class="liste_titre" colspan="1" align="center">';
 		//print $langs->trans('Month').': ';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="monthvalid" value="'.$monthvalid.'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="monthvalid" value="'.dol_escape_htmltag($monthvalid).'">';
 		//print '&nbsp;'.$langs->trans('Year').': ';
 		$syearvalid = $yearvalid;
 		$formother->select_year($syearvalid,'yearvalid',1, 20, 5);
@@ -518,7 +525,7 @@ if ($resql)
 	{
 		print '<td class="liste_titre" colspan="1" align="center">';
 		//print $langs->trans('Month').': ';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
 		//print '&nbsp;'.$langs->trans('Year').': ';
 		$syear = $year;
 		$formother->select_year($syear,'year',1, 20, 5);
@@ -529,28 +536,28 @@ if ($resql)
 	{
 		// Amount
 		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['sp.total_vat']['checked']))
 	{
 		// Amount
 		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['sp.total_ttc']['checked']))
 	{
 		// Amount
 		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['u.login']['checked']))
 	{
 		// Author
 		print '<td class="liste_titre" align="center">';
-		print '<input class="flat" size="4" type="text" name="search_login" value="'.$search_author.'">';
+		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_author).'">';
 		print '</td>';
 	}
 	// Extra fields
diff --git a/htdocs/theme/common/dolistore.jpg b/htdocs/theme/common/dolistore.jpg
deleted file mode 100644
index 65a2d6ffae1..00000000000
Binary files a/htdocs/theme/common/dolistore.jpg and /dev/null differ
diff --git a/htdocs/theme/common/octicons/.gitignore b/htdocs/theme/common/octicons/.gitignore
deleted file mode 100644
index b0e34801fac..00000000000
--- a/htdocs/theme/common/octicons/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules
-.DS_Store
-build
-*.log
diff --git a/htdocs/theme/common/octicons/.npmignore b/htdocs/theme/common/octicons/.npmignore
deleted file mode 100644
index f50769fa751..00000000000
--- a/htdocs/theme/common/octicons/.npmignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.github
-.travis.yml
-Gruntfile.js
-lib
-test
diff --git a/htdocs/theme/common/octicons/.travis.yml b/htdocs/theme/common/octicons/.travis.yml
deleted file mode 100644
index 435bc15d7af..00000000000
--- a/htdocs/theme/common/octicons/.travis.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-  - '5'
diff --git a/htdocs/theme/common/octicons/CHANGELOG.md b/htdocs/theme/common/octicons/CHANGELOG.md
deleted file mode 100644
index 2085dcb0169..00000000000
--- a/htdocs/theme/common/octicons/CHANGELOG.md
+++ /dev/null
@@ -1,363 +0,0 @@
-### HEAD
-
-### 5.0.1
-
-Fixes:
-
-- projects icon renders as a block, using `fill-rule` fixes it
-
-### 5.0.0
-
-Adds:
-
-- `project`
-- `note`
-- `screen-full`
-- `screen-normal`
-- More node.js api endpoints for accessing icons https://github.com/primer/octicons/pull/120
-- Creating a spritesheet demo https://github.com/primer/octicons/pull/121
-
-Removes:
-
-- Deprecating support for the webfont https://github.com/primer/octicons/pull/117
-- Stop checking `/build/` directory into repository https://github.com/primer/octicons/pull/118
-- Removing sass as a dependency https://github.com/primer/octicons/pull/119
-
-### 4.4.0
-
-Adds:
-
-- svg.json file that is accessible from node require
-
-### 4.3.0
-
-Fixes:
-
-- Vertical alignment on `italic`
-
-Modifies:
-
-- `person`
-- `organization`
-
-### 4.2.1
-
-Fixes:
-
-- Removing inline sourcemap from `min` versions of css.
-
-### 4.2.0
-
-Adds:
-
-- Keywords.json file that has an index of all octicons with alias names
-
-### 4.1.1 (June 16, 2016)
-
-Fixes:
-
-- Putting the `$octicons-font-path` back in the scss file.
-
-### 4.1.0 (June 6, 2016)
-
-Adds:
-
-- Installation docs https://github.com/primer/octicons/pull/94
-- `grabber`
-- `plus-small`
-
-Modifies:
-
-- `smiley`
-
-Refines:
-
-- Renames `mail-reply` to `reply` and refines its shape.
-
-Fixes:
-
-- Revert license back to SPDX standard
-
-### 4.0.0 (June 6, 2016)
-
-Adds:
-
-- Whole new grunt build system including svg sprite sheet.
-- adding css min https://github.com/primer/octicons/pull/60
-- adding woff2 format https://github.com/primer/octicons/issues/3
-- creates spritesheet of svg files https://github.com/primer/octicons/issues/88
-
-Removes:
-
-- Bower support
-
-Fixes:
-
-- all svg icons include viewBox https://github.com/primer/octicons/issues/87
-- license in package.json https://github.com/primer/octicons/issues/85
-
-### 3.5.0 (February 12, 2016)
-
-Adds:
-
-- `unverified`
-
-Refines:
-
-- `verified`
-
-### 3.4.1 (January 24, 2016)
-
-This includes various SVG viewport refinements.
-
-Refines:
-
-- `thumbs-down`
-- `logo-github`
-
-### 3.4.0 (January 22, 2016)
-
-Adds:
-
-- `verified`
-- `smiley`
-
-Removes:
-
-- `color-mode`
-
-Refines:
-
-- `primitive-dot`
-- `horizontal-rule`
-- `triangle-down`
-- `triangle-up`
-- `triangle-left`
-- `triangle-right`
-- `globe`
-- `flame`
-- `comment-discussion`
-
-### 3.3.0 (November 12, 2015)
-
-Adds:
-
-- `logo-gist`
-
-Resizes all our SVG to be 16x16 instead of 1024x1024
-
-### 3.2.0 (November 6, 2015)
-
-Adds:
-
-- `bold`
-- `text-size`
-- `italic`
-- `tasklist`
-
-It also normalizes some styling in:
-
-- `list-unordered`
-- `list-ordered`
-- `quote`
-- `mention`
-- `bookmark`
-- `threebars`
-
-Removes
-
-- `screen-normal`
-- `screen-full`
-
-
-### 3.1.0 (August 13, 2015)
-
-Adds
-
-- `shield`
-
-This thickens stroke widths slightly on the following icons:
-
-- `circle-slash`
-- `clock`
-- `cloud-upload`
-- `cloud-download`
-- `dashboard`
-- `info`
-- `issue-closed`
-- `issue`
-- `issue-reopened`
-- `history`
-- `question`
-- `search`
-
-Fills `comment-discussion`
-
-Thickens `x` to match `checkmark`
-
-### 3.0.1 (August 10, 2015)
-
-Some files were missing in `3.0.0`
-
-### 3.0.0 (August 10, 2015)
-
-Removes
-
-- `microscope`
-- `beer`
-- `split`
-- `puzzle`
-- `steps`
-- `podium`
-- `timer`
-- all `alignment` icons
-- all `move` icons
-- all `playback` icons
-- all `jump` icons
-
-Adds
-
-- `beaker`
-- `bell`
-- `desktop-download`
-- `watch`
-
-Line-weight changes, sizing normalization, and new drawings
-
-- `circle-slash`
-- `lock`
-- `cloud-upload`
-- `cloud-download`
-- `plus`
-- `✕`
-- `broadcast`
-- `lock`
-- all `repo` icons
-- organization
-- person
-- all `chevrons` & `triangles`
-- all `diff` icons
-- `clippy`
-- all `issue` and circular icons
-- `rss`
-- `ruby`
-- `cancel`
-- `settings`
-- `mirror`
-- `external-link`
-- `history`
-- `gear`
-- `settings`
-- `info`
-- `history`
-- `package`
-- `gist-secret`
-- `rocket`
-- `law`
-- `telescope`
-- `search`
-- `tag`
-- `normal-screen`
-- `iphone`
-- `no-new-line`
-- `desktop`
-- all `git` icons
-- `circuit-board`
-- `heart`
-- `home`
-- `briefcase`
-- `wiki`
-- `bookmark`
-- `briefcase`
-- `calendar`
-- `color-mode`
-- `comment`
-- `discussions`
-- `credit-card`
-- `dashboard`
-- `camera`
-- `video`
-- `bug`
-- `desktop`
-- `ellipses`
-- `eye`
-- all `files` & `folders`
-- `fold`
-- `unfold`
-- `gift`
-- `graph`
-- `hubot`
-- `inbox`
-- `jersey`
-- `keyboard`
-- `light-bulb`
-- `link`
-- `location`
-- `mail`
-- `mail-read`
-- `marker`
-- `plug`
-- `mute`
-- `pencil`
-- `push-pin`
-- `fullscreen`
-- `unfullscreen`
-- `server`
-- `sign-in`
-- `sign-out`
-- `tag`
-- `terminal`
-- `thumbs-up`
-- `thumbs-down`
-- `trash`
-- `unmute`
-- `versions`
-- `gist`
-- `key`
-- `megaphone`
-- `checklist`
-
-## 2.4.1 (June 2, 2015)
-
-- Add the scss file I forgot to include
-
-## 2.4.0 (June 2, 2015)
-
-- Add `octicons.scss`
-- Revert path changes to `sprockets-octicons.scss`, as they broke octicons in sprockets.
-
-## 2.3.0 (May 28, 2015)
-
-- Add a path variable to `sprockets-octicons.scss` to be consistent with octicons.less`
-
-## 2.2.3 (May 21, 2015)
-
-- Use SPDX license identifiers in package.json
-
-## 2.2.2 (April 1, 2015)
-
-Fixes file icons for
-
-- `file-binary`
-- `file-code`
-- `file-media`
-- `file-pdf`
-- `file-symlink-file`
-- `file-text`
-- `file-zip`
-
-## 2.2.1 (March 30, 2015)
-
-- Fix vector artifact and smooth curves in `mark-github`
-
-## 2.2.0 (Feb 18, 2015)
-
-- Add two new icons: `thumbsup` and `thumbsdown`
-
-## 2.0.1 (June 16, 2014)
-
-- Add mention of github.com/logos to the license
-
-## 2.0.0 (June 16, 2014)
-
-- Hello world
diff --git a/htdocs/theme/common/octicons/Gruntfile.js b/htdocs/theme/common/octicons/Gruntfile.js
deleted file mode 100644
index 48e0c300427..00000000000
--- a/htdocs/theme/common/octicons/Gruntfile.js
+++ /dev/null
@@ -1,137 +0,0 @@
-var fs = require("fs")
-var path = require("path")
-
-module.exports = function(grunt) {
-
-  grunt.initConfig({
-
-    pkg: grunt.file.readJSON('package.json'),
-
-    cssnano: {
-      options: {},
-      dist: {
-        files: {
-          'build/octicons.min.css': 'build/octicons.css'
-        }
-      }
-    },
-
-    svgmin: {
-      dist: {
-        options: {
-          plugins: [
-            {removeTitle: true},
-            {removeStyleElement: true},
-            {removeAttrs: { attrs: ['id', 'class', 'data-name', 'fill'] }},
-            {removeEmptyContainers: true},
-            {sortAttrs: true},
-            {removeUselessDefs: true},
-            {removeEmptyText: true},
-            {removeEditorsNSData: true},
-            {removeEmptyAttrs: true},
-            {removeHiddenElems: true}
-          ]
-        },
-        files: [{
-          expand: true,
-          cwd: 'lib/svg',
-          src: ['*.svg'],
-          dest: 'build/svg'
-        }]
-      }
-    },
-
-    svgstore: {
-      options: {
-        includeTitleElement: false,
-        inheritviewbox: true,
-        includedemo: function(arg) {
-          var octicons = require("./index.js")
-
-          var icons = function() {
-            var result = []
-            Object.keys(octicons).forEach(function(key){
-              result.push("<div style=\"width: 10%;min-width: 100px;flex: 0 0 auto;box-sizing:border-box;padding:1em;text-align:center;\">" + octicons[key].toSVGUse({ height: 32 }) + "<div>" + key + "</div></div>")
-            })
-            return result.join("\n")
-          }
-
-          return `
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Octicons Spritesheet test</title>
-    <link rel="stylesheet" href="./octicons.css" media="screen" title="no title">
-    <style>
-      body {
-        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-        color: #222;
-        font-size: 15px;
-      }
-    </style>
-  </head>
-  <body>
-    ${arg.svg}
-    <div style="font-size: 2.2em;padding-left: 20px;">Octicons SVG Spritesheet demo</div>
-    <div style="font-size: 1.2em;margin: 1em 0;padding-left: 20px;">All the icons rendered below use the svg spriteheet located in the <code>/build/</code> directory.</div>
-    <div style="flex: 0 1 auto;display:flex;flex-wrap: wrap;    flex-direction: row;">
-      ${icons()}
-    </div>
-  </body>
-</html>
-`
-        }
-      },
-      default: {
-        files: {
-          "build/sprite.octicons.svg": ['build/svg/*.svg']
-        }
-      },
-    },
-
-    clean: {
-      build: [
-        'build/*'
-      ]
-    },
-
-    copy: {
-      css: {
-        src: "lib/octicons.css",
-        dest: "build/octicons.css"
-      }
-    }
-  });
-
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-svgstore');
-  grunt.loadNpmTasks('grunt-svgmin');
-  grunt.loadNpmTasks('grunt-cssnano');
-
-  // build tasks
-  grunt.registerTask('css',  ['copy', 'cssnano']);
-  grunt.registerTask('svg', ['clean', 'svgmin']);
-
-  // default task, build /dist/
-  grunt.registerTask('default', [ 'svg', 'css', 'json:svg', 'svgstore']);
-
-  grunt.registerTask('json:svg', 'add svg string to data.json build', function() {
-    var files = fs.readdirSync("./build/svg/")
-    var data = JSON.parse(fs.readFileSync("./lib/data.json"))
-
-    files.forEach(function(file) {
-      var svg = fs.readFileSync(path.resolve("./build/svg", file))
-      var key = path.basename(file, ".svg")
-      if (data[key]) {
-        var raw = svg.toString()
-        data[key].path = /<path.+\/>/g.exec(raw)[0]
-        data[key].height = /height="(\d+)"/g.exec(raw)[1]
-        data[key].width = /width="(\d+)"/g.exec(raw)[1]
-      }
-    })
-
-    fs.writeFileSync("build/data.json", JSON.stringify(data));
-  })
-};
diff --git a/htdocs/theme/common/octicons/LICENSE b/htdocs/theme/common/octicons/LICENSE
index 4cf2020ce77..9317777c6c3 100644
--- a/htdocs/theme/common/octicons/LICENSE
+++ b/htdocs/theme/common/octicons/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012-2016 GitHub, Inc.
+Copyright (c) 2018 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/htdocs/theme/common/octicons/README.md b/htdocs/theme/common/octicons/README.md
index 84edd84dce5..e7cb3064a8a 100644
--- a/htdocs/theme/common/octicons/README.md
+++ b/htdocs/theme/common/octicons/README.md
@@ -1,29 +1,25 @@
 # GitHub Octicons
 
-[![NPM version](https://img.shields.io/npm/v/octicons.svg)](https://www.npmjs.org/package/octicons)
+[![npm version](https://img.shields.io/npm/v/octicons.svg)](https://www.npmjs.org/package/octicons)
 [![Build Status](https://travis-ci.org/primer/octicons.svg?branch=master)](https://travis-ci.org/primer/octicons)
 
 > Octicons are a scalable set of icons handcrafted with <3 by GitHub.
 
 ## Install
 
-**NOTE:** The compiled files are located in `/build/`. This directory is located in the published npm package. Which means you can access it when you `npm install octicons`. You can also build this directory by following the [building octicons directions](#building-octicons). The files in the `/lib/` directory are the raw source files and are not compiled or optimized.
+**NOTE:** The compiled files are located in `build/`. This directory is located in the published npm package. Which means you can access it when you `npm install octicons`. You can also build this directory by following the [building octicons directions](#building-octicons). The files in the `lib/` directory are the raw source files and are not compiled or optimized.
 
-#### NPM
+#### npm
 
 This repository is distributed with [npm][npm]. After [installing npm][install-npm], you can install `octicons` with this command.
 
 ```
-$ npm install --save octicons
+$ npm install octicons --save
 ```
 
 ## Usage
 
-For all the usages, we recommend using the CSS located in `./build/octicons.css`. This is some simple CSS to normalize the icons and inherit colors.
-
-### Spritesheet
-
-With a [SVG sprite icon system](https://css-tricks.com/svg-sprites-use-better-icon-fonts/) you can include the sprite sheet located `./build/sprite.octicons.svg` after you [build the icons](#building-octicons) or from the npm package. There is a demo of how to use the spritesheet in the build directory also.
+For all the usages, we recommend using the CSS located in `build/build.css`. This is some simple CSS to normalize the icons and inherit colors.
 
 ### Node
 
@@ -47,11 +43,11 @@ octicons.alert
 //   toSVG: [Function] }
 ```
 
-There will be a key for every icon, with `keywords` and `svg`.
+There will be a key for every icon, with [`toSVG`](#octiconsalerttosvg) and other properties.
 
 #### `octicons.alert.symbol`
 
-Returns the string of the symbol name
+Returns the string of the symbol name, same as the key for that icon.
 
 ```js
 octicons.x.symbol
@@ -60,7 +56,7 @@ octicons.x.symbol
 
 #### `octicons.person.path`
 
-Path returns the string representation of the path of the icon.
+Returns the string representation of the path of the icon.
 
 ```js
 octicons.x.path
@@ -69,7 +65,7 @@ octicons.x.path
 
 #### `octicons.issue.options`
 
-This is a json object of all the `options` that will be added to the output tag.
+This is an object of all the attributes that will be added to the output tag.
 
 ```js
 octicons.x.options
@@ -78,15 +74,15 @@ octicons.x.options
 
 #### `octicons.alert.width`
 
-Width is the icon's true width. Based on the svg view box width. _Note, this doesn't change if you scale it up with size options, it only is the natural width of the icon_
+Returns the icon's true width, based on the svg view box width. _Note, this doesn't change if you scale it up with size options, it only is the natural width of the icon._
 
 #### `octicons.alert.height`
 
-Height is the icon's true height. Based on the svg view box height. _Note, this doesn't change if you scale it up with size options, it only is the natural height of the icon_
+Returns the icon's true height, based on the svg view box height. _Note, this doesn't change if you scale it up with size options, it only is the natural height of the icon._
 
 #### `keywords`
 
-Returns an array of keywords for the icon. The data [comes from the octicons repository](https://github.com/primer/octicons/blob/master/lib/data.json). Consider contributing more aliases for the icons.
+Returns an array of keywords for the icon. The data comes from the [data file in lib](../data.json). Consider contributing more aliases for the icons.
 
 ```js
 octicons.x.keywords
@@ -95,7 +91,7 @@ octicons.x.keywords
 
 #### `octicons.alert.toSVG()`
 
-Returns a string of the svg tag
+Returns a string of the `<svg>` tag.
 
 ```js
 octicons.x.toSVG()
@@ -131,64 +127,16 @@ octicons.x.toSVG({ "width": 45 })
 // <svg version="1.1" width="45" height="60" viewBox="0 0 12 16" class="octicon octicon-x" aria-hidden="true"><path d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
 ```
 
-#### `octicons.alert.toSVGUse()`
-
-Returns a string of the svg tag with the `<use>` tag, for use with the spritesheet located in the /build/ directory.
-
-```js
-octicons.x.toSVGUse()
-// <svg version="1.1" width="12" height="16" viewBox="0 0 12 16" class="octicon octicon-x" aria-hidden="true"><use xlink:href="#x" /></svg>
-```
-
-### Ruby
-
-If your environment is Ruby on Rails, we have a [octicons_helper](https://github.com/primer/octicons_helper) gem available that renders SVG in your page. The octicons_helper uses the [octicons_gem](https://github.com/primer/octicons_gem) to do the computing and reading of the SVG files.
-
-### Jekyll
-
-For jekyll, there's a [jekyll-octicons](https://github.com/primer/jekyll-octicons) plugin available. This works exactly like the octicons_helper.
-
-## Changing, adding, or deleting icons
-
-1. Open the [Sketch document][sketch-document] in `/lib/`. Each icon exists as an artboard within our master Sketch document. If you’re adding an icon, duplicate one of the artboards and add your shapes to it. Be sure to give your artboard a name that makes sense.
-2. Once you’re happy with your icon set, choose File > Export…
-3. Choose all the artboards you’d like to export and then press “Export”
-4. Export to `/lib/svg/`
-
-You’ll next need to build your Octicons.
-
-## Building Octicons
-
-All the files you need will be in the `/build/` directory already, but if you’ve made changes to the `/lib/` directory and need to regenerate, follow these steps:
-
-1. Open the Octicons directory in Terminal
-2. `npm install` to install all dependencies for the project.
-3. Run the command `npm run build`. This will run the grunt task to build the SVGs, placing them in the `/build/` directory.
-
-## Publishing
-
-If you have access to publish this repository, these are the steps to publishing. If you need access, contact [#design-systems](https://github.slack.com/archives/design-systems).
-
-1. Update the [CHANGELOG.md](./CHANGELOG.md) with relevant version number and any updates made to the repository.
-2. `npm version <newversion>` Run [npm version](https://docs.npmjs.com/cli/version) inputing the relevant version type. The versioning is [semver](http://semver.org/), so version appropriately based on what has changed.
-3. `npm publish` This will publish the new version to npmjs.org
-4. `git push && git push --tags` Push all these changes to origin.
-
 ## License
 
-(c) 2012-2016 GitHub, Inc.
+(c) GitHub, Inc.
 
 When using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
 
-_SVG License:_ [SIL OFL 1.1](http://scripts.sil.org/OFL)  
-Applies to all SVG files
-
-_Code License:_ [MIT](./LICENSE)  
-Applies to all other files
+[MIT](./LICENSE)  
 
 [primer]: https://github.com/primer/primer
 [docs]: http://primercss.io/
 [npm]: https://www.npmjs.com/
 [install-npm]: https://docs.npmjs.com/getting-started/installing-node
 [sass]: http://sass-lang.com/
-[sketch-document]: https://github.com/primer/octicons/blob/master/lib/octicons-master.sketch
diff --git a/htdocs/theme/common/octicons/lib/octicons.css b/htdocs/theme/common/octicons/build/build.css
similarity index 100%
rename from htdocs/theme/common/octicons/lib/octicons.css
rename to htdocs/theme/common/octicons/build/build.css
diff --git a/htdocs/theme/common/octicons/build/data.json b/htdocs/theme/common/octicons/build/data.json
new file mode 100644
index 00000000000..41fa0740b8a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/data.json
@@ -0,0 +1 @@
+{"alert":{"name":"alert","figma":{"id":"0:5","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["warning","triangle","exclamation","point"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z\"/>"},"arrow-down":{"name":"arrow-down","figma":{"id":"0:8","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["point","direction"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 7V3H3v4H0l5 6 5-6H7z\"/>"},"arrow-left":{"name":"arrow-left","figma":{"id":"0:10","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["point","direction"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 3L0 8l6 5v-3h4V6H6V3z\"/>"},"arrow-right":{"name":"arrow-right","figma":{"id":"0:12","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["point","direction"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 8L4 3v3H0v4h4v3l6-5z\"/>"},"arrow-up":{"name":"arrow-up","figma":{"id":"0:14","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["point","direction"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M5 3L0 9h3v4h4V9h3L5 3z\"/>"},"arrow-small-down":{"name":"arrow-small-down","figma":{"id":"0:16","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["point","direction","little","tiny"],"width":6,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 7V5H2v2H0l3 4 3-4H4z\"/>"},"arrow-small-left":{"name":"arrow-small-left","figma":{"id":"0:18","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["point","direction","little","tiny"],"width":6,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 7V5L0 8l4 3V9h2V7H4z\"/>"},"arrow-small-right":{"name":"arrow-small-right","figma":{"id":"0:20","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["point","direction","little","tiny"],"width":6,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 8L2 5v2H0v2h2v2l4-3z\"/>"},"arrow-small-up":{"name":"arrow-small-up","figma":{"id":"0:22","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["point","direction","little","tiny"],"width":6,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M3 5L0 9h2v2h2V9h2L3 5z\"/>"},"beaker":{"name":"beaker","figma":{"id":"0:26","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["experiment","labs","experimental","feature","test","science","education","study","development","testing"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14.84 14.59L11.46 7V3h1V2h-9v1h1v4l-3.37 7.59A1 1 0 0 0 2 16h11.94c.72 0 1.2-.75.91-1.41h-.01zM4.21 10l1.25-3V3h5v4l1.25 3h-7.5zm4.25-2h1v1h-1V8zm-1-1h-1V6h1v1zm0-3h1v1h-1V4zm0-3h-1V0h1v1z\"/>"},"bell":{"name":"bell","figma":{"id":"0:34","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["notification"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14 12v1H0v-1l.73-.58c.77-.77.81-2.55 1.19-4.42C2.69 3.23 6 2 6 2c0-.55.45-1 1-1s1 .45 1 1c0 0 3.39 1.23 4.16 5 .38 1.88.42 3.66 1.19 4.42l.66.58H14zm-7 4c1.11 0 2-.89 2-2H5c0 1.11.89 2 2 2z\"/>"},"bold":{"name":"bold","figma":{"id":"0:38","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["markdown","bold","text"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M1 2h3.83c2.48 0 4.3.75 4.3 2.95 0 1.14-.63 2.23-1.67 2.61v.06c1.33.3 2.3 1.23 2.3 2.86 0 2.39-1.97 3.52-4.61 3.52H1V2zm3.66 4.95c1.67 0 2.38-.66 2.38-1.69 0-1.17-.78-1.61-2.34-1.61H3.13v3.3h1.53zm.27 5.39c1.77 0 2.75-.64 2.75-1.98 0-1.27-.95-1.81-2.75-1.81h-1.8v3.8h1.8v-.01z\"/>"},"book":{"name":"book","figma":{"id":"0:43","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["book","journal","wiki","readme"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M3 5h4v1H3V5zm0 3h4V7H3v1zm0 2h4V9H3v1zm11-5h-4v1h4V5zm0 2h-4v1h4V7zm0 2h-4v1h4V9zm2-6v9c0 .55-.45 1-1 1H9.5l-1 1-1-1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h5.5l1 1 1-1H15c.55 0 1 .45 1 1zm-8 .5L7.5 3H2v9h6V3.5zm7-.5H9.5l-.5.5V12h6V3z\"/>"},"bookmark":{"name":"bookmark","figma":{"id":"0:54","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["tab","star"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M9 0H1C.27 0 0 .27 0 1v15l5-3.09L10 16V1c0-.73-.27-1-1-1zm-.78 4.25L6.36 5.61l.72 2.16c.06.22-.02.28-.2.17L5 6.6 3.12 7.94c-.19.11-.25.05-.2-.17l.72-2.16-1.86-1.36c-.17-.16-.14-.23.09-.23l2.3-.03.7-2.16h.25l.7 2.16 2.3.03c.23 0 .27.08.09.23h.01z\"/>"},"briefcase":{"name":"briefcase","figma":{"id":"0:58","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["suitcase","business"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M9 4V3c0-.55-.45-1-1-1H6c-.55 0-1 .45-1 1v1H1c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1H9zM6 3h2v1H6V3zm7 6H8v1H6V9H1V5h1v3h10V5h1v4z\"/>"},"broadcast":{"name":"broadcast","figma":{"id":"0:63","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["rss","radio","signal"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M9 9H8c.55 0 1-.45 1-1V7c0-.55-.45-1-1-1H7c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1H6c-.55 0-1 .45-1 1v2h1v3c0 .55.45 1 1 1h1c.55 0 1-.45 1-1v-3h1v-2c0-.55-.45-1-1-1zM7 7h1v1H7V7zm2 4H8v4H7v-4H6v-1h3v1zm2.09-3.5c0-1.98-1.61-3.59-3.59-3.59A3.593 3.593 0 0 0 4 8.31v1.98c-.61-.77-1-1.73-1-2.8 0-2.48 2.02-4.5 4.5-4.5S12 5.01 12 7.49c0 1.06-.39 2.03-1 2.8V8.31c.06-.27.09-.53.09-.81zm3.91 0c0 2.88-1.63 5.38-4 6.63v-1.05a6.553 6.553 0 0 0 3.09-5.58A6.59 6.59 0 0 0 7.5.91 6.59 6.59 0 0 0 .91 7.5c0 2.36 1.23 4.42 3.09 5.58v1.05A7.497 7.497 0 0 1 7.5 0C11.64 0 15 3.36 15 7.5z\"/>"},"browser":{"name":"browser","figma":{"id":"0:70","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["window","web"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M5 3h1v1H5V3zM3 3h1v1H3V3zM1 3h1v1H1V3zm12 10H1V5h12v8zm0-9H7V3h6v1zm1-1c0-.55-.45-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V3z\"/>"},"bug":{"name":"bug","figma":{"id":"0:78","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["insect","issue"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11.17 10h3V9h-3V8l3.17-1.03-.34-.94-2.83.97V6c0-.55-.45-1-1-1V4c0-.48-.36-.88-.83-.97L10.37 2h1.8V1h-2.2l-2 2h-.59L5.37 1h-2.2v1h1.8L6 3.03c-.47.09-.83.48-.83.97v1c-.55 0-1 .45-1 1v1l-2.83-.97-.34.94L4.17 8v1h-3v1h3v1L1 12.03l.34.94L4.17 12v1c0 .55.45 1 1 1h1l1-1V6h1v7l1 1h1c.55 0 1-.45 1-1v-1l2.83.97.34-.94L11.17 11v-1zm-2-5h-3V4h3v1z\"/>"},"calendar":{"name":"calendar","figma":{"id":"0:82","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["time","day","month","year","date","appointment"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 2h-1v1.5c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5V2H6v1.5c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5V2H2c-.55 0-1 .45-1 1v11c0 .55.45 1 1 1h11c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 12H2V5h11v9zM5 3H4V1h1v2zm6 0h-1V1h1v2zM6 7H5V6h1v1zm2 0H7V6h1v1zm2 0H9V6h1v1zm2 0h-1V6h1v1zM4 9H3V8h1v1zm2 0H5V8h1v1zm2 0H7V8h1v1zm2 0H9V8h1v1zm2 0h-1V8h1v1zm-8 2H3v-1h1v1zm2 0H5v-1h1v1zm2 0H7v-1h1v1zm2 0H9v-1h1v1zm2 0h-1v-1h1v1zm-8 2H3v-1h1v1zm2 0H5v-1h1v1zm2 0H7v-1h1v1zm2 0H9v-1h1v1z\"/>"},"check":{"name":"check","figma":{"id":"0:104","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["mark","yes","confirm","accept","ok","success"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12 5.5l-8 8-4-4L1.5 8 4 10.5 10.5 4 12 5.5z\"/>"},"checklist":{"name":"checklist","figma":{"id":"0:108","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["todo","tasks"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M16 8.5l-6 6-3-3L8.5 10l1.5 1.5L14.5 7 16 8.5zM5.7 12.2l.8.8H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h7c.55 0 1 .45 1 1v6.5l-.8-.8c-.39-.39-1.03-.39-1.42 0L5.7 10.8a.996.996 0 0 0 0 1.41v-.01zM4 4h5V3H4v1zm0 2h5V5H4v1zm0 2h3V7H4v1zM3 9H2v1h1V9zm0-2H2v1h1V7zm0-2H2v1h1V5zm0-2H2v1h1V3z\"/>"},"chevron-down":{"name":"chevron-down","figma":{"id":"0:117","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["triangle","arrow"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M5 11.5l-5-5L1.5 5 5 8.75 8.5 5 10 6.5l-5 5z\"/>"},"chevron-left":{"name":"chevron-left","figma":{"id":"0:119","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["triangle","arrow"],"width":8,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 3l1.5 1.5L3.75 8l3.75 3.5L6 13 1 8l5-5z\"/>"},"chevron-right":{"name":"chevron-right","figma":{"id":"0:121","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["triangle","arrow"],"width":8,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7.5 8l-5 5L1 11.5 4.75 8 1 4.5 2.5 3l5 5z\"/>"},"chevron-up":{"name":"chevron-up","figma":{"id":"0:123","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["triangle","arrow"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 10l-1.5 1.5L5 7.75 1.5 11.5 0 10l5-5 5 5z\"/>"},"circle-slash":{"name":"circle-slash","figma":{"id":"0:127","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["no","deny","fail","failure","error","bad"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm0 1.3c1.3 0 2.5.44 3.47 1.17l-8 8A5.755 5.755 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zm0 11.41c-1.3 0-2.5-.44-3.47-1.17l8-8c.73.97 1.17 2.17 1.17 3.47 0 3.14-2.56 5.7-5.7 5.7z\"/>"},"circuit-board":{"name":"circuit-board","figma":{"id":"0:132","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["developer","hardware","electricity"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M3 5c0-.55.45-1 1-1s1 .45 1 1-.45 1-1 1-1-.45-1-1zm8 0c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zm0 6c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zm2-10H5v2.17c.36.19.64.47.83.83h2.34c.42-.78 1.33-1.28 2.34-1.05.75.19 1.36.8 1.53 1.55.31 1.38-.72 2.59-2.05 2.59-.8 0-1.48-.44-1.83-1.09H5.83c-.42.8-1.33 1.28-2.34 1.03-.73-.17-1.34-.78-1.52-1.52C1.72 4.49 2.2 3.59 3 3.17V1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1l5-5h2.17c.42-.78 1.33-1.28 2.34-1.05.75.19 1.36.8 1.53 1.55.31 1.38-.72 2.59-2.05 2.59-.8 0-1.48-.44-1.83-1.09H6.99L4 15h9c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1z\"/>"},"clippy":{"name":"clippy","figma":{"id":"0:138","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["copy","paste","save","capture","clipboard"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M2 13h4v1H2v-1zm5-6H2v1h5V7zm2 3V8l-3 3 3 3v-2h5v-2H9zM4.5 9H2v1h2.5V9zM2 12h2.5v-1H2v1zm9 1h1v2c-.02.28-.11.52-.3.7-.19.18-.42.28-.7.3H1c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h3c0-1.11.89-2 2-2 1.11 0 2 .89 2 2h3c.55 0 1 .45 1 1v5h-1V6H1v9h10v-2zM2 5h8c0-.55-.45-1-1-1H8c-.55 0-1-.45-1-1s-.45-1-1-1-1 .45-1 1-.45 1-1 1H3c-.55 0-1 .45-1 1z\"/>"},"clock":{"name":"clock","figma":{"id":"0:147","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["time","hour","minute","second","watch"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 8h3v2H7c-.55 0-1-.45-1-1V4h2v4zM7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7z\"/>"},"cloud-download":{"name":"cloud-download","figma":{"id":"0:152","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["save","install","get"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M9 12h2l-3 3-3-3h2V7h2v5zm3-8c0-.44-.91-3-4.5-3C5.08 1 3 2.92 3 5 1.02 5 0 6.52 0 8c0 1.53 1 3 3 3h3V9.7H3C1.38 9.7 1.3 8.28 1.3 8c0-.17.05-1.7 1.7-1.7h1.3V5c0-1.39 1.56-2.7 3.2-2.7 2.55 0 3.13 1.55 3.2 1.8v1.2H12c.81 0 2.7.22 2.7 2.2 0 2.09-2.25 2.2-2.7 2.2h-2V11h2c2.08 0 4-1.16 4-3.5C16 5.06 14.08 4 12 4z\"/>"},"cloud-upload":{"name":"cloud-upload","figma":{"id":"0:156","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["put","export"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 9H5l3-3 3 3H9v5H7V9zm5-4c0-.44-.91-3-4.5-3C5.08 2 3 3.92 3 6 1.02 6 0 7.52 0 9c0 1.53 1 3 3 3h3v-1.3H3c-1.62 0-1.7-1.42-1.7-1.7 0-.17.05-1.7 1.7-1.7h1.3V6c0-1.39 1.56-2.7 3.2-2.7 2.55 0 3.13 1.55 3.2 1.8v1.2H12c.81 0 2.7.22 2.7 2.2 0 2.09-2.25 2.2-2.7 2.2h-2V12h2c2.08 0 4-1.16 4-3.5C16 6.06 14.08 5 12 5z\"/>"},"code":{"name":"code","figma":{"id":"0:160","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["brackets"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z\"/>"},"comment-discussion":{"name":"comment-discussion","figma":{"id":"0:164","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["converse","talk"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15 1H6c-.55 0-1 .45-1 1v2H1c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h1v3l3-3h4c.55 0 1-.45 1-1V9h1l3 3V9h1c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zM9 11H4.5L3 12.5V11H1V5h4v3c0 .55.45 1 1 1h3v2zm6-3h-2v1.5L11.5 8H6V2h9v6z\"/>"},"comment":{"name":"comment","figma":{"id":"0:169","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["speak","bubble"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14 1H2c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h2v3.5L7.5 11H14c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 9H7l-2 2v-2H2V2h12v8z\"/>"},"credit-card":{"name":"credit-card","figma":{"id":"0:173","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["money","billing","payments","transactions"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12 9H2V8h10v1zm4-6v9c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h14c.55 0 1 .45 1 1zm-1 3H1v6h14V6zm0-3H1v1h14V3zm-9 7H2v1h4v-1z\"/>"},"dash":{"name":"dash","figma":{"id":"0:178","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["hyphen","range"],"width":8,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M0 7v2h8V7H0z\"/>"},"dashboard":{"name":"dashboard","figma":{"id":"0:182","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["speed","dial"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M9 5H8V4h1v1zm4 3h-1v1h1V8zM6 5H5v1h1V5zM5 8H4v1h1V8zm11-5.5l-.5-.5L9 7c-.06-.02-1 0-1 0-.55 0-1 .45-1 1v1c0 .55.45 1 1 1h1c.55 0 1-.45 1-1v-.92l6-5.58zm-1.59 4.09c.19.61.3 1.25.3 1.91 0 3.42-2.78 6.2-6.2 6.2-3.42 0-6.21-2.78-6.21-6.2 0-3.42 2.78-6.2 6.2-6.2 1.2 0 2.31.34 3.27.94l.94-.94A7.459 7.459 0 0 0 8.51 1C4.36 1 1 4.36 1 8.5 1 12.64 4.36 16 8.5 16c4.14 0 7.5-3.36 7.5-7.5 0-1.03-.2-2.02-.59-2.91l-1 1z\"/>"},"database":{"name":"database","figma":{"id":"0:190","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["disks","data"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 15c-3.31 0-6-.9-6-2v-2c0-.17.09-.34.21-.5.67.86 3 1.5 5.79 1.5s5.12-.64 5.79-1.5c.13.16.21.33.21.5v2c0 1.1-2.69 2-6 2zm0-4c-3.31 0-6-.9-6-2V7c0-.11.04-.21.09-.31.03-.06.07-.13.12-.19C.88 7.36 3.21 8 6 8s5.12-.64 5.79-1.5c.05.06.09.13.12.19.05.1.09.21.09.31v2c0 1.1-2.69 2-6 2zm0-4c-3.31 0-6-.9-6-2V4 3c0-1.1 2.69-2 6-2s6 .9 6 2v2c0 1.1-2.69 2-6 2zm0-5c-2.21 0-4 .45-4 1s1.79 1 4 1 4-.45 4-1-1.79-1-4-1z\"/>"},"desktop-download":{"name":"desktop-download","figma":{"id":"0:196","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["clone","download"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z\"/>"},"device-camera-video":{"name":"device-camera-video","figma":{"id":"0:198","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["watch","view","media","stream"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15.2 2.091L10 5.721v-2.72c0-.55-.45-1-1-1H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h8c.55 0 1-.45 1-1v-2.72l5.2 3.63c.33.23.8 0 .8-.41v-10c0-.41-.47-.64-.8-.41z\"/>"},"device-camera":{"name":"device-camera","figma":{"id":"0:202","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["photo","picture","image","snapshot"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15 3H7c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h14c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1zM6 5H2V4h4v1zm4.5 7C8.56 12 7 10.44 7 8.5S8.56 5 10.5 5 14 6.56 14 8.5 12.44 12 10.5 12zM13 8.5c0 1.38-1.13 2.5-2.5 2.5S8 9.87 8 8.5 9.13 6 10.5 6 13 7.13 13 8.5z\"/>"},"device-desktop":{"name":"device-desktop","figma":{"id":"0:208","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["computer","monitor"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15 2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 9H1V3h14v8z\"/>"},"device-mobile":{"name":"device-mobile","figma":{"id":"0:212","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["phone","iphone","cellphone"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M9 0H1C.45 0 0 .45 0 1v14c0 .55.45 1 1 1h8c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1zM5 15.3c-.72 0-1.3-.58-1.3-1.3 0-.72.58-1.3 1.3-1.3.72 0 1.3.58 1.3 1.3 0 .72-.58 1.3-1.3 1.3zM9 12H1V2h8v10z\"/>"},"diff-added":{"name":"diff-added","figma":{"id":"0:217","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["new","addition","plus"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 13H1V2h12v12zM6 9H3V7h3V4h2v3h3v2H8v3H6V9z\"/>"},"diff-ignored":{"name":"diff-ignored","figma":{"id":"0:222","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["slash"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 13H1V2h12v12zm-8.5-2H3v-1.5L9.5 4H11v1.5L4.5 12z\"/>"},"diff-modified":{"name":"diff-modified","figma":{"id":"0:227","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["dot","changed","updated"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 13H1V2h12v12zM4 8c0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3-3-1.34-3-3z\"/>"},"diff-removed":{"name":"diff-removed","figma":{"id":"0:232","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["deleted","subtracted","dash"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 13H1V2h12v12zm-2-5H3V7h8v2z\"/>"},"diff-renamed":{"name":"diff-renamed","figma":{"id":"0:237","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["moved","arrow"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 9H3V7h3V4l5 4-5 4V9zm8-7v12c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h12c.55 0 1 .45 1 1zm-1 0H1v12h12V2z\"/>"},"diff":{"name":"diff","figma":{"id":"0:242","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["difference","changes","compare"],"width":13,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 7h2v1H6v2H5V8H3V7h2V5h1v2zm-3 6h5v-1H3v1zM7.5 2L11 5.5V15c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h6.5zM10 6L7 3H1v12h9V6zM8.5 0H3v1h5l4 4v8h1V4.5L8.5 0z\"/>"},"ellipsis":{"name":"ellipsis","figma":{"id":"0:249","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["dot","read","more","hidden","expand"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11 5H1c-.55 0-1 .45-1 1v4c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V6c0-.55-.45-1-1-1zM4 9H2V7h2v2zm3 0H5V7h2v2zm3 0H8V7h2v2z\"/>"},"eye":{"name":"eye","figma":{"id":"0:255","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["look","watch","see"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8.06 2C3 2 0 8 0 8s3 6 8.06 6C13 14 16 8 16 8s-3-6-7.94-6zM8 12c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4zm2-4c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z\"/>"},"file-binary":{"name":"file-binary","figma":{"id":"0:260","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["image","video","word","powerpoint","excel"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 12h1v1H2v-1h1v-2H2V9h2v3zm8-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5zM8 4H6v1h1v2H6v1h3V7H8V4zM2 4h3v4H2V4zm1 3h1V5H3v2zm3 2h3v4H6V9zm1 3h1v-2H7v2z\"/>"},"file-code":{"name":"file-code","figma":{"id":"0:270","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["text","javascript","html","css","php","ruby","coffeescript","sass","scss"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8.5 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V4.5L8.5 1zM11 14H1V2h7l3 3v9zM5 6.98L3.5 8.5 5 10l-.5 1L2 8.5 4.5 6l.5.98zM7.5 6L10 8.5 7.5 11l-.5-.98L8.5 8.5 7 7l.5-1z\"/>"},"file-directory":{"name":"file-directory","figma":{"id":"0:276","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["folder"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 4H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zM6 4H1V3h5v1z\"/>"},"file-media":{"name":"file-media","figma":{"id":"0:280","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["image","video","audio"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 5h2v2H6V5zm6-.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v11l3-5 2 4 2-2 3 3V5z\"/>"},"file-pdf":{"name":"file-pdf","figma":{"id":"0:285","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["adobe"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8.5 1H1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V4.5L8.5 1zM1 2h4a.68.68 0 0 0-.31.2 1.08 1.08 0 0 0-.23.47 4.22 4.22 0 0 0-.09 1.47c.06.609.173 1.211.34 1.8A21.78 21.78 0 0 1 3.6 8.6c-.5 1-.8 1.66-.91 1.84a7.161 7.161 0 0 0-.69.3 4.19 4.19 0 0 0-1 .64V2zm4.42 4.8a5.65 5.65 0 0 0 1.17 2.09c.275.237.595.417.94.53-.64.09-1.23.2-1.81.33a12.22 12.22 0 0 0-1.81.59c-.587.243.22-.44.61-1.25.365-.74.67-1.51.91-2.3l-.01.01zM11 14H1.5a.743.743 0 0 1-.17 0 2.12 2.12 0 0 0 .73-.44 10.14 10.14 0 0 0 1.78-2.38c.31-.13.58-.23.81-.31l.42-.14c.45-.13.94-.23 1.44-.33s1-.16 1.48-.2c.447.216.912.394 1.39.53.403.11.814.188 1.23.23h.38V14H11zm0-4.86a3.74 3.74 0 0 0-.64-.28 4.22 4.22 0 0 0-.75-.11c-.411.003-.822.03-1.23.08a3 3 0 0 1-1-.64 6.07 6.07 0 0 1-1.29-2.33c.111-.662.178-1.33.2-2 .02-.25.02-.5 0-.75a1.05 1.05 0 0 0-.2-.88.82.82 0 0 0-.61-.23H8l3 3v4.14z\"/>"},"file-submodule":{"name":"file-submodule","figma":{"id":"0:292","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["folder"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 7H4v7h9c.55 0 1-.45 1-1V8h-4V7zM9 9H5V8h4v1zm4-5H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h2V7c0-.55.45-1 1-1h6c.55 0 1 .45 1 1h3V5c0-.55-.45-1-1-1zM6 4H1V3h5v1z\"/>"},"file-symlink-directory":{"name":"file-symlink-directory","figma":{"id":"0:298","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["folder","subfolder","link","alias"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 4H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zM1 3h5v1H1V3zm6 9v-2c-.98-.02-1.84.22-2.55.7-.71.48-1.19 1.25-1.45 2.3.02-1.64.39-2.88 1.13-3.73C4.86 8.43 5.82 8 7.01 8V6l4 3-4 3H7z\"/>"},"file-symlink-file":{"name":"file-symlink-file","figma":{"id":"0:303","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["link","alias"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8.5 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V4.5L8.5 1zM11 14H1V2h7l3 3v9zM6 4.5l4 3-4 3v-2c-.98-.02-1.84.22-2.55.7-.71.48-1.19 1.25-1.45 2.3.02-1.64.39-2.88 1.13-3.73.73-.84 1.69-1.27 2.88-1.27v-2H6z\"/>"},"file":{"name":"file","figma":{"id":"0:308","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["file","text","words"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 5H2V4h4v1zM2 8h7V7H2v1zm0 2h7V9H2v1zm0 2h7v-1H2v1zm10-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5z\"/>"},"file-zip":{"name":"file-zip","figma":{"id":"0:316","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["compress","archive"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8.5 1H1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V4.5L8.5 1zM11 14H1V2h3v1h1V2h3l3 3v9zM5 4V3h1v1H5zM4 4h1v1H4V4zm1 2V5h1v1H5zM4 6h1v1H4V6zm1 2V7h1v1H5zM4 9.28A2 2 0 0 0 3 11v1h4v-1a2 2 0 0 0-2-2V8H4v1.28zM6 10v1H4v-1h2z\"/>"},"flame":{"name":"flame","figma":{"id":"0:325","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["fire","hot","burn","trending"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M5.05.01c.81 2.17.41 3.38-.52 4.31C3.55 5.37 1.98 6.15.9 7.68c-1.45 2.05-1.7 6.53 3.53 7.7-2.2-1.16-2.67-4.52-.3-6.61-.61 2.03.53 3.33 1.94 2.86 1.39-.47 2.3.53 2.27 1.67-.02.78-.31 1.44-1.13 1.81 3.42-.59 4.78-3.42 4.78-5.56 0-2.84-2.53-3.22-1.25-5.61-1.52.13-2.03 1.13-1.89 2.75.09 1.08-1.02 1.8-1.86 1.33-.67-.41-.66-1.19-.06-1.78C8.18 5.01 8.68 2.15 5.05.02L5.03 0l.02.01z\"/>"},"fold":{"name":"fold","figma":{"id":"0:329","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["unfold","hide","collapse"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 9l3 3H8v3H6v-3H4l3-3zm3-6H8V0H6v3H4l3 3 3-3zm4 2c0-.55-.45-1-1-1h-2.5l-1 1h3l-2 2h-7l-2-2h3l-1-1H1c-.55 0-1 .45-1 1l2.5 2.5L0 10c0 .55.45 1 1 1h2.5l1-1h-3l2-2h7l2 2h-3l1 1H13c.55 0 1-.45 1-1l-2.5-2.5L14 5z\"/>"},"gear":{"name":"gear","figma":{"id":"0:334","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["settings"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14 8.76v-1.6l-1.94-.64-.45-1.09.88-1.84-1.13-1.13-1.81.91-1.09-.45L7.77 1h-1.6l-.63 1.94-1.11.45-1.84-.88-1.13 1.13.91 1.81-.45 1.09L0 7.22v1.59l1.94.64.45 1.09-.88 1.84 1.13 1.13 1.81-.91 1.09.45.69 1.92h1.59l.63-1.94 1.11-.45 1.84.88 1.13-1.13-.92-1.81.47-1.09L14 8.74v.02zm-7 2.23c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z\"/>"},"gift":{"name":"gift","figma":{"id":"0:338","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["package","present","skill","craft","freebie"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13.02 4h-1.38c.19-.33.33-.67.36-.91.06-.67-.11-1.22-.52-1.61-.36-.38-.81-.48-1.36-.48h-.11c-.53.02-1.11.25-1.53.58-.42.33-.73.72-.97 1.2-.23-.48-.55-.88-.97-1.2-.42-.32-1-.58-1.53-.58h-.03c-.56 0-1.06.09-1.44.48-.41.39-.58.94-.52 1.61.03.23.17.58.36.91H2c-.55 0-1 .45-1 1v3h1v5c0 .55.45 1 1 1h9c.55 0 1-.45 1-1V8h1V5c0-.55-.45-1-1-1h.02zm-4.78-.88c.17-.36.42-.67.75-.92.3-.23.72-.39 1.05-.41h.09c.45 0 .66.11.8.25s.33.39.3.95c-.05.19-.25.61-.5 1h-2.9l.41-.88v.01zM4.11 2.04c.13-.13.31-.25.91-.25.31 0 .72.17 1.03.41.33.25.58.55.75.92l.42.88h-2.9c-.25-.39-.45-.81-.5-1-.03-.56.16-.81.3-.95l-.01-.01zm2.91 10.95h-4V8h4v5-.01zm0-6h-5V5h5v2-.01zm5 6h-4V8h4v5-.01zm1-6h-5V5h5v2-.01z\"/>"},"gist-secret":{"name":"gist-secret","figma":{"id":"0:347","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["gist","secret","private"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7.782 10.5l1 3.5h-4l1-3.5-.75-1.5h3.5l-.75 1.5zm2-4.5h-6l-2 1h10l-2-1zm-1-4l-2 1-2-1-1 3h6l-1-3zm4.03 7.75L9.782 9l1 2-2 3h3.22c.45 0 .86-.31.97-.75l.56-2.28c.14-.53-.19-1.08-.72-1.22zM3.782 9l-3.03.75c-.53.14-.86.69-.72 1.22l.56 2.28c.11.44.52.75.97.75h3.22l-2-3 1-2z\"/>"},"gist":{"name":"gist","figma":{"id":"0:354","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["gist","github"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7.5 5L10 7.5 7.5 10l-.75-.75L8.5 7.5 6.75 5.75 7.5 5zm-3 0L2 7.5 4.5 10l.75-.75L3.5 7.5l1.75-1.75L4.5 5zM0 13V2c0-.55.45-1 1-1h10c.55 0 1 .45 1 1v11c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1zm1 0h10V2H1v11z\"/>"},"git-branch":{"name":"git-branch","figma":{"id":"0:360","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["fork","branch","git","duplicate"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 5c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v.3c-.02.52-.23.98-.63 1.38-.4.4-.86.61-1.38.63-.83.02-1.48.16-2 .45V4.72a1.993 1.993 0 0 0-1-3.72C.88 1 0 1.89 0 3a2 2 0 0 0 1 1.72v6.56c-.59.35-1 .99-1 1.72 0 1.11.89 2 2 2 1.11 0 2-.89 2-2 0-.53-.2-1-.53-1.36.09-.06.48-.41.59-.47.25-.11.56-.17.94-.17 1.05-.05 1.95-.45 2.75-1.25S8.95 7.77 9 6.73h-.02C9.59 6.37 10 5.73 10 5zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm0 12.41c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm6-8c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/>"},"git-commit":{"name":"git-commit","figma":{"id":"0:366","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["save"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10.86 7c-.45-1.72-2-3-3.86-3-1.86 0-3.41 1.28-3.86 3H0v2h3.14c.45 1.72 2 3 3.86 3 1.86 0 3.41-1.28 3.86-3H14V7h-3.14zM7 10.2c-1.22 0-2.2-.98-2.2-2.2 0-1.22.98-2.2 2.2-2.2 1.22 0 2.2.98 2.2 2.2 0 1.22-.98 2.2-2.2 2.2z\"/>"},"git-compare":{"name":"git-compare","figma":{"id":"0:370","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["difference","changes"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M5 12H4c-.27-.02-.48-.11-.69-.31-.21-.2-.3-.42-.31-.69V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V11c.03.78.34 1.47.94 2.06.6.59 1.28.91 2.06.94h1v2l3-3-3-3v2zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm11 9.48V5c-.03-.78-.34-1.47-.94-2.06-.6-.59-1.28-.91-2.06-.94H9V0L6 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 12 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/>"},"git-merge":{"name":"git-merge","figma":{"id":"0:376","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["join"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 7.01c-.73 0-1.38.41-1.73 1.02v-.02C7.22 7.99 6 7.65 5.14 6.99c-.75-.58-1.5-1.61-1.89-2.44A1.993 1.993 0 0 0 2 1C.89 1 0 1.9 0 3.01a2 2 0 0 0 1 1.72v6.56c-.59.35-1 .99-1 1.72 0 1.11.89 2 2 2a1.993 1.993 0 0 0 1-3.72V7.68c.67.7 1.44 1.27 2.3 1.69.86.42 2.03.63 2.97.64v-.02c.36.61 1 1.02 1.73 1.02 1.11 0 2-.89 2-2 0-1.11-.89-2-2-2zm-6.8 6c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.21c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm8 6c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/>"},"git-pull-request":{"name":"git-pull-request","figma":{"id":"0:382","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["review"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/>"},"globe":{"name":"globe","figma":{"id":"0:389","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["world","earth","planet"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 1C3.14 1 0 4.14 0 8s3.14 7 7 7c.48 0 .94-.05 1.38-.14-.17-.08-.2-.73-.02-1.09.19-.41.81-1.45.2-1.8-.61-.35-.44-.5-.81-.91-.37-.41-.22-.47-.25-.58-.08-.34.36-.89.39-.94.02-.06.02-.27 0-.33 0-.08-.27-.22-.34-.23-.06 0-.11.11-.2.13-.09.02-.5-.25-.59-.33-.09-.08-.14-.23-.27-.34-.13-.13-.14-.03-.33-.11s-.8-.31-1.28-.48c-.48-.19-.52-.47-.52-.66-.02-.2-.3-.47-.42-.67-.14-.2-.16-.47-.2-.41-.04.06.25.78.2.81-.05.02-.16-.2-.3-.38-.14-.19.14-.09-.3-.95s.14-1.3.17-1.75c.03-.45.38.17.19-.13-.19-.3 0-.89-.14-1.11-.13-.22-.88.25-.88.25.02-.22.69-.58 1.16-.92.47-.34.78-.06 1.16.05.39.13.41.09.28-.05-.13-.13.06-.17.36-.13.28.05.38.41.83.36.47-.03.05.09.11.22s-.06.11-.38.3c-.3.2.02.22.55.61s.38-.25.31-.55c-.07-.3.39-.06.39-.06.33.22.27.02.5.08.23.06.91.64.91.64-.83.44-.31.48-.17.59.14.11-.28.3-.28.3-.17-.17-.19.02-.3.08-.11.06-.02.22-.02.22-.56.09-.44.69-.42.83 0 .14-.38.36-.47.58-.09.2.25.64.06.66-.19.03-.34-.66-1.31-.41-.3.08-.94.41-.59 1.08.36.69.92-.19 1.11-.09.19.1-.06.53-.02.55.04.02.53.02.56.61.03.59.77.53.92.55.17 0 .7-.44.77-.45.06-.03.38-.28 1.03.09.66.36.98.31 1.2.47.22.16.08.47.28.58.2.11 1.06-.03 1.28.31.22.34-.88 2.09-1.22 2.28-.34.19-.48.64-.84.92s-.81.64-1.27.91c-.41.23-.47.66-.66.8 3.14-.7 5.48-3.5 5.48-6.84 0-3.86-3.14-7-7-7L7 1zm1.64 6.56c-.09.03-.28.22-.78-.08-.48-.3-.81-.23-.86-.28 0 0-.05-.11.17-.14.44-.05.98.41 1.11.41.13 0 .19-.13.41-.05.22.08.05.13-.05.14zM6.34 1.7c-.05-.03.03-.08.09-.14.03-.03.02-.11.05-.14.11-.11.61-.25.52.03-.11.27-.58.3-.66.25zm1.23.89c-.19-.02-.58-.05-.52-.14.3-.28-.09-.38-.34-.38-.25-.02-.34-.16-.22-.19.12-.03.61.02.7.08.08.06.52.25.55.38.02.13 0 .25-.17.25zm1.47-.05c-.14.09-.83-.41-.95-.52-.56-.48-.89-.31-1-.41-.11-.1-.08-.19.11-.34.19-.15.69.06 1 .09.3.03.66.27.66.55.02.25.33.5.19.63h-.01z\"/>"},"graph":{"name":"graph","figma":{"id":"0:396","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["trend","stats","statistics"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M16 14v1H0V0h1v14h15zM5 13H3V8h2v5zm4 0H7V3h2v10zm4 0h-2V6h2v7z\"/>"},"heart":{"name":"heart","figma":{"id":"0:400","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["love","beat"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11.2 3c-.52-.63-1.25-.95-2.2-1-.97 0-1.69.42-2.2 1-.51.58-.78.92-.8 1-.02-.08-.28-.42-.8-1-.52-.58-1.17-1-2.2-1-.95.05-1.69.38-2.2 1-.52.61-.78 1.28-.8 2 0 .52.09 1.52.67 2.67C1.25 8.82 3.01 10.61 6 13c2.98-2.39 4.77-4.17 5.34-5.33C11.91 6.51 12 5.5 12 5c-.02-.72-.28-1.39-.8-2.02V3z\"/>"},"history":{"name":"history","figma":{"id":"0:404","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["time","past","revert","back"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 13H6V6h5v2H8v5zM7 1C4.81 1 2.87 2.02 1.59 3.59L0 2v4h4L2.5 4.5C3.55 3.17 5.17 2.3 7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-.34.03-.67.09-1H.08C.03 7.33 0 7.66 0 8c0 3.86 3.14 7 7 7s7-3.14 7-7-3.14-7-7-7z\"/>"},"home":{"name":"home","figma":{"id":"0:408","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["welcome","index","house","building"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M16 9l-3-3V2h-2v2L8 1 0 9h2l1 5c0 .55.45 1 1 1h8c.55 0 1-.45 1-1l1-5h2zm-4 5H9v-4H7v4H4L2.81 7.69 8 2.5l5.19 5.19L12 14z\"/>"},"horizontal-rule":{"name":"horizontal-rule","figma":{"id":"0:412","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["hr"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M1 7h2v2h1V3H3v3H1V3H0v6h1V7zm9 2V7H9v2h1zm0-3V4H9v2h1zM7 6V4h2V3H6v6h1V7h2V6H7zm-7 7h10v-2H0v2z\"/>"},"hubot":{"name":"hubot","figma":{"id":"0:419","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["robot","bot"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M3 6c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h8c.55 0 1-.45 1-1V7c0-.55-.45-1-1-1H3zm8 1.75L9.75 9h-1.5L7 7.75 5.75 9h-1.5L3 7.75V7h.75L5 8.25 6.25 7h1.5L9 8.25 10.25 7H11v.75zM5 11h4v1H5v-1zm2-9C3.14 2 0 4.91 0 8.5V13c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V8.5C14 4.91 10.86 2 7 2zm6 11H1V8.5c0-3.09 2.64-5.59 6-5.59s6 2.5 6 5.59V13z\"/>"},"inbox":{"name":"inbox","figma":{"id":"0:426","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["mail","todo","new","messages"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14 9l-1.13-7.14c-.08-.48-.5-.86-1-.86H2.13c-.5 0-.92.38-1 .86L0 9v5c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V9zm-3.28.55l-.44.89c-.17.34-.52.56-.91.56H4.61c-.38 0-.72-.22-.89-.55l-.44-.91c-.17-.33-.52-.55-.89-.55H1l1-7h10l1 7h-1.38c-.39 0-.73.22-.91.55l.01.01z\"/>"},"info":{"name":"info","figma":{"id":"0:430","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["help"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6.3 5.71a.942.942 0 0 1-.28-.7c0-.28.09-.52.28-.7.19-.18.42-.28.7-.28.28 0 .52.09.7.28.18.19.28.42.28.7 0 .28-.09.52-.28.7a1 1 0 0 1-.7.3c-.28 0-.52-.11-.7-.3zM8 8.01c-.02-.25-.11-.48-.31-.69-.2-.19-.42-.3-.69-.31H6c-.27.02-.48.13-.69.31-.2.2-.3.44-.31.69h1v3c.02.27.11.5.31.69.2.2.42.31.69.31h1c.27 0 .48-.11.69-.31.2-.19.3-.42.31-.69H8V8v.01zM7 2.32C3.86 2.32 1.3 4.86 1.3 8c0 3.14 2.56 5.7 5.7 5.7s5.7-2.55 5.7-5.7c0-3.15-2.56-5.69-5.7-5.69v.01zM7 1c3.86 0 7 3.14 7 7s-3.14 7-7 7-7-3.12-7-7 3.14-7 7-7z\"/>"},"issue-closed":{"name":"issue-closed","figma":{"id":"0:436","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["done","complete"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 10h2v2H7v-2zm2-6H7v5h2V4zm1.5 1.5l-1 1L12 9l4-4.5-1-1L12 7l-1.5-1.5zM8 13.7A5.71 5.71 0 0 1 2.3 8c0-3.14 2.56-5.7 5.7-5.7 1.83 0 3.45.88 4.5 2.2l.92-.92A6.947 6.947 0 0 0 8 1C4.14 1 1 4.14 1 8s3.14 7 7 7 7-3.14 7-7l-1.52 1.52c-.66 2.41-2.86 4.19-5.48 4.19v-.01z\"/>"},"issue-opened":{"name":"issue-opened","figma":{"id":"0:442","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["new"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z\"/>"},"issue-reopened":{"name":"issue-reopened","figma":{"id":"0:448","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["regression"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 9H6V4h2v5zm-2 3h2v-2H6v2zm6.33-2H10l1.5 1.5c-1.05 1.33-2.67 2.2-4.5 2.2A5.71 5.71 0 0 1 1.3 8c0-.34.03-.67.09-1H.08C.03 7.33 0 7.66 0 8c0 3.86 3.14 7 7 7 2.19 0 4.13-1.02 5.41-2.59L14 14v-4h-1.67zM1.67 6H4L2.5 4.5C3.55 3.17 5.17 2.3 7 2.3c3.14 0 5.7 2.56 5.7 5.7 0 .34-.03.67-.09 1h1.31c.05-.33.08-.66.08-1 0-3.86-3.14-7-7-7-2.19 0-4.13 1.02-5.41 2.59L0 2v4h1.67z\"/>"},"italic":{"name":"italic","figma":{"id":"0:454","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["font","italic","style"],"width":6,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M2.81 5h1.98L3 14H1l1.81-9zm.36-2.7c0-.7.58-1.3 1.33-1.3.56 0 1.13.38 1.13 1.03 0 .75-.59 1.3-1.33 1.3-.58 0-1.13-.38-1.13-1.03z\"/>"},"jersey":{"name":"jersey","figma":{"id":"0:458","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["team","game","basketball"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4.5 6l-.5.5v5l.5.5h2l.5-.5v-5L6.5 6h-2zM6 11H5V7h1v4zm6.27-7.25C12.05 2.37 11.96 1.12 12 0H9.02c0 .27-.13.48-.39.69-.25.2-.63.3-1.13.3-.5 0-.88-.09-1.13-.3-.23-.2-.36-.42-.36-.69H3c.05 1.13-.03 2.38-.25 3.75C2.55 5.13 1.95 5.88 1 6v9c.02.27.11.48.31.69.2.21.42.3.69.31h11c.27-.02.48-.11.69-.31.21-.2.3-.42.31-.69V6c-.95-.13-1.53-.88-1.75-2.25h.02zM13 15H2V7c.89-.5 1.48-1.25 1.72-2.25S4.03 2.5 4 1h1c-.02.78.16 1.47.52 2.06.36.58 1.02.89 2 .94.98-.02 1.64-.33 2-.94.36-.59.5-1.28.48-2.06h1c.02 1.42.13 2.55.33 3.38.2.81.69 2 1.67 2.63v8V15zM8.5 6l-.5.5v5l.5.5h2l.5-.5v-5l-.5-.5h-2zm1.5 5H9V7h1v4z\"/>"},"keyboard":{"name":"keyboard","figma":{"id":"0:466","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["type","keys","write","shortcuts"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 5H9V4h1v1zM3 6H2v1h1V6zm5-2H7v1h1V4zM4 4H2v1h2V4zm8 7h2v-1h-2v1zM8 7h1V6H8v1zm-4 3H2v1h2v-1zm8-6h-1v1h1V4zm2 0h-1v1h1V4zm-2 5h2V6h-2v3zm4-6v9c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h14c.55 0 1 .45 1 1zm-1 0H1v9h14V3zM6 7h1V6H6v1zm0-3H5v1h1V4zM4 7h1V6H4v1zm1 4h6v-1H5v1zm5-4h1V6h-1v1zM3 8H2v1h1V8zm5 0v1h1V8H8zM6 8v1h1V8H6zM5 8H4v1h1V8zm5 1h1V8h-1v1z\"/>"},"law":{"name":"law","figma":{"id":"0:490","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["legal","bill"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 4c-.83 0-1.5-.67-1.5-1.5S6.17 1 7 1s1.5.67 1.5 1.5S7.83 4 7 4zm7 6c0 1.11-.89 2-2 2h-1c-1.11 0-2-.89-2-2l2-4h-1c-.55 0-1-.45-1-1H8v8c.42 0 1 .45 1 1h1c.42 0 1 .45 1 1H3c0-.55.58-1 1-1h1c0-.55.58-1 1-1h.03L6 5H5c0 .55-.45 1-1 1H3l2 4c0 1.11-.89 2-2 2H2c-1.11 0-2-.89-2-2l2-4H1V5h3c0-.55.45-1 1-1h4c.55 0 1 .45 1 1h3v1h-1l2 4zM2.5 7L1 10h3L2.5 7zM13 10l-1.5-3-1.5 3h3z\"/>"},"link":{"name":"link","figma":{"id":"0:496","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["connect","hyperlink"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z\"/>"},"list-ordered":{"name":"list-ordered","figma":{"id":"0:500","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["numbers","tasks","todo","items"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12.01 13c0 .59 0 1-.59 1H4.6c-.59 0-.59-.41-.59-1 0-.59 0-1 .59-1h6.81c.59 0 .59.41.59 1h.01zM4.6 4h6.81C12 4 12 3.59 12 3c0-.59 0-1-.59-1H4.6c-.59 0-.59.41-.59 1 0 .59 0 1 .59 1zm6.81 3H4.6c-.59 0-.59.41-.59 1 0 .59 0 1 .59 1h6.81C12 9 12 8.59 12 8c0-.59 0-1-.59-1zm-9.4-6h-.72c-.3.19-.58.25-1.03.34V2h.75v2.14H.17V5h2.84v-.86h-1V1zm.25 8.13c-.17 0-.45.03-.66.06.53-.56 1.14-1.25 1.14-1.89C2.72 6.52 2.18 6 1.38 6c-.59 0-.97.2-1.38.64l.58.58c.19-.19.38-.38.64-.38.28 0 .48.16.48.52 0 .53-.77 1.2-1.7 2.06V10h3l-.09-.88h-.66l.01.01zm-.08 3.78v-.03c.44-.19.64-.47.64-.86 0-.7-.56-1.11-1.44-1.11-.48 0-.89.19-1.28.52l.55.64c.25-.2.44-.31.69-.31.27 0 .42.13.42.36 0 .27-.2.44-.86.44v.75c.83 0 .98.17.98.47 0 .25-.23.38-.58.38-.28 0-.56-.14-.81-.38l-.48.66c.3.36.77.56 1.41.56.83 0 1.53-.41 1.53-1.16 0-.5-.31-.81-.77-.94v.01z\"/>"},"list-unordered":{"name":"list-unordered","figma":{"id":"0:508","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["bullet","point","tasks","todo","items"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M2 13c0 .59 0 1-.59 1H.59C0 14 0 13.59 0 13c0-.59 0-1 .59-1h.81c.59 0 .59.41.59 1H2zm2.59-9h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1H4.59C4 2 4 2.41 4 3c0 .59 0 1 .59 1zM1.41 7H.59C0 7 0 7.41 0 8c0 .59 0 1 .59 1h.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm0-5H.59C0 2 0 2.41 0 3c0 .59 0 1 .59 1h.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm10 5H4.59C4 7 4 7.41 4 8c0 .59 0 1 .59 1h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm0 5H4.59C4 12 4 12.41 4 13c0 .59 0 1 .59 1h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01z\"/>"},"location":{"name":"location","figma":{"id":"0:516","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["here","marker"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 0C2.69 0 0 2.5 0 5.5 0 10.02 6 16 6 16s6-5.98 6-10.5C12 2.5 9.31 0 6 0zm0 14.55C4.14 12.52 1 8.44 1 5.5 1 3.02 3.25 1 6 1c1.34 0 2.61.48 3.56 1.36.92.86 1.44 1.97 1.44 3.14 0 2.94-3.14 7.02-5 9.05zM8 5.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z\"/>"},"lock":{"name":"lock","figma":{"id":"0:521","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["secure","safe","protected"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 13H3v-1h1v1zm8-6v7c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V7c0-.55.45-1 1-1h1V4c0-2.2 1.8-4 4-4s4 1.8 4 4v2h1c.55 0 1 .45 1 1zM3.8 6h4.41V4c0-1.22-.98-2.2-2.2-2.2-1.22 0-2.2.98-2.2 2.2v2H3.8zM11 7H2v7h9V7zM4 8H3v1h1V8zm0 2H3v1h1v-1z\"/>"},"logo-gist":{"name":"logo-gist","figma":{"id":"0:529","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["brand","github","logo"],"width":25,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4.7 8.73h2.45v4.02c-.55.27-1.64.34-2.53.34-2.56 0-3.47-2.2-3.47-5.05 0-2.85.91-5.06 3.48-5.06 1.28 0 2.06.23 3.28.73V2.66C7.27 2.33 6.25 2 4.63 2 1.13 2 0 4.69 0 8.03c0 3.34 1.11 6.03 4.63 6.03 1.64 0 2.81-.27 3.59-.64V7.73H4.7v1zm6.39 3.72V6.06h-1.05v6.28c0 1.25.58 1.72 1.72 1.72v-.89c-.48 0-.67-.16-.67-.7v-.02zm.25-8.72c0-.44-.33-.78-.78-.78s-.77.34-.77.78.33.78.77.78.78-.34.78-.78zm4.34 5.69c-1.5-.13-1.78-.48-1.78-1.17 0-.77.33-1.34 1.88-1.34 1.05 0 1.66.16 2.27.36v-.94c-.69-.3-1.52-.39-2.25-.39-2.2 0-2.92 1.2-2.92 2.31 0 1.08.47 1.88 2.73 2.08 1.55.13 1.77.63 1.77 1.34 0 .73-.44 1.42-2.06 1.42-1.11 0-1.86-.19-2.33-.36v.94c.5.2 1.58.39 2.33.39 2.38 0 3.14-1.2 3.14-2.41 0-1.28-.53-2.03-2.75-2.23h-.03zm8.58-2.47v-.86h-2.42v-2.5l-1.08.31v2.11l-1.56.44v.48h1.56v5c0 1.53 1.19 2.13 2.5 2.13.19 0 .52-.02.69-.05v-.89c-.19.03-.41.03-.61.03-.97 0-1.5-.39-1.5-1.34V6.94h2.42v.02-.01z\"/>"},"logo-github":{"name":"logo-github","figma":{"id":"0:536","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["brand","github","logo"],"width":45,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M18.53 12.03h-.02c.009 0 .015.01.024.011h.006l-.01-.01zm.004.011c-.093.001-.327.05-.574.05-.78 0-1.05-.36-1.05-.83V8.13h1.59c.09 0 .16-.08.16-.19v-1.7c0-.09-.08-.17-.16-.17h-1.59V3.96c0-.08-.05-.13-.14-.13h-2.16c-.09 0-.14.05-.14.13v2.17s-1.09.27-1.16.28c-.08.02-.13.09-.13.17v1.36c0 .11.08.19.17.19h1.11v3.28c0 2.44 1.7 2.69 2.86 2.69.53 0 1.17-.17 1.27-.22.06-.02.09-.09.09-.16v-1.5a.177.177 0 0 0-.146-.18zm23.696-2.2c0-1.81-.73-2.05-1.5-1.97-.6.04-1.08.34-1.08.34v3.52s.49.34 1.22.36c1.03.03 1.36-.34 1.36-2.25zm2.43-.16c0 3.43-1.11 4.41-3.05 4.41-1.64 0-2.52-.83-2.52-.83s-.04.46-.09.52c-.03.06-.08.08-.14.08h-1.48c-.1 0-.19-.08-.19-.17l.02-11.11c0-.09.08-.17.17-.17h2.13c.09 0 .17.08.17.17v3.77s.82-.53 2.02-.53l-.01-.02c1.2 0 2.97.45 2.97 3.88zm-8.72-3.61H33.84c-.11 0-.17.08-.17.19v5.44s-.55.39-1.3.39-.97-.34-.97-1.09V6.25c0-.09-.08-.17-.17-.17h-2.14c-.09 0-.17.08-.17.17v5.11c0 2.2 1.23 2.75 2.92 2.75 1.39 0 2.52-.77 2.52-.77s.05.39.08.45c.02.05.09.09.16.09h1.34c.11 0 .17-.08.17-.17l.02-7.47c0-.09-.08-.17-.19-.17zm-23.7-.01h-2.13c-.09 0-.17.09-.17.2v7.34c0 .2.13.27.3.27h1.92c.2 0 .25-.09.25-.27V6.23c0-.09-.08-.17-.17-.17zm-1.05-3.38c-.77 0-1.38.61-1.38 1.38 0 .77.61 1.38 1.38 1.38.75 0 1.36-.61 1.36-1.38 0-.77-.61-1.38-1.36-1.38zm16.49-.25h-2.11c-.09 0-.17.08-.17.17v4.09h-3.31V2.6c0-.09-.08-.17-.17-.17h-2.13c-.09 0-.17.08-.17.17v11.11c0 .09.09.17.17.17h2.13c.09 0 .17-.08.17-.17V8.96h3.31l-.02 4.75c0 .09.08.17.17.17h2.13c.09 0 .17-.08.17-.17V2.6c0-.09-.08-.17-.17-.17zM8.81 7.35v5.74c0 .04-.01.11-.06.13 0 0-1.25.89-3.31.89-2.49 0-5.44-.78-5.44-5.92S2.58 1.99 5.1 2c2.18 0 3.06.49 3.2.58.04.05.06.09.06.14L7.94 4.5c0 .09-.09.2-.2.17-.36-.11-.9-.33-2.17-.33-1.47 0-3.05.42-3.05 3.73s1.5 3.7 2.58 3.7c.92 0 1.25-.11 1.25-.11v-2.3H4.88c-.11 0-.19-.08-.19-.17V7.35c0-.09.08-.17.19-.17h3.74c.11 0 .19.08.19.17z\"/>"},"mail-read":{"name":"mail-read","figma":{"id":"0:547","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["email","open"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 5H4V4h2v1zm3 1H4v1h5V6zm5-.48V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V5.52c0-.33.16-.63.42-.81L2 3.58V3c0-.55.45-1 1-1h1.2L7 0l2.8 2H11c.55 0 1 .45 1 1v.58l1.58 1.13c.27.19.42.48.42.81zM3 7.5L7 10l4-2.5V3H3v4.5zm-2 6l4.5-3-4.5-3v6zm11 .5l-5-3-5 3h10zm1-6.5l-4.5 3 4.5 3v-6z\"/>"},"reply":{"name":"reply","figma":{"id":"0:554","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["reply all","back"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6.5 3.5c3.92.44 8 3.125 8 10-2.312-5.062-4.75-6-8-6V11L1 5.5 6.5 0v3.5z\"/>"},"mail":{"name":"mail","figma":{"id":"0:558","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["email","unread"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M0 4v8c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1H1c-.55 0-1 .45-1 1zm13 0L7 9 1 4h12zM1 5.5l4 3-4 3v-6zM2 12l3.5-3L7 10.5 8.5 9l3.5 3H2zm11-.5l-4-3 4-3v6z\"/>"},"mark-github":{"name":"mark-github","figma":{"id":"0:563","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["octocat","brand","github","logo"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z\"/>"},"markdown":{"name":"markdown","figma":{"id":"0:567","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["markup","style"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14.85 3H1.15C.52 3 0 3.52 0 4.15v7.69C0 12.48.52 13 1.15 13h13.69c.64 0 1.15-.52 1.15-1.15v-7.7C16 3.52 15.48 3 14.85 3zM9 11H7V8L5.5 9.92 4 8v3H2V5h2l1.5 2L7 5h2v6zm2.99.5L9.5 8H11V5h2v3h1.5l-2.51 3.5z\"/>"},"megaphone":{"name":"megaphone","figma":{"id":"0:572","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["bullhorn","loud","shout","broadcast"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 1c-.17 0-.36.05-.52.14C8.04 2.02 4.5 4.58 3 5c-1.38 0-3 .67-3 2.5S1.63 10 3 10c.3.08.64.23 1 .41V15h2v-3.45c1.34.86 2.69 1.83 3.48 2.31.16.09.34.14.52.14.52 0 1-.42 1-1V2c0-.58-.48-1-1-1zm0 12c-.38-.23-.89-.58-1.5-1-.16-.11-.33-.22-.5-.34V3.31c.16-.11.31-.2.47-.31.61-.41 1.16-.77 1.53-1v11zm2-6h4v1h-4V7zm0 2l4 2v1l-4-2V9zm4-6v1l-4 2V5l4-2z\"/>"},"mention":{"name":"mention","figma":{"id":"0:579","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["at","ping"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6.58 15c1.25 0 2.52-.31 3.56-.94l-.42-.94c-.84.52-1.89.83-3.03.83-3.23 0-5.64-2.08-5.64-5.72 0-4.37 3.23-7.18 6.58-7.18 3.45 0 5.22 2.19 5.22 5.2 0 2.39-1.34 3.86-2.5 3.86-1.05 0-1.36-.73-1.05-2.19l.73-3.75H8.98l-.11.72c-.41-.63-.94-.83-1.56-.83-2.19 0-3.66 2.39-3.66 4.38 0 1.67.94 2.61 2.3 2.61.84 0 1.67-.53 2.3-1.25.11.94.94 1.45 1.98 1.45 1.67 0 3.77-1.67 3.77-5C14 2.61 11.59 0 7.83 0 3.66 0 0 3.33 0 8.33 0 12.71 2.92 15 6.58 15zm-.31-5c-.73 0-1.36-.52-1.36-1.67 0-1.45.94-3.22 2.41-3.22.52 0 .84.2 1.25.83l-.52 3.02c-.63.73-1.25 1.05-1.78 1.05V10z\"/>"},"milestone":{"name":"milestone","figma":{"id":"0:583","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["marker"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 2H6V0h2v2zm4 5H2c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h10l2 2-2 2zM8 4H6v2h2V4zM6 16h2V8H6v8z\"/>"},"mirror":{"name":"mirror","figma":{"id":"0:589","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["reflect"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15.5 4.7L8.5 0l-7 4.7c-.3.19-.5.45-.5.8V16l7.5-4 7.5 4V5.5c0-.34-.2-.61-.5-.8zm-.5 9.8l-6-3.25V10H8v1.25L2 14.5v-9l6-4V6h1V1.5l6 4v9zM6 7h5V5l3 3-3 3V9H6v2L3 8l3-3v2z\"/>"},"mortar-board":{"name":"mortar-board","figma":{"id":"0:594","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["education","learn","teach"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7.808 9.405l-3.83-1.19c-4-8 0 1.5 0 2.5s1.8 1.5 4 1.5 4-.5 4-1.5v-2.5l-3.83 1.19a.73.73 0 0 1-.36 0h.02zm.28-6.39a.34.34 0 0 0-.2 0l-7.64 2.38a.35.35 0 0 0 0 .67l1.73.55v1.77c-.3.17-.5.5-.5.86 0 .19.05.36.14.5-.08.14-.14.31-.14.5v2.58c0 .55 2 .55 2 0v-2.58c0-.19-.05-.36-.14-.5.08-.14.14-.31.14-.5 0-.38-.2-.69-.5-.86v-1.45l4.89 1.53c.06.02.14.02.2 0l7.64-2.38a.35.35 0 0 0 0-.67l-7.63-2.39.01-.01zm-.09 3.2c-.55 0-1-.22-1-.5s.45-.5 1-.5 1 .22 1 .5-.45.5-1 .5z\"/>"},"mute":{"name":"mute","figma":{"id":"0:599","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["quiet","sound","audio","turn","off"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 2.75v10.38c0 .67-.81 1-1.28.53L3 9.94H1c-.55 0-1-.45-1-1v-2c0-.55.45-1 1-1h2l3.72-3.72C7.19 1.75 8 2.08 8 2.75zm7.53 3.22l-1.06-1.06-1.97 1.97-1.97-1.97-1.06 1.06 1.97 1.97-1.97 1.97 1.06 1.06L12.5 9l1.97 1.97 1.06-1.06-1.97-1.97 1.97-1.97z\"/>"},"no-newline":{"name":"no-newline","figma":{"id":"0:603","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["return"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M16 5v3c0 .55-.45 1-1 1h-3v2L9 8l3-3v2h2V5h2zM8 8c0 2.2-1.8 4-4 4s-4-1.8-4-4 1.8-4 4-4 4 1.8 4 4zM1.5 9.66L5.66 5.5C5.18 5.19 4.61 5 4 5 2.34 5 1 6.34 1 8c0 .61.19 1.17.5 1.66zM7 8c0-.61-.19-1.17-.5-1.66L2.34 10.5c.48.31 1.05.5 1.66.5 1.66 0 3-1.34 3-3z\"/>"},"octoface":{"name":"octoface","figma":{"id":"0:609","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["octocat","brand"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14.7 5.34c.13-.32.55-1.59-.13-3.31 0 0-1.05-.33-3.44 1.3-1-.28-2.07-.32-3.13-.32s-2.13.04-3.13.32c-2.39-1.64-3.44-1.3-3.44-1.3-.68 1.72-.26 2.99-.13 3.31C.49 6.21 0 7.33 0 8.69 0 13.84 3.33 15 7.98 15S16 13.84 16 8.69c0-1.36-.49-2.48-1.3-3.35zM8 14.02c-3.3 0-5.98-.15-5.98-3.35 0-.76.38-1.48 1.02-2.07 1.07-.98 2.9-.46 4.96-.46 2.07 0 3.88-.52 4.96.46.65.59 1.02 1.3 1.02 2.07 0 3.19-2.68 3.35-5.98 3.35zM5.49 9.01c-.66 0-1.2.8-1.2 1.78s.54 1.79 1.2 1.79c.66 0 1.2-.8 1.2-1.79s-.54-1.78-1.2-1.78zm5.02 0c-.66 0-1.2.79-1.2 1.78s.54 1.79 1.2 1.79c.66 0 1.2-.8 1.2-1.79s-.53-1.78-1.2-1.78z\"/>"},"organization":{"name":"organization","figma":{"id":"0:613","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["people","group","team"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M16 12.999c0 .439-.45 1-1 1H7.995c-.539 0-.994-.447-.995-.999H1c-.54 0-1-.561-1-1 0-2.634 3-4 3-4s.229-.409 0-1c-.841-.621-1.058-.59-1-3 .058-2.419 1.367-3 2.5-3s2.442.58 2.5 3c.058 2.41-.159 2.379-1 3-.229.59 0 1 0 1s1.549.711 2.42 2.088A6.78 6.78 0 0 1 10 8.999s.229-.409 0-1c-.841-.62-1.058-.59-1-3 .058-2.419 1.367-3 2.5-3s2.437.581 2.495 3c.059 2.41-.158 2.38-1 3-.229.59 0 1 0 1s3.005 1.366 3.005 4z\"/>"},"package":{"name":"package","figma":{"id":"0:617","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["box","ship"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M1 4.732v7.47c0 .45.3.84.75.97l6.5 1.73c.16.05.34.05.5 0l6.5-1.73c.45-.13.75-.52.75-.97v-7.47c0-.45-.3-.84-.75-.97l-6.5-1.74a1.4 1.4 0 0 0-.5 0l-6.5 1.74c-.45.13-.75.52-.75.97zm7 9.09l-6-1.59v-6.77l6 1.61v6.75zm-6-9.36l2.5-.67 6.5 1.73-2.5.67L2 4.463zm13 7.77l-6 1.59v-6.75l2-.55v2.44l2-.53v-2.44l2-.53v6.77zm-2-7.24l-6.5-1.73 2-.53 6.5 1.73-2 .53z\"/>"},"paintcan":{"name":"paintcan","figma":{"id":"0:624","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["style","theme","art","color"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 0C2.69 0 0 2.69 0 6v1c0 .55.45 1 1 1v5c0 1.1 2.24 2 5 2s5-.9 5-2V8c.55 0 1-.45 1-1V6c0-3.31-2.69-6-6-6zm3 10v.5c0 .28-.22.5-.5.5s-.5-.22-.5-.5V10c0-.28-.22-.5-.5-.5s-.5.22-.5.5v2.5c0 .28-.22.5-.5.5s-.5-.22-.5-.5v-2c0-.28-.22-.5-.5-.5s-.5.22-.5.5v.5c0 .55-.45 1-1 1s-1-.45-1-1v-1c-.55 0-1-.45-1-1V7.2c.91.49 2.36.8 4 .8 1.64 0 3.09-.31 4-.8V9c0 .55-.45 1-1 1zM6 7c-1.68 0-3.12-.41-3.71-1C2.88 5.41 4.32 5 6 5c1.68 0 3.12.41 3.71 1-.59.59-2.03 1-3.71 1zm0-3c-2.76 0-5 .89-5 2 0-2.76 2.24-5 5-5s5 2.24 5 5c0-1.1-2.24-2-5-2z\"/>"},"pencil":{"name":"pencil","figma":{"id":"0:630","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["edit","change","update","write"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M0 11.592v3h3l8-8-3-3-8 8zm3 2H1v-2h1v1h1v1zm10.3-9.3l-1.3 1.3-3-3 1.3-1.3a.996.996 0 0 1 1.41 0l1.59 1.59c.39.39.39 1.02 0 1.41z\"/>"},"person":{"name":"person","figma":{"id":"0:633","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["people","man","woman","human"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12 14.002a.998.998 0 0 1-.998.998H1.001A1 1 0 0 1 0 13.999V13c0-2.633 4-4 4-4s.229-.409 0-1c-.841-.62-.944-1.59-1-4 .173-2.413 1.867-3 3-3s2.827.586 3 3c-.056 2.41-.159 3.38-1 4-.229.59 0 1 0 1s4 1.367 4 4v1.002z\"/>"},"pin":{"name":"pin","figma":{"id":"0:635","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["save","star","bookmark"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 1.494v.8l.5 1-4.5 3H2.2c-.44 0-.67.53-.34.86L5 10.294l-4 5 5-4 3.14 3.14a.5.5 0 0 0 .86-.34v-3.8l3-4.5 1 .5h.8c.44 0 .67-.53.34-.86l-4.28-4.28a.5.5 0 0 0-.86.34z\"/>"},"plug":{"name":"plug","figma":{"id":"0:637","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["hook","webhook"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14 6V5h-4V3H8v1H6c-1.03 0-1.77.81-2 2L3 7c-1.66 0-3 1.34-3 3v2h1v-2c0-1.11.89-2 2-2l1 1c.25 1.16.98 2 2 2h2v1h2v-2h4V9h-4V6h4z\"/>"},"plus":{"name":"plus","figma":{"id":"0:639","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["add","new","more"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12 9H7v5H5V9H0V7h5V2h2v5h5v2z\"/>"},"primitive-dot":{"name":"primitive-dot","figma":{"id":"0:641","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["circle"],"width":8,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M0 8c0-2.2 1.8-4 4-4s4 1.8 4 4-1.8 4-4 4-4-1.8-4-4z\"/>"},"primitive-square":{"name":"primitive-square","figma":{"id":"0:643","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["box"],"width":8,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 12H0V4h8v8z\"/>"},"pulse":{"name":"pulse","figma":{"id":"0:645","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["graph","trend","line","activity"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11.5 8.4L8.8 5.8 6.6 8.9 5.5 2 2.38 8.4H0v2h3.6l.9-1.8.9 5.4L9 8.9l1.6 1.5H14v-2h-2.5z\"/>"},"question":{"name":"question","figma":{"id":"0:649","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["help","explain"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 10h2v2H6v-2zm4-3.5C10 8.64 8 9 8 9H6c0-.55.45-1 1-1h.5c.28 0 .5-.22.5-.5v-1c0-.28-.22-.5-.5-.5h-1c-.28 0-.5.22-.5.5V7H4c0-1.5 1.5-3 3-3s3 1 3 2.5zM7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7z\"/>"},"quote":{"name":"quote","figma":{"id":"0:655","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["quotation"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6.16 3.84C3.73 5.4 2.55 7.01 2.55 9.7c.16-.05.3-.05.44-.05 1.27 0 2.5.86 2.5 2.41 0 1.61-1.03 2.61-2.5 2.61-1.9 0-2.99-1.52-2.99-4.25C0 6.62 1.75 3.89 5.02 2l1.14 1.84zm7 0C10.73 5.4 9.55 7.01 9.55 9.7c.16-.05.3-.05.44-.05 1.27 0 2.5.86 2.5 2.41 0 1.61-1.03 2.61-2.5 2.61-1.89 0-2.98-1.52-2.98-4.25 0-3.8 1.75-6.53 5.02-8.42l1.14 1.84h-.01z\"/>"},"radio-tower":{"name":"radio-tower","figma":{"id":"0:659","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["broadcast"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4.78 5.78c.25-.25.25-.67 0-.92-.32-.33-.48-.76-.48-1.19 0-.43.16-.86.48-1.19.25-.26.25-.67 0-.92a.613.613 0 0 0-.45-.19c-.16 0-.33.06-.45.19-.57.58-.85 1.35-.85 2.11 0 .76.29 1.53.85 2.11.25.25.66.25.9 0zM2.32.19a.651.651 0 0 0-.92 0C.47 1.15 0 2.41 0 3.66c0 1.26.47 2.52 1.4 3.48.25.26.66.26.91 0s.25-.68 0-.94c-.68-.7-1.02-1.62-1.02-2.54 0-.92.34-1.84 1.02-2.54a.66.66 0 0 0 .01-.93zm5.69 5.1a1.62 1.62 0 1 0-1.62-1.62c-.01.89.72 1.62 1.62 1.62zM14.58.2a.628.628 0 0 0-.91 0c-.25.26-.25.68 0 .94.68.7 1.02 1.62 1.02 2.54 0 .92-.34 1.83-1.02 2.54-.25.26-.25.68 0 .94a.651.651 0 0 0 .92 0c.93-.96 1.4-2.22 1.4-3.48A5.048 5.048 0 0 0 14.58.2zM8.01 6.59c-.41 0-.83-.1-1.2-.3l-3.15 8.37h1.49l.86-1h4l.84 1h1.49L9.2 6.29c-.38.2-.78.3-1.19.3zM8 7.07l1.01 3.6h-2L8 7.07zm-1.99 5.59l1-1h2l1 1h-4zm5.19-11.1c-.25.25-.25.67 0 .92.32.33.48.76.48 1.19 0 .43-.16.86-.48 1.19-.25.26-.25.67 0 .92a.63.63 0 0 0 .9 0c.57-.58.85-1.35.85-2.11 0-.76-.28-1.53-.85-2.11a.634.634 0 0 0-.9 0z\"/>"},"repo-clone":{"name":"repo-clone","figma":{"id":"0:669","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["book","journal","repository"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15 0H9v7c0 .55.45 1 1 1h1v1h1V8h3c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1zm-4 7h-1V6h1v1zm4 0h-3V6h3v1zm0-2h-4V1h4v4zM4 5H3V4h1v1zm0-2H3V2h1v1zM2 1h6V0H1C.45 0 0 .45 0 1v12c0 .55.45 1 1 1h2v2l1.5-1.5L6 16v-2h5c.55 0 1-.45 1-1v-3H2V1zm9 10v2H6v-1H3v1H1v-2h10zM3 8h1v1H3V8zm1-1H3V6h1v1z\"/>"},"repo-force-push":{"name":"repo-force-push","figma":{"id":"0:681","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["book","journal","put"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 9H8v7H6V9H4l2.25-3H4l3-4 3 4H7.75L10 9zm1-9H1C.45 0 0 .45 0 1v12c0 .55.45 1 1 1h4v-1H1v-2h4v-1H2V1h9v9H9v1h2v2H9v1h2c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1z\"/>"},"repo-forked":{"name":"repo-forked","figma":{"id":"0:685","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["book","journal","copy"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 1a1.993 1.993 0 0 0-1 3.72V6L5 8 3 6V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V6.5l3 3v1.78A1.993 1.993 0 0 0 5 15a1.993 1.993 0 0 0 1-3.72V9.5l3-3V4.72A1.993 1.993 0 0 0 8 1zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3 10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3-10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/>"},"repo-pull":{"name":"repo-pull","figma":{"id":"0:691","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["book","journal","get"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 8V6H7V4h6V2l3 3-3 3zM4 2H3v1h1V2zm7 5h1v6c0 .55-.45 1-1 1H6v2l-1.5-1.5L3 16v-2H1c-.55 0-1-.45-1-1V1c0-.55.45-1 1-1h10c.55 0 1 .45 1 1v2h-1V1H2v9h9V7zm0 4H1v2h2v-1h3v1h5v-2zM4 6H3v1h1V6zm0-2H3v1h1V4zM3 9h1V8H3v1z\"/>"},"repo-push":{"name":"repo-push","figma":{"id":"0:700","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["book","journal","repository","put"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 3H3V2h1v1zM3 5h1V4H3v1zm4 0L4 9h2v7h2V9h2L7 5zm4-5H1C.45 0 0 .45 0 1v12c0 .55.45 1 1 1h4v-1H1v-2h4v-1H2V1h9.02L11 10H9v1h2v2H9v1h2c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1z\"/>"},"repo":{"name":"repo","figma":{"id":"0:706","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["book","journal","repository"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 9H3V8h1v1zm0-3H3v1h1V6zm0-2H3v1h1V4zm0-2H3v1h1V2zm8-1v12c0 .55-.45 1-1 1H6v2l-1.5-1.5L3 16v-2H1c-.55 0-1-.45-1-1V1c0-.55.45-1 1-1h10c.55 0 1 .45 1 1zm-1 10H1v2h2v-1h3v1h5v-2zm0-10H2v9h9V1z\"/>"},"rocket":{"name":"rocket","figma":{"id":"0:715","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["staff","stafftools","blast","off","space","launch","ship"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12.17 3.83c-.27-.27-.47-.55-.63-.88-.16-.31-.27-.66-.34-1.02-.58.33-1.16.7-1.73 1.13-.58.44-1.14.94-1.69 1.48-.7.7-1.33 1.81-1.78 2.45H3L0 10h3l2-2c-.34.77-1.02 2.98-1 3l1 1c.02.02 2.23-.64 3-1l-2 2v3l3-3v-3c.64-.45 1.75-1.09 2.45-1.78.55-.55 1.05-1.13 1.47-1.7.44-.58.81-1.16 1.14-1.72-.36-.08-.7-.19-1.03-.34a3.39 3.39 0 0 1-.86-.63zM16 0s-.09.38-.3 1.06c-.2.7-.55 1.58-1.06 2.66-.7-.08-1.27-.33-1.66-.72-.39-.39-.63-.94-.7-1.64C13.36.84 14.23.48 14.92.28 15.62.08 16 0 16 0z\"/>"},"rss":{"name":"rss","figma":{"id":"0:719","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["broadcast","feed","atom"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M2 13H0v-2c1.11 0 2 .89 2 2zM0 3v1a9 9 0 0 1 9 9h1C10 7.48 5.52 3 0 3zm0 4v1c2.75 0 5 2.25 5 5h1c0-3.31-2.69-6-6-6z\"/>"},"ruby":{"name":"ruby","figma":{"id":"0:724","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["code","language"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 6l-5 5V4h3l2 2zm3 0l-8 8-8-8 4-4h8l4 4zm-8 6.5L14.5 6l-3-3h-7l-3 3L8 12.5z\"/>"},"search":{"name":"search","figma":{"id":"0:729","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["magnifying","glass"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15.7 13.3l-3.81-3.83A5.93 5.93 0 0 0 13 6c0-3.31-2.69-6-6-6S1 2.69 1 6s2.69 6 6 6c1.3 0 2.48-.41 3.47-1.11l3.83 3.81c.19.2.45.3.7.3.25 0 .52-.09.7-.3a.996.996 0 0 0 0-1.41v.01zM7 10.7c-2.59 0-4.7-2.11-4.7-4.7 0-2.59 2.11-4.7 4.7-4.7 2.59 0 4.7 2.11 4.7 4.7 0 2.59-2.11 4.7-4.7 4.7z\"/>"},"server":{"name":"server","figma":{"id":"0:733","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["computers","racks","ops"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11 6H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V7c0-.55-.45-1-1-1zM2 9H1V7h1v2zm2 0H3V7h1v2zm2 0H5V7h1v2zm2 0H7V7h1v2zm3-8H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zM2 4H1V2h1v2zm2 0H3V2h1v2zm2 0H5V2h1v2zm2 0H7V2h1v2zm3-1h-1V2h1v1zm0 8H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-2c0-.55-.45-1-1-1zm-9 3H1v-2h1v2zm2 0H3v-2h1v2zm2 0H5v-2h1v2zm2 0H7v-2h1v2z\"/>"},"settings":{"name":"settings","figma":{"id":"0:751","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["sliders","filters","controls","levels"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 7H3V2h1v5zm-1 7h1v-3H3v3zm5 0h1V8H8v6zm5 0h1v-2h-1v2zm1-12h-1v6h1V2zM9 2H8v2h1V2zM5 8H2c-.55 0-1 .45-1 1s.45 1 1 1h3c.55 0 1-.45 1-1s-.45-1-1-1zm5-3H7c-.55 0-1 .45-1 1s.45 1 1 1h3c.55 0 1-.45 1-1s-.45-1-1-1zm5 4h-3c-.55 0-1 .45-1 1s.45 1 1 1h3c.55 0 1-.45 1-1s-.45-1-1-1z\"/>"},"shield":{"name":"shield","figma":{"id":"0:762","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["protect","shield","lock"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 0L0 2v6.02C0 12.69 5.31 16 7 16c1.69 0 7-3.31 7-7.98V2L7 0zM5 11l1.14-2.8a.568.568 0 0 0-.25-.59C5.33 7.25 5 6.66 5 6c0-1.09.89-2 1.98-2C8.06 4 9 4.91 9 6c0 .66-.33 1.25-.89 1.61-.19.13-.3.36-.25.59L9 11H5z\"/>"},"sign-in":{"name":"sign-in","figma":{"id":"0:764","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["door","arrow","direction","enter","log in"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 6.75V12h4V8h1v4c0 .55-.45 1-1 1H7v3l-5.45-2.72c-.33-.17-.55-.52-.55-.91V1c0-.55.45-1 1-1h9c.55 0 1 .45 1 1v3h-1V1H3l4 2v2.25L10 3v2h4v2h-4v2L7 6.75z\"/>"},"sign-out":{"name":"sign-out","figma":{"id":"0:768","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["door","arrow","direction","leave","log out"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12 9V7H8V5h4V3l4 3-4 3zm-2 3H6V3L2 1h8v3h1V1c0-.55-.45-1-1-1H1C.45 0 0 .45 0 1v11.38c0 .39.22.73.55.91L6 16.01V13h4c.55 0 1-.45 1-1V8h-1v4z\"/>"},"smiley":{"name":"smiley","figma":{"id":"0:772","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["emoji","smile","mood","emotion"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 0C3.58 0 0 3.58 0 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm4.81 12.81a6.72 6.72 0 0 1-2.17 1.45c-.83.36-1.72.53-2.64.53-.92 0-1.81-.17-2.64-.53-.81-.34-1.55-.83-2.17-1.45a6.773 6.773 0 0 1-1.45-2.17A6.59 6.59 0 0 1 1.21 8c0-.92.17-1.81.53-2.64.34-.81.83-1.55 1.45-2.17.62-.62 1.36-1.11 2.17-1.45A6.59 6.59 0 0 1 8 1.21c.92 0 1.81.17 2.64.53.81.34 1.55.83 2.17 1.45.62.62 1.11 1.36 1.45 2.17.36.83.53 1.72.53 2.64 0 .92-.17 1.81-.53 2.64-.34.81-.83 1.55-1.45 2.17zM4 6.8v-.59c0-.66.53-1.19 1.2-1.19h.59c.66 0 1.19.53 1.19 1.19v.59c0 .67-.53 1.2-1.19 1.2H5.2C4.53 8 4 7.47 4 6.8zm5 0v-.59c0-.66.53-1.19 1.2-1.19h.59c.66 0 1.19.53 1.19 1.19v.59c0 .67-.53 1.2-1.19 1.2h-.59C9.53 8 9 7.47 9 6.8zm4 3.2c-.72 1.88-2.91 3-5 3s-4.28-1.13-5-3c-.14-.39.23-1 .66-1h8.59c.41 0 .89.61.75 1z\"/>"},"squirrel":{"name":"squirrel","figma":{"id":"0:779","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["ship","shipit","launch"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11.75 1c-2.21 0-4 1.31-4 2.92 0 1.94.5 3.03 0 6.08 0-4.5-2.77-6.34-4-6.34.05-.5-.48-.66-.48-.66s-.22.11-.3.34c-.27-.31-.56-.27-.56-.27l-.13.58S.45 4.29.43 6.87c.2.33 1.53.6 2.47.43.89.05.67.79.47.99C2.53 9.13 1.75 8 .75 8s-1 1 0 1 1 1 3 1c-3.09 1.2 0 4 0 4h-1c-1 0-1 1-1 1h6c3 0 5-1 5-3.47 0-.85-.43-1.79-1-2.53-1.11-1.46.23-2.68 1-2 .77.68 3 1 3-2 0-2.21-1.79-4-4-4zm-9.5 5c-.28 0-.5-.22-.5-.5s.22-.5.5-.5.5.22.5.5-.22.5-.5.5z\"/>"},"star":{"name":"star","figma":{"id":"0:781","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["save","remember","like"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14 6l-4.9-.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14 7 11.67 11.33 14l-.93-4.74L14 6z\"/>"},"stop":{"name":"stop","figma":{"id":"0:785","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["block","spam","report"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 1H4L0 5v6l4 4h6l4-4V5l-4-4zm3 9.5L9.5 14h-5L1 10.5v-5L4.5 2h5L13 5.5v5zM6 4h2v5H6V4zm0 6h2v2H6v-2z\"/>"},"sync":{"name":"sync","figma":{"id":"0:791","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["cycle","refresh","loop"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10.236 7.4a4.15 4.15 0 0 1-1.2 3.6 4.346 4.346 0 0 1-5.41.54l1.17-1.14-4.3-.6.6 4.2 1.31-1.26c2.36 1.74 5.7 1.57 7.84-.54a5.876 5.876 0 0 0 1.74-4.46l-1.75-.34zM2.956 5a4.346 4.346 0 0 1 5.41-.54L7.196 5.6l4.3.6-.6-4.2-1.31 1.26c-2.36-1.74-5.7-1.57-7.85.54-1.24 1.23-1.8 2.85-1.73 4.46l1.75.35A4.17 4.17 0 0 1 2.956 5z\"/>"},"tag":{"name":"tag","figma":{"id":"0:795","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["release"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7.73 1.73C7.26 1.26 6.62 1 5.96 1H3.5C2.13 1 1 2.13 1 3.5v2.47c0 .66.27 1.3.73 1.77l6.06 6.06c.39.39 1.02.39 1.41 0l4.59-4.59a.996.996 0 0 0 0-1.41L7.73 1.73zM2.38 7.09c-.31-.3-.47-.7-.47-1.13V3.5c0-.88.72-1.59 1.59-1.59h2.47c.42 0 .83.16 1.13.47l6.14 6.13-4.73 4.73-6.13-6.15zM3.01 3h2v2H3V3h.01z\"/>"},"tasklist":{"name":"tasklist","figma":{"id":"0:800","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["todo"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15.41 9H7.59C7 9 7 8.59 7 8c0-.59 0-1 .59-1h7.81c.59 0 .59.41.59 1 0 .59 0 1-.59 1h.01zM9.59 4C9 4 9 3.59 9 3c0-.59 0-1 .59-1h5.81c.59 0 .59.41.59 1 0 .59 0 1-.59 1H9.59zM0 3.91l1.41-1.3L3 4.2 7.09 0 8.5 1.41 3 6.91l-3-3zM7.59 12h7.81c.59 0 .59.41.59 1 0 .59 0 1-.59 1H7.59C7 14 7 13.59 7 13c0-.59 0-1 .59-1z\"/>"},"telescope":{"name":"telescope","figma":{"id":"0:806","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["science","space","look","view","explore"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7.59 9l3 6h-1l-2-4v5h-1v-6l-2 5h-1l2-5 2-1zm-1-9h-1v1h1V0zm-2 3h-1v1h1V3zm-3-2h-1v1h1V1zM.22 9a.52.52 0 0 0-.16.67l.55.92c.13.23.41.31.64.2l1.39-.66-1.16-2-1.27.86.01.01zm7.89-5.39l-5.8 3.95L3.54 9.7l6.33-3.03L8.1 3.61h.01zm4.22 1.28l-1.47-2.52a.51.51 0 0 0-.72-.17l-1.2.83 1.84 3.2 1.33-.64c.27-.13.36-.44.22-.7z\"/>"},"terminal":{"name":"terminal","figma":{"id":"0:815","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["code","ops","shell"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7 10h4v1H7v-1zm-3 1l3-3-3-3-.75.75L5.5 8l-2.25 2.25L4 11zm10-8v10c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h12c.55 0 1 .45 1 1zm-1 0H1v10h12V3z\"/>"},"text-size":{"name":"text-size","figma":{"id":"0:821","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["font","size","text"],"width":18,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13.62 9.08L12.1 3.66h-.06l-1.5 5.42h3.08zM5.7 10.13S4.68 6.52 4.53 6.02h-.08l-1.13 4.11H5.7zM17.31 14h-2.25l-.95-3.25h-4.07L9.09 14H6.84l-.69-2.33H2.87L2.17 14H0l3.3-9.59h2.5l2.17 6.34L10.86 2h2.52l3.94 12h-.01z\"/>"},"three-bars":{"name":"three-bars","figma":{"id":"0:826","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["hamburger","menu","dropdown"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11.41 9H.59C0 9 0 8.59 0 8c0-.59 0-1 .59-1H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1h.01zm0-4H.59C0 5 0 4.59 0 4c0-.59 0-1 .59-1H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1h.01zM.59 11H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1H.59C0 13 0 12.59 0 12c0-.59 0-1 .59-1z\"/>"},"thumbsdown":{"name":"thumbsdown","figma":{"id":"0:831","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["thumb","thumbsdown","rejected","dislike"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15.98 7.83l-.97-5.95C14.84.5 13.13 0 12 0H5.69c-.2 0-.38.05-.53.14L3.72 1H2C.94 1 0 1.94 0 3v4c0 1.06.94 2.02 2 2h2c.91 0 1.39.45 2.39 1.55.91 1 .88 1.8.63 3.27-.08.5.06 1 .42 1.42.39.47.98.77 1.56.77 1.83 0 3-3.72 3-5.02l-.02-.98h2.04c1.16 0 1.95-.8 1.98-1.97 0-.06.02-.13-.02-.2v-.01zm-1.97 1.19h-1.99c-.7 0-1.03.28-1.03.97l.03 1.03c0 1.27-1.17 4-2 4-.5 0-1.08-.5-1-1 .25-1.58.34-2.78-.89-4.14C6.11 8.75 5.36 8 4 8V2l1.67-1H12c.73 0 1.95.31 2 1l.02.02 1 6c-.03.64-.38 1-1 1h-.01z\"/>"},"thumbsup":{"name":"thumbsup","figma":{"id":"0:835","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["thumb","thumbsup","prop","ship","like"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M14 14c-.05.69-1.27 1-2 1H5.67L4 14V8c1.36 0 2.11-.75 3.13-1.88 1.23-1.36 1.14-2.56.88-4.13-.08-.5.5-1 1-1 .83 0 2 2.73 2 4l-.02 1.03c0 .69.33.97 1.02.97h2c.63 0 .98.36 1 1l-1 6L14 14zm0-8h-2.02l.02-.98C12 3.72 10.83 0 9 0c-.58 0-1.17.3-1.56.77-.36.41-.5.91-.42 1.41.25 1.48.28 2.28-.63 3.28-1 1.09-1.48 1.55-2.39 1.55H2C.94 7 0 7.94 0 9v4c0 1.06.94 2 2 2h1.72l1.44.86c.16.09.33.14.52.14h6.33c1.13 0 2.84-.5 3-1.88l.98-5.95c.02-.08.02-.14.02-.2-.03-1.17-.84-1.97-2-1.97H14z\"/>"},"tools":{"name":"tools","figma":{"id":"0:839","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["screwdriver","wrench","settings"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4.48 7.27c.26.26 1.28 1.33 1.28 1.33l.56-.58-.88-.91 1.69-1.8s-.76-.74-.43-.45c.32-1.19.03-2.51-.87-3.44C4.93.5 3.66.2 2.52.51l1.93 2-.51 1.96-1.89.52-1.93-2C-.19 4.17.1 5.48 1 6.4c.94.98 2.29 1.26 3.48.87zm6.44 1.94l-2.33 2.3 3.84 3.98c.31.33.73.49 1.14.49.41 0 .82-.16 1.14-.49.63-.65.63-1.7 0-2.35l-3.79-3.93zM16 2.53L13.55 0 6.33 7.46l.88.91-4.31 4.46-.99.53-1.39 2.27.35.37 2.2-1.44.51-1.02L7.9 9.08l.88.91L16 2.53z\"/>"},"trashcan":{"name":"trashcan","figma":{"id":"0:844","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["garbage","rubbish","recycle","delete"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z\"/>"},"triangle-down":{"name":"triangle-down","figma":{"id":"0:847","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["arrow","point","direction"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M0 5l6 6 6-6H0z\"/>"},"triangle-left":{"name":"triangle-left","figma":{"id":"0:849","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["arrow","point","direction"],"width":6,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 2L0 8l6 6V2z\"/>"},"triangle-right":{"name":"triangle-right","figma":{"id":"0:851","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["arrow","point","direction"],"width":6,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M0 14l6-6-6-6v12z\"/>"},"triangle-up":{"name":"triangle-up","figma":{"id":"0:853","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["arrow","point","direction"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12 11L6 5l-6 6h12z\"/>"},"unfold":{"name":"unfold","figma":{"id":"0:857","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["expand","open","reveal"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11.5 7.5L14 10c0 .55-.45 1-1 1H9v-1h3.5l-2-2h-7l-2 2H5v1H1c-.55 0-1-.45-1-1l2.5-2.5L0 5c0-.55.45-1 1-1h4v1H1.5l2 2h7l2-2H9V4h4c.55 0 1 .45 1 1l-2.5 2.5zM6 6h2V3h2L7 0 4 3h2v3zm2 3H6v3H4l3 3 3-3H8V9z\"/>"},"unmute":{"name":"unmute","figma":{"id":"0:862","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["loud","volume","audio","sound","play"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12 7.96c0 1.09-.45 2.09-1.17 2.83l-.67-.67c.55-.56.89-1.31.89-2.16 0-.85-.34-1.61-.89-2.16l.67-.67A3.99 3.99 0 0 1 12 7.96zM7.72 2.22L4 5.94H2c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h2l3.72 3.72c.47.47 1.28.14 1.28-.53V2.75c0-.67-.81-1-1.28-.53zm5.94.08l-.67.67a6.996 6.996 0 0 1 2.06 4.98c0 1.94-.78 3.7-2.06 4.98l.67.67A7.973 7.973 0 0 0 16 7.94c0-2.22-.89-4.22-2.34-5.66v.02zm-1.41 1.41l-.69.67a5.05 5.05 0 0 1 1.48 3.58c0 1.39-.56 2.66-1.48 3.56l.69.67A5.97 5.97 0 0 0 14 7.96c0-1.65-.67-3.16-1.75-4.25z\"/>"},"project":{"name":"project","figma":{"id":"0:868","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["board","kanban","columns","scrum"],"width":15,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 12h3V2h-3v10zm-4-2h3V2H6v8zm-4 4h3V2H2v12zm-1 1h13V1H1v14zM14 0H1a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h13a1 1 0 0 0 1-1V1a1 1 0 0 0-1-1z\"/>"},"kebab-horizontal":{"name":"kebab-horizontal","figma":{"id":"0:875","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["kebab","dot","menu","more"],"width":13,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M1.5 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zm5 0a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zM13 7.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z\"/>"},"kebab-vertical":{"name":"kebab-vertical","figma":{"id":"0:880","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["kebab","dot","menu","more"],"width":3,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M0 2.5a1.5 1.5 0 1 0 3 0 1.5 1.5 0 0 0-3 0zm0 5a1.5 1.5 0 1 0 3 0 1.5 1.5 0 0 0-3 0zM1.5 14a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z\"/>"},"report":{"name":"report","figma":{"id":"0:885","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["report","abuse","flag"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M0 2a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1H7l-4 4v-4H1a1 1 0 0 1-1-1V2zm1 0h14v9H6.5L4 13.5V11H1V2zm6 6h2v2H7V8zm0-5h2v4H7V3z\"/>"},"note":{"name":"note","figma":{"id":"0:891","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["card","paper","ticket"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M3 10h4V9H3v1zm0-2h6V7H3v1zm0-2h8V5H3v1zm10 6H1V3h12v9zM1 2c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1H1z\"/>"},"screen-full":{"name":"screen-full","figma":{"id":"0:898","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["fullscreen","expand"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 10h1v3c0 .547-.453 1-1 1h-3v-1h3v-3zM1 10H0v3c0 .547.453 1 1 1h3v-1H1v-3zm0-7h3V2H1c-.547 0-1 .453-1 1v3h1V3zm1 1h10v8H2V4zm2 6h6V6H4v4zm6-8v1h3v3h1V3c0-.547-.453-1-1-1h-3z\"/>"},"screen-normal":{"name":"screen-normal","figma":{"id":"0:906","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["fullscreen","expand","exit"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M2 4H0V3h2V1h1v2c0 .547-.453 1-1 1zm0 8H0v1h2v2h1v-2c0-.547-.453-1-1-1zm9-2c0 .547-.453 1-1 1H4c-.547 0-1-.453-1-1V6c0-.547.453-1 1-1h6c.547 0 1 .453 1 1v4zM9 7H5v2h4V7zm2 6v2h1v-2h2v-1h-2c-.547 0-1 .453-1 1zm1-10V1h-1v2c0 .547.453 1 1 1h2V3h-2z\"/>"},"unverified":{"name":"unverified","figma":{"id":"0:914","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["insecure","untrusted","signed"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15.68 7.07L14.6 5.73c-.17-.22-.28-.48-.31-.77l-.19-1.7a1.51 1.51 0 0 0-1.33-1.33l-1.7-.19c-.3-.03-.56-.16-.78-.33L8.95.33c-.55-.44-1.33-.44-1.88 0L5.73 1.41c-.22.17-.48.28-.77.31l-1.7.19c-.7.08-1.25.63-1.33 1.33l-.19 1.7c-.03.3-.16.56-.33.78L.33 7.06c-.44.55-.44 1.33 0 1.88l1.08 1.34c.17.22.28.48.31.77l.19 1.7c.08.7.63 1.25 1.33 1.33l1.7.19c.3.03.56.16.78.33l1.34 1.08c.55.44 1.33.44 1.88 0l1.34-1.08c.22-.17.48-.28.77-.31l1.7-.19c.7-.08 1.25-.63 1.33-1.33l.19-1.7c.03-.3.16-.56.33-.78l1.08-1.34c.44-.55.44-1.33 0-1.88zm-6.67 4.44c0 .28-.22.5-.5.5h-1c-.27 0-.5-.22-.5-.5v-1c0-.28.23-.5.5-.5h1c.28 0 .5.22.5.5v1zm1.56-4.89c-.06.17-.17.33-.3.47-.13.16-.14.19-.33.38-.16.17-.31.3-.52.45-.11.09-.2.19-.28.27-.08.08-.14.17-.19.27-.05.1-.08.19-.11.3-.03.11-.03.13-.03.25H7.14c0-.22 0-.31.03-.48.03-.19.08-.36.14-.52.06-.14.14-.28.25-.42.11-.13.23-.25.41-.38.27-.19.36-.3.48-.52.12-.22.2-.38.2-.59 0-.27-.06-.45-.2-.58-.13-.13-.31-.19-.58-.19-.09 0-.19.02-.3.05-.11.03-.17.09-.25.16-.08.07-.14.11-.2.2a.41.41 0 0 0-.09.28h-2c0-.38.13-.56.27-.83.16-.27.36-.5.61-.67.25-.17.55-.3.88-.38.33-.08.7-.13 1.09-.13.44 0 .83.05 1.17.13.34.09.63.22.88.39.23.17.41.38.55.63.13.25.19.55.19.88 0 .22 0 .42-.08.59l-.02-.01z\"/>"},"verified":{"name":"verified","figma":{"id":"0:919","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["trusted","secure","trustworthy","signed"],"width":16,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M15.68 7.07L14.6 5.73c-.17-.22-.28-.48-.31-.77l-.19-1.7a1.51 1.51 0 0 0-1.33-1.33l-1.7-.19c-.3-.03-.56-.16-.78-.33L8.95.33c-.55-.44-1.33-.44-1.88 0L5.73 1.41c-.22.17-.48.28-.77.31l-1.7.19c-.7.08-1.25.63-1.33 1.33l-.19 1.7c-.03.3-.16.56-.33.78L.33 7.06c-.44.55-.44 1.33 0 1.88l1.08 1.34c.17.22.28.48.31.77l.19 1.7c.08.7.63 1.25 1.33 1.33l1.7.19c.3.03.56.16.78.33l1.34 1.08c.55.44 1.33.44 1.88 0l1.34-1.08c.22-.17.48-.28.77-.31l1.7-.19c.7-.08 1.25-.63 1.33-1.33l.19-1.7c.03-.3.16-.56.33-.78l1.08-1.34c.44-.55.44-1.33 0-1.88zm-9.17 4.94l-3.5-3.5 1.5-1.5 2 2 5-5 1.5 1.55-6.5 6.45z\"/>"},"versions":{"name":"versions","figma":{"id":"0:923","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["history","commits"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M13 3H7c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h6c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1zm-1 8H8V5h4v6zM4 4h1v1H4v6h1v1H4c-.55 0-1-.45-1-1V5c0-.55.45-1 1-1zM1 5h1v1H1v4h1v1H1c-.55 0-1-.45-1-1V6c0-.55.45-1 1-1z\"/>"},"watch":{"name":"watch","figma":{"id":"0:929","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["wait","hourglass","time","date"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6 8h2v1H5V5h1v3zm6 0c0 2.22-1.2 4.16-3 5.19V15c0 .55-.45 1-1 1H4c-.55 0-1-.45-1-1v-1.81C1.2 12.16 0 10.22 0 8s1.2-4.16 3-5.19V1c0-.55.45-1 1-1h4c.55 0 1 .45 1 1v1.81c1.8 1.03 3 2.97 3 5.19zm-1 0c0-2.77-2.23-5-5-5S1 5.23 1 8s2.23 5 5 5 5-2.23 5-5z\"/>"},"x":{"name":"x","figma":{"id":"0:932","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["remove","close","delete"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M7.71 8.23l3.75 3.75-1.48 1.48-3.75-3.75-3.75 3.75L1 11.98l3.75-3.75L1 4.48 2.48 3l3.75 3.75L9.98 3l1.48 1.48-3.75 3.75z\"/>"},"zap":{"name":"zap","figma":{"id":"0:934","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["electricity","lightning","props","like","star","save"],"width":10,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M10 7H6l3-7-9 9h4l-3 7 9-9z\"/>"},"key":{"name":"key","figma":{"id":"0:938","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["key","lock","secure","safe"],"width":14,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M12.83 2.17C12.08 1.42 11.14 1.03 10 1c-1.13.03-2.08.42-2.83 1.17S6.04 3.86 6.01 5c0 .3.03.59.09.89L0 12v1l1 1h2l1-1v-1h1v-1h1v-1h2l1.09-1.11c.3.08.59.11.91.11 1.14-.03 2.08-.42 2.83-1.17S13.97 6.14 14 5c-.03-1.14-.42-2.08-1.17-2.83zM11 5.38c-.77 0-1.38-.61-1.38-1.38 0-.77.61-1.38 1.38-1.38.77 0 1.38.61 1.38 1.38 0 .77-.61 1.38-1.38 1.38z\"/>"},"grabber":{"name":"grabber","figma":{"id":"0:942","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["mover","drap","drop","sort"],"width":8,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M8 4v1H0V4h8zM0 8h8V7H0v1zm0 3h8v-1H0v1z\"/>"},"plus-small":{"name":"plus-small","figma":{"id":"0:947","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["add","new","more","small"],"width":7,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M4 4H3v3H0v1h3v3h1V8h3V7H4V4z\"/>"},"light-bulb":{"name":"light-bulb","figma":{"id":"0:951","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["idea"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M6.5 0C3.48 0 1 2.19 1 5c0 .92.55 2.25 1 3 1.34 2.25 1.78 2.78 2 4v1h5v-1c.22-1.22.66-1.75 2-4 .45-.75 1-2.08 1-3 0-2.81-2.48-5-5.5-5zm3.64 7.48c-.25.44-.47.8-.67 1.11-.86 1.41-1.25 2.06-1.45 3.23-.02.05-.02.11-.02.17H5c0-.06 0-.13-.02-.17-.2-1.17-.59-1.83-1.45-3.23-.2-.31-.42-.67-.67-1.11C2.44 6.78 2 5.65 2 5c0-2.2 2.02-4 4.5-4 1.22 0 2.36.42 3.22 1.19C10.55 2.94 11 3.94 11 5c0 .66-.44 1.78-.86 2.48zM4 14h5c-.23 1.14-1.3 2-2.5 2s-2.27-.86-2.5-2z\"/>"},"link-external":{"name":"link-external","figma":{"id":"0:956","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["out","see","more","go","to"],"width":12,"height":16,"path":"<path fill-rule=\"evenodd\" d=\"M11 10h1v3c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h3v1H1v10h10v-3zM6 2l2.25 2.25L5 7.5 6.5 9l3.25-3.25L12 8V2H6z\"/>"}}
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/alert.svg b/htdocs/theme/common/octicons/build/svg/alert.svg
new file mode 100644
index 00000000000..ca50ea8b557
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/alert.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/arrow-down.svg b/htdocs/theme/common/octicons/build/svg/arrow-down.svg
new file mode 100644
index 00000000000..c1acf0ac259
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/arrow-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M7 7V3H3v4H0l5 6 5-6H7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/arrow-left.svg b/htdocs/theme/common/octicons/build/svg/arrow-left.svg
new file mode 100644
index 00000000000..f3cda4f5067
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/arrow-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M6 3L0 8l6 5v-3h4V6H6V3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/arrow-right.svg b/htdocs/theme/common/octicons/build/svg/arrow-right.svg
new file mode 100644
index 00000000000..04a4fbffb37
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/arrow-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M10 8L4 3v3H0v4h4v3l6-5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/arrow-small-down.svg b/htdocs/theme/common/octicons/build/svg/arrow-small-down.svg
new file mode 100644
index 00000000000..57c1ee86034
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/arrow-small-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="16" viewBox="0 0 6 16"><path fill-rule="evenodd" d="M4 7V5H2v2H0l3 4 3-4H4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/arrow-small-left.svg b/htdocs/theme/common/octicons/build/svg/arrow-small-left.svg
new file mode 100644
index 00000000000..9fa227ea82e
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/arrow-small-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="16" viewBox="0 0 6 16"><path fill-rule="evenodd" d="M4 7V5L0 8l4 3V9h2V7H4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/arrow-small-right.svg b/htdocs/theme/common/octicons/build/svg/arrow-small-right.svg
new file mode 100644
index 00000000000..bca68473434
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/arrow-small-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="16" viewBox="0 0 6 16"><path fill-rule="evenodd" d="M6 8L2 5v2H0v2h2v2l4-3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/arrow-small-up.svg b/htdocs/theme/common/octicons/build/svg/arrow-small-up.svg
new file mode 100644
index 00000000000..6c132f182c2
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/arrow-small-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="16" viewBox="0 0 6 16"><path fill-rule="evenodd" d="M3 5L0 9h2v2h2V9h2L3 5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/arrow-up.svg b/htdocs/theme/common/octicons/build/svg/arrow-up.svg
new file mode 100644
index 00000000000..63be8901bc4
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/arrow-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M5 3L0 9h3v4h4V9h3L5 3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/beaker.svg b/htdocs/theme/common/octicons/build/svg/beaker.svg
new file mode 100644
index 00000000000..19377609a5d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/beaker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M14.84 14.59L11.46 7V3h1V2h-9v1h1v4l-3.37 7.59A1 1 0 0 0 2 16h11.94c.72 0 1.2-.75.91-1.41h-.01zM4.21 10l1.25-3V3h5v4l1.25 3h-7.5zm4.25-2h1v1h-1V8zm-1-1h-1V6h1v1zm0-3h1v1h-1V4zm0-3h-1V0h1v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/bell.svg b/htdocs/theme/common/octicons/build/svg/bell.svg
new file mode 100644
index 00000000000..d076a0c2129
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/bell.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M14 12v1H0v-1l.73-.58c.77-.77.81-2.55 1.19-4.42C2.69 3.23 6 2 6 2c0-.55.45-1 1-1s1 .45 1 1c0 0 3.39 1.23 4.16 5 .38 1.88.42 3.66 1.19 4.42l.66.58H14zm-7 4c1.11 0 2-.89 2-2H5c0 1.11.89 2 2 2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/bold.svg b/htdocs/theme/common/octicons/build/svg/bold.svg
new file mode 100644
index 00000000000..d2f29953034
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/bold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M1 2h3.83c2.48 0 4.3.75 4.3 2.95 0 1.14-.63 2.23-1.67 2.61v.06c1.33.3 2.3 1.23 2.3 2.86 0 2.39-1.97 3.52-4.61 3.52H1V2zm3.66 4.95c1.67 0 2.38-.66 2.38-1.69 0-1.17-.78-1.61-2.34-1.61H3.13v3.3h1.53zm.27 5.39c1.77 0 2.75-.64 2.75-1.98 0-1.27-.95-1.81-2.75-1.81h-1.8v3.8h1.8v-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/book.svg b/htdocs/theme/common/octicons/build/svg/book.svg
new file mode 100644
index 00000000000..d21fa56a72d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/book.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3 5h4v1H3V5zm0 3h4V7H3v1zm0 2h4V9H3v1zm11-5h-4v1h4V5zm0 2h-4v1h4V7zm0 2h-4v1h4V9zm2-6v9c0 .55-.45 1-1 1H9.5l-1 1-1-1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h5.5l1 1 1-1H15c.55 0 1 .45 1 1zm-8 .5L7.5 3H2v9h6V3.5zm7-.5H9.5l-.5.5V12h6V3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/bookmark.svg b/htdocs/theme/common/octicons/build/svg/bookmark.svg
new file mode 100644
index 00000000000..de64157315d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/bookmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M9 0H1C.27 0 0 .27 0 1v15l5-3.09L10 16V1c0-.73-.27-1-1-1zm-.78 4.25L6.36 5.61l.72 2.16c.06.22-.02.28-.2.17L5 6.6 3.12 7.94c-.19.11-.25.05-.2-.17l.72-2.16-1.86-1.36c-.17-.16-.14-.23.09-.23l2.3-.03.7-2.16h.25l.7 2.16 2.3.03c.23 0 .27.08.09.23h.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/briefcase.svg b/htdocs/theme/common/octicons/build/svg/briefcase.svg
new file mode 100644
index 00000000000..5104b8193bd
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/briefcase.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M9 4V3c0-.55-.45-1-1-1H6c-.55 0-1 .45-1 1v1H1c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1H9zM6 3h2v1H6V3zm7 6H8v1H6V9H1V5h1v3h10V5h1v4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/broadcast.svg b/htdocs/theme/common/octicons/build/svg/broadcast.svg
new file mode 100644
index 00000000000..ddc1458f1e9
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/broadcast.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9 9H8c.55 0 1-.45 1-1V7c0-.55-.45-1-1-1H7c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1H6c-.55 0-1 .45-1 1v2h1v3c0 .55.45 1 1 1h1c.55 0 1-.45 1-1v-3h1v-2c0-.55-.45-1-1-1zM7 7h1v1H7V7zm2 4H8v4H7v-4H6v-1h3v1zm2.09-3.5c0-1.98-1.61-3.59-3.59-3.59A3.593 3.593 0 0 0 4 8.31v1.98c-.61-.77-1-1.73-1-2.8 0-2.48 2.02-4.5 4.5-4.5S12 5.01 12 7.49c0 1.06-.39 2.03-1 2.8V8.31c.06-.27.09-.53.09-.81zm3.91 0c0 2.88-1.63 5.38-4 6.63v-1.05a6.553 6.553 0 0 0 3.09-5.58A6.59 6.59 0 0 0 7.5.91 6.59 6.59 0 0 0 .91 7.5c0 2.36 1.23 4.42 3.09 5.58v1.05A7.497 7.497 0 0 1 7.5 0C11.64 0 15 3.36 15 7.5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/browser.svg b/htdocs/theme/common/octicons/build/svg/browser.svg
new file mode 100644
index 00000000000..00f512adb15
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/browser.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M5 3h1v1H5V3zM3 3h1v1H3V3zM1 3h1v1H1V3zm12 10H1V5h12v8zm0-9H7V3h6v1zm1-1c0-.55-.45-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/bug.svg b/htdocs/theme/common/octicons/build/svg/bug.svg
new file mode 100644
index 00000000000..bd533f829e7
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/bug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M11.17 10h3V9h-3V8l3.17-1.03-.34-.94-2.83.97V6c0-.55-.45-1-1-1V4c0-.48-.36-.88-.83-.97L10.37 2h1.8V1h-2.2l-2 2h-.59L5.37 1h-2.2v1h1.8L6 3.03c-.47.09-.83.48-.83.97v1c-.55 0-1 .45-1 1v1l-2.83-.97-.34.94L4.17 8v1h-3v1h3v1L1 12.03l.34.94L4.17 12v1c0 .55.45 1 1 1h1l1-1V6h1v7l1 1h1c.55 0 1-.45 1-1v-1l2.83.97.34-.94L11.17 11v-1zm-2-5h-3V4h3v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/calendar.svg b/htdocs/theme/common/octicons/build/svg/calendar.svg
new file mode 100644
index 00000000000..fede886f63c
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/calendar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 2h-1v1.5c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5V2H6v1.5c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5V2H2c-.55 0-1 .45-1 1v11c0 .55.45 1 1 1h11c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 12H2V5h11v9zM5 3H4V1h1v2zm6 0h-1V1h1v2zM6 7H5V6h1v1zm2 0H7V6h1v1zm2 0H9V6h1v1zm2 0h-1V6h1v1zM4 9H3V8h1v1zm2 0H5V8h1v1zm2 0H7V8h1v1zm2 0H9V8h1v1zm2 0h-1V8h1v1zm-8 2H3v-1h1v1zm2 0H5v-1h1v1zm2 0H7v-1h1v1zm2 0H9v-1h1v1zm2 0h-1v-1h1v1zm-8 2H3v-1h1v1zm2 0H5v-1h1v1zm2 0H7v-1h1v1zm2 0H9v-1h1v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/check.svg b/htdocs/theme/common/octicons/build/svg/check.svg
new file mode 100644
index 00000000000..2d59600912e
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M12 5.5l-8 8-4-4L1.5 8 4 10.5 10.5 4 12 5.5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/checklist.svg b/htdocs/theme/common/octicons/build/svg/checklist.svg
new file mode 100644
index 00000000000..671aa3b507e
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/checklist.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M16 8.5l-6 6-3-3L8.5 10l1.5 1.5L14.5 7 16 8.5zM5.7 12.2l.8.8H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h7c.55 0 1 .45 1 1v6.5l-.8-.8c-.39-.39-1.03-.39-1.42 0L5.7 10.8a.996.996 0 0 0 0 1.41v-.01zM4 4h5V3H4v1zm0 2h5V5H4v1zm0 2h3V7H4v1zM3 9H2v1h1V9zm0-2H2v1h1V7zm0-2H2v1h1V5zm0-2H2v1h1V3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/chevron-down.svg b/htdocs/theme/common/octicons/build/svg/chevron-down.svg
new file mode 100644
index 00000000000..3a4e0aad5c6
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/chevron-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M5 11.5l-5-5L1.5 5 5 8.75 8.5 5 10 6.5l-5 5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/chevron-left.svg b/htdocs/theme/common/octicons/build/svg/chevron-left.svg
new file mode 100644
index 00000000000..2de62df36b3
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/chevron-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16"><path fill-rule="evenodd" d="M6 3l1.5 1.5L3.75 8l3.75 3.5L6 13 1 8l5-5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/chevron-right.svg b/htdocs/theme/common/octicons/build/svg/chevron-right.svg
new file mode 100644
index 00000000000..a5dadc68eed
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/chevron-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16"><path fill-rule="evenodd" d="M7.5 8l-5 5L1 11.5 4.75 8 1 4.5 2.5 3l5 5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/chevron-up.svg b/htdocs/theme/common/octicons/build/svg/chevron-up.svg
new file mode 100644
index 00000000000..19db9dd3992
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/chevron-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M10 10l-1.5 1.5L5 7.75 1.5 11.5 0 10l5-5 5 5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/circle-slash.svg b/htdocs/theme/common/octicons/build/svg/circle-slash.svg
new file mode 100644
index 00000000000..edfb3d8046a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/circle-slash.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm0 1.3c1.3 0 2.5.44 3.47 1.17l-8 8A5.755 5.755 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zm0 11.41c-1.3 0-2.5-.44-3.47-1.17l8-8c.73.97 1.17 2.17 1.17 3.47 0 3.14-2.56 5.7-5.7 5.7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/circuit-board.svg b/htdocs/theme/common/octicons/build/svg/circuit-board.svg
new file mode 100644
index 00000000000..f9a4c7e6119
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/circuit-board.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M3 5c0-.55.45-1 1-1s1 .45 1 1-.45 1-1 1-1-.45-1-1zm8 0c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zm0 6c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zm2-10H5v2.17c.36.19.64.47.83.83h2.34c.42-.78 1.33-1.28 2.34-1.05.75.19 1.36.8 1.53 1.55.31 1.38-.72 2.59-2.05 2.59-.8 0-1.48-.44-1.83-1.09H5.83c-.42.8-1.33 1.28-2.34 1.03-.73-.17-1.34-.78-1.52-1.52C1.72 4.49 2.2 3.59 3 3.17V1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1l5-5h2.17c.42-.78 1.33-1.28 2.34-1.05.75.19 1.36.8 1.53 1.55.31 1.38-.72 2.59-2.05 2.59-.8 0-1.48-.44-1.83-1.09H6.99L4 15h9c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/clippy.svg b/htdocs/theme/common/octicons/build/svg/clippy.svg
new file mode 100644
index 00000000000..9cb633776de
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/clippy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M2 13h4v1H2v-1zm5-6H2v1h5V7zm2 3V8l-3 3 3 3v-2h5v-2H9zM4.5 9H2v1h2.5V9zM2 12h2.5v-1H2v1zm9 1h1v2c-.02.28-.11.52-.3.7-.19.18-.42.28-.7.3H1c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h3c0-1.11.89-2 2-2 1.11 0 2 .89 2 2h3c.55 0 1 .45 1 1v5h-1V6H1v9h10v-2zM2 5h8c0-.55-.45-1-1-1H8c-.55 0-1-.45-1-1s-.45-1-1-1-1 .45-1 1-.45 1-1 1H3c-.55 0-1 .45-1 1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/clock.svg b/htdocs/theme/common/octicons/build/svg/clock.svg
new file mode 100644
index 00000000000..4bb89e09b51
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/clock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M8 8h3v2H7c-.55 0-1-.45-1-1V4h2v4zM7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/cloud-download.svg b/htdocs/theme/common/octicons/build/svg/cloud-download.svg
new file mode 100644
index 00000000000..8cc3d0f51a0
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/cloud-download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9 12h2l-3 3-3-3h2V7h2v5zm3-8c0-.44-.91-3-4.5-3C5.08 1 3 2.92 3 5 1.02 5 0 6.52 0 8c0 1.53 1 3 3 3h3V9.7H3C1.38 9.7 1.3 8.28 1.3 8c0-.17.05-1.7 1.7-1.7h1.3V5c0-1.39 1.56-2.7 3.2-2.7 2.55 0 3.13 1.55 3.2 1.8v1.2H12c.81 0 2.7.22 2.7 2.2 0 2.09-2.25 2.2-2.7 2.2h-2V11h2c2.08 0 4-1.16 4-3.5C16 5.06 14.08 4 12 4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/cloud-upload.svg b/htdocs/theme/common/octicons/build/svg/cloud-upload.svg
new file mode 100644
index 00000000000..c17e1d35d67
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/cloud-upload.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7 9H5l3-3 3 3H9v5H7V9zm5-4c0-.44-.91-3-4.5-3C5.08 2 3 3.92 3 6 1.02 6 0 7.52 0 9c0 1.53 1 3 3 3h3v-1.3H3c-1.62 0-1.7-1.42-1.7-1.7 0-.17.05-1.7 1.7-1.7h1.3V6c0-1.39 1.56-2.7 3.2-2.7 2.55 0 3.13 1.55 3.2 1.8v1.2H12c.81 0 2.7.22 2.7 2.2 0 2.09-2.25 2.2-2.7 2.2h-2V12h2c2.08 0 4-1.16 4-3.5C16 6.06 14.08 5 12 5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/code.svg b/htdocs/theme/common/octicons/build/svg/code.svg
new file mode 100644
index 00000000000..6e6560e42d1
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/comment-discussion.svg b/htdocs/theme/common/octicons/build/svg/comment-discussion.svg
new file mode 100644
index 00000000000..c155b889337
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/comment-discussion.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15 1H6c-.55 0-1 .45-1 1v2H1c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h1v3l3-3h4c.55 0 1-.45 1-1V9h1l3 3V9h1c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zM9 11H4.5L3 12.5V11H1V5h4v3c0 .55.45 1 1 1h3v2zm6-3h-2v1.5L11.5 8H6V2h9v6z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/comment.svg b/htdocs/theme/common/octicons/build/svg/comment.svg
new file mode 100644
index 00000000000..2c6d88c0b92
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/comment.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M14 1H2c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h2v3.5L7.5 11H14c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 9H7l-2 2v-2H2V2h12v8z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/credit-card.svg b/htdocs/theme/common/octicons/build/svg/credit-card.svg
new file mode 100644
index 00000000000..7da9f29aca3
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/credit-card.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12 9H2V8h10v1zm4-6v9c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h14c.55 0 1 .45 1 1zm-1 3H1v6h14V6zm0-3H1v1h14V3zm-9 7H2v1h4v-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/dash.svg b/htdocs/theme/common/octicons/build/svg/dash.svg
new file mode 100644
index 00000000000..b9a28fef746
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/dash.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16"><path fill-rule="evenodd" d="M0 7v2h8V7H0z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/dashboard.svg b/htdocs/theme/common/octicons/build/svg/dashboard.svg
new file mode 100644
index 00000000000..dad1fd7a983
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/dashboard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9 5H8V4h1v1zm4 3h-1v1h1V8zM6 5H5v1h1V5zM5 8H4v1h1V8zm11-5.5l-.5-.5L9 7c-.06-.02-1 0-1 0-.55 0-1 .45-1 1v1c0 .55.45 1 1 1h1c.55 0 1-.45 1-1v-.92l6-5.58zm-1.59 4.09c.19.61.3 1.25.3 1.91 0 3.42-2.78 6.2-6.2 6.2-3.42 0-6.21-2.78-6.21-6.2 0-3.42 2.78-6.2 6.2-6.2 1.2 0 2.31.34 3.27.94l.94-.94A7.459 7.459 0 0 0 8.51 1C4.36 1 1 4.36 1 8.5 1 12.64 4.36 16 8.5 16c4.14 0 7.5-3.36 7.5-7.5 0-1.03-.2-2.02-.59-2.91l-1 1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/database.svg b/htdocs/theme/common/octicons/build/svg/database.svg
new file mode 100644
index 00000000000..08b036d9aee
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/database.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M6 15c-3.31 0-6-.9-6-2v-2c0-.17.09-.34.21-.5.67.86 3 1.5 5.79 1.5s5.12-.64 5.79-1.5c.13.16.21.33.21.5v2c0 1.1-2.69 2-6 2zm0-4c-3.31 0-6-.9-6-2V7c0-.11.04-.21.09-.31.03-.06.07-.13.12-.19C.88 7.36 3.21 8 6 8s5.12-.64 5.79-1.5c.05.06.09.13.12.19.05.1.09.21.09.31v2c0 1.1-2.69 2-6 2zm0-4c-3.31 0-6-.9-6-2V4 3c0-1.1 2.69-2 6-2s6 .9 6 2v2c0 1.1-2.69 2-6 2zm0-5c-2.21 0-4 .45-4 1s1.79 1 4 1 4-.45 4-1-1.79-1-4-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/desktop-download.svg b/htdocs/theme/common/octicons/build/svg/desktop-download.svg
new file mode 100644
index 00000000000..74b2c7d837b
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/desktop-download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/device-camera-video.svg b/htdocs/theme/common/octicons/build/svg/device-camera-video.svg
new file mode 100644
index 00000000000..8f989c86e9c
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/device-camera-video.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.2 2.091L10 5.721v-2.72c0-.55-.45-1-1-1H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h8c.55 0 1-.45 1-1v-2.72l5.2 3.63c.33.23.8 0 .8-.41v-10c0-.41-.47-.64-.8-.41z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/device-camera.svg b/htdocs/theme/common/octicons/build/svg/device-camera.svg
new file mode 100644
index 00000000000..609be0ea905
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/device-camera.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15 3H7c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h14c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1zM6 5H2V4h4v1zm4.5 7C8.56 12 7 10.44 7 8.5S8.56 5 10.5 5 14 6.56 14 8.5 12.44 12 10.5 12zM13 8.5c0 1.38-1.13 2.5-2.5 2.5S8 9.87 8 8.5 9.13 6 10.5 6 13 7.13 13 8.5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/device-desktop.svg b/htdocs/theme/common/octicons/build/svg/device-desktop.svg
new file mode 100644
index 00000000000..3671fd0418d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/device-desktop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15 2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 9H1V3h14v8z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/device-mobile.svg b/htdocs/theme/common/octicons/build/svg/device-mobile.svg
new file mode 100644
index 00000000000..84559ca7730
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/device-mobile.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M9 0H1C.45 0 0 .45 0 1v14c0 .55.45 1 1 1h8c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1zM5 15.3c-.72 0-1.3-.58-1.3-1.3 0-.72.58-1.3 1.3-1.3.72 0 1.3.58 1.3 1.3 0 .72-.58 1.3-1.3 1.3zM9 12H1V2h8v10z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/diff-added.svg b/htdocs/theme/common/octicons/build/svg/diff-added.svg
new file mode 100644
index 00000000000..8394151ee59
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/diff-added.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 13H1V2h12v12zM6 9H3V7h3V4h2v3h3v2H8v3H6V9z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/diff-ignored.svg b/htdocs/theme/common/octicons/build/svg/diff-ignored.svg
new file mode 100644
index 00000000000..eaa2bee6df5
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/diff-ignored.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 13H1V2h12v12zm-8.5-2H3v-1.5L9.5 4H11v1.5L4.5 12z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/diff-modified.svg b/htdocs/theme/common/octicons/build/svg/diff-modified.svg
new file mode 100644
index 00000000000..6a17dc3a9a1
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/diff-modified.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 13H1V2h12v12zM4 8c0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3-3-1.34-3-3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/diff-removed.svg b/htdocs/theme/common/octicons/build/svg/diff-removed.svg
new file mode 100644
index 00000000000..2dfe2a1b23d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/diff-removed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zm0 13H1V2h12v12zm-2-5H3V7h8v2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/diff-renamed.svg b/htdocs/theme/common/octicons/build/svg/diff-renamed.svg
new file mode 100644
index 00000000000..c1f0982bf51
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/diff-renamed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M6 9H3V7h3V4l5 4-5 4V9zm8-7v12c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h12c.55 0 1 .45 1 1zm-1 0H1v12h12V2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/diff.svg b/htdocs/theme/common/octicons/build/svg/diff.svg
new file mode 100644
index 00000000000..cbaa51ff7d1
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/diff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="16" viewBox="0 0 13 16"><path fill-rule="evenodd" d="M6 7h2v1H6v2H5V8H3V7h2V5h1v2zm-3 6h5v-1H3v1zM7.5 2L11 5.5V15c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h6.5zM10 6L7 3H1v12h9V6zM8.5 0H3v1h5l4 4v8h1V4.5L8.5 0z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/ellipsis.svg b/htdocs/theme/common/octicons/build/svg/ellipsis.svg
new file mode 100644
index 00000000000..7d4b9d8dc65
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/ellipsis.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11 5H1c-.55 0-1 .45-1 1v4c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V6c0-.55-.45-1-1-1zM4 9H2V7h2v2zm3 0H5V7h2v2zm3 0H8V7h2v2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/eye.svg b/htdocs/theme/common/octicons/build/svg/eye.svg
new file mode 100644
index 00000000000..4f43a098921
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/eye.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6C13 14 16 8 16 8s-3-6-7.94-6zM8 12c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4zm2-4c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-binary.svg b/htdocs/theme/common/octicons/build/svg/file-binary.svg
new file mode 100644
index 00000000000..93d0f547f0a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-binary.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M4 12h1v1H2v-1h1v-2H2V9h2v3zm8-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5zM8 4H6v1h1v2H6v1h3V7H8V4zM2 4h3v4H2V4zm1 3h1V5H3v2zm3 2h3v4H6V9zm1 3h1v-2H7v2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-code.svg b/htdocs/theme/common/octicons/build/svg/file-code.svg
new file mode 100644
index 00000000000..5b4b199531b
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M8.5 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V4.5L8.5 1zM11 14H1V2h7l3 3v9zM5 6.98L3.5 8.5 5 10l-.5 1L2 8.5 4.5 6l.5.98zM7.5 6L10 8.5 7.5 11l-.5-.98L8.5 8.5 7 7l.5-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-directory.svg b/htdocs/theme/common/octicons/build/svg/file-directory.svg
new file mode 100644
index 00000000000..4bf1f1caa89
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-directory.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 4H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zM6 4H1V3h5v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-media.svg b/htdocs/theme/common/octicons/build/svg/file-media.svg
new file mode 100644
index 00000000000..018e533e2e8
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-media.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M6 5h2v2H6V5zm6-.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v11l3-5 2 4 2-2 3 3V5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-pdf.svg b/htdocs/theme/common/octicons/build/svg/file-pdf.svg
new file mode 100644
index 00000000000..1b1703e19fd
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-pdf.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M8.5 1H1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V4.5L8.5 1zM1 2h4a.68.68 0 0 0-.31.2 1.08 1.08 0 0 0-.23.47 4.22 4.22 0 0 0-.09 1.47c.06.609.173 1.211.34 1.8A21.78 21.78 0 0 1 3.6 8.6c-.5 1-.8 1.66-.91 1.84a7.161 7.161 0 0 0-.69.3 4.19 4.19 0 0 0-1 .64V2zm4.42 4.8a5.65 5.65 0 0 0 1.17 2.09c.275.237.595.417.94.53-.64.09-1.23.2-1.81.33a12.22 12.22 0 0 0-1.81.59c-.587.243.22-.44.61-1.25.365-.74.67-1.51.91-2.3l-.01.01zM11 14H1.5a.743.743 0 0 1-.17 0 2.12 2.12 0 0 0 .73-.44 10.14 10.14 0 0 0 1.78-2.38c.31-.13.58-.23.81-.31l.42-.14c.45-.13.94-.23 1.44-.33s1-.16 1.48-.2c.447.216.912.394 1.39.53.403.11.814.188 1.23.23h.38V14H11zm0-4.86a3.74 3.74 0 0 0-.64-.28 4.22 4.22 0 0 0-.75-.11c-.411.003-.822.03-1.23.08a3 3 0 0 1-1-.64 6.07 6.07 0 0 1-1.29-2.33c.111-.662.178-1.33.2-2 .02-.25.02-.5 0-.75a1.05 1.05 0 0 0-.2-.88.82.82 0 0 0-.61-.23H8l3 3v4.14z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-submodule.svg b/htdocs/theme/common/octicons/build/svg/file-submodule.svg
new file mode 100644
index 00000000000..355a90546fe
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-submodule.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M10 7H4v7h9c.55 0 1-.45 1-1V8h-4V7zM9 9H5V8h4v1zm4-5H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h2V7c0-.55.45-1 1-1h6c.55 0 1 .45 1 1h3V5c0-.55-.45-1-1-1zM6 4H1V3h5v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-symlink-directory.svg b/htdocs/theme/common/octicons/build/svg/file-symlink-directory.svg
new file mode 100644
index 00000000000..4b6263acc2b
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-symlink-directory.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 4H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zM1 3h5v1H1V3zm6 9v-2c-.98-.02-1.84.22-2.55.7-.71.48-1.19 1.25-1.45 2.3.02-1.64.39-2.88 1.13-3.73C4.86 8.43 5.82 8 7.01 8V6l4 3-4 3H7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-symlink-file.svg b/htdocs/theme/common/octicons/build/svg/file-symlink-file.svg
new file mode 100644
index 00000000000..b2aaf249407
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-symlink-file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M8.5 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V4.5L8.5 1zM11 14H1V2h7l3 3v9zM6 4.5l4 3-4 3v-2c-.98-.02-1.84.22-2.55.7-.71.48-1.19 1.25-1.45 2.3.02-1.64.39-2.88 1.13-3.73.73-.84 1.69-1.27 2.88-1.27v-2H6z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file-zip.svg b/htdocs/theme/common/octicons/build/svg/file-zip.svg
new file mode 100644
index 00000000000..e2bb5b0a94e
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file-zip.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M8.5 1H1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V4.5L8.5 1zM11 14H1V2h3v1h1V2h3l3 3v9zM5 4V3h1v1H5zM4 4h1v1H4V4zm1 2V5h1v1H5zM4 6h1v1H4V6zm1 2V7h1v1H5zM4 9.28A2 2 0 0 0 3 11v1h4v-1a2 2 0 0 0-2-2V8H4v1.28zM6 10v1H4v-1h2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/file.svg b/htdocs/theme/common/octicons/build/svg/file.svg
new file mode 100644
index 00000000000..0997406531c
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M6 5H2V4h4v1zM2 8h7V7H2v1zm0 2h7V9H2v1zm0 2h7v-1H2v1zm10-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/flame.svg b/htdocs/theme/common/octicons/build/svg/flame.svg
new file mode 100644
index 00000000000..49507a1073a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/flame.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M5.05.01c.81 2.17.41 3.38-.52 4.31C3.55 5.37 1.98 6.15.9 7.68c-1.45 2.05-1.7 6.53 3.53 7.7-2.2-1.16-2.67-4.52-.3-6.61-.61 2.03.53 3.33 1.94 2.86 1.39-.47 2.3.53 2.27 1.67-.02.78-.31 1.44-1.13 1.81 3.42-.59 4.78-3.42 4.78-5.56 0-2.84-2.53-3.22-1.25-5.61-1.52.13-2.03 1.13-1.89 2.75.09 1.08-1.02 1.8-1.86 1.33-.67-.41-.66-1.19-.06-1.78C8.18 5.01 8.68 2.15 5.05.02L5.03 0l.02.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/fold.svg b/htdocs/theme/common/octicons/build/svg/fold.svg
new file mode 100644
index 00000000000..1b0b399b688
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/fold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 9l3 3H8v3H6v-3H4l3-3zm3-6H8V0H6v3H4l3 3 3-3zm4 2c0-.55-.45-1-1-1h-2.5l-1 1h3l-2 2h-7l-2-2h3l-1-1H1c-.55 0-1 .45-1 1l2.5 2.5L0 10c0 .55.45 1 1 1h2.5l1-1h-3l2-2h7l2 2h-3l1 1H13c.55 0 1-.45 1-1l-2.5-2.5L14 5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/gear.svg b/htdocs/theme/common/octicons/build/svg/gear.svg
new file mode 100644
index 00000000000..aded0c46675
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/gear.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M14 8.76v-1.6l-1.94-.64-.45-1.09.88-1.84-1.13-1.13-1.81.91-1.09-.45L7.77 1h-1.6l-.63 1.94-1.11.45-1.84-.88-1.13 1.13.91 1.81-.45 1.09L0 7.22v1.59l1.94.64.45 1.09-.88 1.84 1.13 1.13 1.81-.91 1.09.45.69 1.92h1.59l.63-1.94 1.11-.45 1.84.88 1.13-1.13-.92-1.81.47-1.09L14 8.74v.02zm-7 2.23c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/gift.svg b/htdocs/theme/common/octicons/build/svg/gift.svg
new file mode 100644
index 00000000000..761be5473ca
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/gift.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13.02 4h-1.38c.19-.33.33-.67.36-.91.06-.67-.11-1.22-.52-1.61-.36-.38-.81-.48-1.36-.48h-.11c-.53.02-1.11.25-1.53.58-.42.33-.73.72-.97 1.2-.23-.48-.55-.88-.97-1.2-.42-.32-1-.58-1.53-.58h-.03c-.56 0-1.06.09-1.44.48-.41.39-.58.94-.52 1.61.03.23.17.58.36.91H2c-.55 0-1 .45-1 1v3h1v5c0 .55.45 1 1 1h9c.55 0 1-.45 1-1V8h1V5c0-.55-.45-1-1-1h.02zm-4.78-.88c.17-.36.42-.67.75-.92.3-.23.72-.39 1.05-.41h.09c.45 0 .66.11.8.25s.33.39.3.95c-.05.19-.25.61-.5 1h-2.9l.41-.88v.01zM4.11 2.04c.13-.13.31-.25.91-.25.31 0 .72.17 1.03.41.33.25.58.55.75.92l.42.88h-2.9c-.25-.39-.45-.81-.5-1-.03-.56.16-.81.3-.95l-.01-.01zm2.91 10.95h-4V8h4v5-.01zm0-6h-5V5h5v2-.01zm5 6h-4V8h4v5-.01zm1-6h-5V5h5v2-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/gist-secret.svg b/htdocs/theme/common/octicons/build/svg/gist-secret.svg
new file mode 100644
index 00000000000..a6459e19bf2
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/gist-secret.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7.782 10.5l1 3.5h-4l1-3.5-.75-1.5h3.5l-.75 1.5zm2-4.5h-6l-2 1h10l-2-1zm-1-4l-2 1-2-1-1 3h6l-1-3zm4.03 7.75L9.782 9l1 2-2 3h3.22c.45 0 .86-.31.97-.75l.56-2.28c.14-.53-.19-1.08-.72-1.22zM3.782 9l-3.03.75c-.53.14-.86.69-.72 1.22l.56 2.28c.11.44.52.75.97.75h3.22l-2-3 1-2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/gist.svg b/htdocs/theme/common/octicons/build/svg/gist.svg
new file mode 100644
index 00000000000..9584460c593
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/gist.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M7.5 5L10 7.5 7.5 10l-.75-.75L8.5 7.5 6.75 5.75 7.5 5zm-3 0L2 7.5 4.5 10l.75-.75L3.5 7.5l1.75-1.75L4.5 5zM0 13V2c0-.55.45-1 1-1h10c.55 0 1 .45 1 1v11c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1zm1 0h10V2H1v11z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/git-branch.svg b/htdocs/theme/common/octicons/build/svg/git-branch.svg
new file mode 100644
index 00000000000..21ca8d8d3ac
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/git-branch.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M10 5c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v.3c-.02.52-.23.98-.63 1.38-.4.4-.86.61-1.38.63-.83.02-1.48.16-2 .45V4.72a1.993 1.993 0 0 0-1-3.72C.88 1 0 1.89 0 3a2 2 0 0 0 1 1.72v6.56c-.59.35-1 .99-1 1.72 0 1.11.89 2 2 2 1.11 0 2-.89 2-2 0-.53-.2-1-.53-1.36.09-.06.48-.41.59-.47.25-.11.56-.17.94-.17 1.05-.05 1.95-.45 2.75-1.25S8.95 7.77 9 6.73h-.02C9.59 6.37 10 5.73 10 5zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm0 12.41c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm6-8c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/git-commit.svg b/htdocs/theme/common/octicons/build/svg/git-commit.svg
new file mode 100644
index 00000000000..3cc2e82a86f
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/git-commit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M10.86 7c-.45-1.72-2-3-3.86-3-1.86 0-3.41 1.28-3.86 3H0v2h3.14c.45 1.72 2 3 3.86 3 1.86 0 3.41-1.28 3.86-3H14V7h-3.14zM7 10.2c-1.22 0-2.2-.98-2.2-2.2 0-1.22.98-2.2 2.2-2.2 1.22 0 2.2.98 2.2 2.2 0 1.22-.98 2.2-2.2 2.2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/git-compare.svg b/htdocs/theme/common/octicons/build/svg/git-compare.svg
new file mode 100644
index 00000000000..4737499a242
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/git-compare.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M5 12H4c-.27-.02-.48-.11-.69-.31-.21-.2-.3-.42-.31-.69V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V11c.03.78.34 1.47.94 2.06.6.59 1.28.91 2.06.94h1v2l3-3-3-3v2zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm11 9.48V5c-.03-.78-.34-1.47-.94-2.06-.6-.59-1.28-.91-2.06-.94H9V0L6 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 12 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/git-merge.svg b/htdocs/theme/common/octicons/build/svg/git-merge.svg
new file mode 100644
index 00000000000..fedb516064a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/git-merge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M10 7.01c-.73 0-1.38.41-1.73 1.02v-.02C7.22 7.99 6 7.65 5.14 6.99c-.75-.58-1.5-1.61-1.89-2.44A1.993 1.993 0 0 0 2 1C.89 1 0 1.9 0 3.01a2 2 0 0 0 1 1.72v6.56c-.59.35-1 .99-1 1.72 0 1.11.89 2 2 2a1.993 1.993 0 0 0 1-3.72V7.68c.67.7 1.44 1.27 2.3 1.69.86.42 2.03.63 2.97.64v-.02c.36.61 1 1.02 1.73 1.02 1.11 0 2-.89 2-2 0-1.11-.89-2-2-2zm-6.8 6c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.21c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm8 6c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/git-pull-request.svg b/htdocs/theme/common/octicons/build/svg/git-pull-request.svg
new file mode 100644
index 00000000000..4f597593774
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/git-pull-request.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/globe.svg b/htdocs/theme/common/octicons/build/svg/globe.svg
new file mode 100644
index 00000000000..990554c05eb
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/globe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 1C3.14 1 0 4.14 0 8s3.14 7 7 7c.48 0 .94-.05 1.38-.14-.17-.08-.2-.73-.02-1.09.19-.41.81-1.45.2-1.8-.61-.35-.44-.5-.81-.91-.37-.41-.22-.47-.25-.58-.08-.34.36-.89.39-.94.02-.06.02-.27 0-.33 0-.08-.27-.22-.34-.23-.06 0-.11.11-.2.13-.09.02-.5-.25-.59-.33-.09-.08-.14-.23-.27-.34-.13-.13-.14-.03-.33-.11s-.8-.31-1.28-.48c-.48-.19-.52-.47-.52-.66-.02-.2-.3-.47-.42-.67-.14-.2-.16-.47-.2-.41-.04.06.25.78.2.81-.05.02-.16-.2-.3-.38-.14-.19.14-.09-.3-.95s.14-1.3.17-1.75c.03-.45.38.17.19-.13-.19-.3 0-.89-.14-1.11-.13-.22-.88.25-.88.25.02-.22.69-.58 1.16-.92.47-.34.78-.06 1.16.05.39.13.41.09.28-.05-.13-.13.06-.17.36-.13.28.05.38.41.83.36.47-.03.05.09.11.22s-.06.11-.38.3c-.3.2.02.22.55.61s.38-.25.31-.55c-.07-.3.39-.06.39-.06.33.22.27.02.5.08.23.06.91.64.91.64-.83.44-.31.48-.17.59.14.11-.28.3-.28.3-.17-.17-.19.02-.3.08-.11.06-.02.22-.02.22-.56.09-.44.69-.42.83 0 .14-.38.36-.47.58-.09.2.25.64.06.66-.19.03-.34-.66-1.31-.41-.3.08-.94.41-.59 1.08.36.69.92-.19 1.11-.09.19.1-.06.53-.02.55.04.02.53.02.56.61.03.59.77.53.92.55.17 0 .7-.44.77-.45.06-.03.38-.28 1.03.09.66.36.98.31 1.2.47.22.16.08.47.28.58.2.11 1.06-.03 1.28.31.22.34-.88 2.09-1.22 2.28-.34.19-.48.64-.84.92s-.81.64-1.27.91c-.41.23-.47.66-.66.8 3.14-.7 5.48-3.5 5.48-6.84 0-3.86-3.14-7-7-7L7 1zm1.64 6.56c-.09.03-.28.22-.78-.08-.48-.3-.81-.23-.86-.28 0 0-.05-.11.17-.14.44-.05.98.41 1.11.41.13 0 .19-.13.41-.05.22.08.05.13-.05.14zM6.34 1.7c-.05-.03.03-.08.09-.14.03-.03.02-.11.05-.14.11-.11.61-.25.52.03-.11.27-.58.3-.66.25zm1.23.89c-.19-.02-.58-.05-.52-.14.3-.28-.09-.38-.34-.38-.25-.02-.34-.16-.22-.19.12-.03.61.02.7.08.08.06.52.25.55.38.02.13 0 .25-.17.25zm1.47-.05c-.14.09-.83-.41-.95-.52-.56-.48-.89-.31-1-.41-.11-.1-.08-.19.11-.34.19-.15.69.06 1 .09.3.03.66.27.66.55.02.25.33.5.19.63h-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/grabber.svg b/htdocs/theme/common/octicons/build/svg/grabber.svg
new file mode 100644
index 00000000000..1a41fd02857
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/grabber.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16"><path fill-rule="evenodd" d="M8 4v1H0V4h8zM0 8h8V7H0v1zm0 3h8v-1H0v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/graph.svg b/htdocs/theme/common/octicons/build/svg/graph.svg
new file mode 100644
index 00000000000..cd3909ed9fa
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/graph.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M16 14v1H0V0h1v14h15zM5 13H3V8h2v5zm4 0H7V3h2v10zm4 0h-2V6h2v7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/heart.svg b/htdocs/theme/common/octicons/build/svg/heart.svg
new file mode 100644
index 00000000000..8b81f8845fe
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/heart.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11.2 3c-.52-.63-1.25-.95-2.2-1-.97 0-1.69.42-2.2 1-.51.58-.78.92-.8 1-.02-.08-.28-.42-.8-1-.52-.58-1.17-1-2.2-1-.95.05-1.69.38-2.2 1-.52.61-.78 1.28-.8 2 0 .52.09 1.52.67 2.67C1.25 8.82 3.01 10.61 6 13c2.98-2.39 4.77-4.17 5.34-5.33C11.91 6.51 12 5.5 12 5c-.02-.72-.28-1.39-.8-2.02V3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/history.svg b/htdocs/theme/common/octicons/build/svg/history.svg
new file mode 100644
index 00000000000..ee4d9fb1ca6
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/history.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M8 13H6V6h5v2H8v5zM7 1C4.81 1 2.87 2.02 1.59 3.59L0 2v4h4L2.5 4.5C3.55 3.17 5.17 2.3 7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-.34.03-.67.09-1H.08C.03 7.33 0 7.66 0 8c0 3.86 3.14 7 7 7s7-3.14 7-7-3.14-7-7-7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/home.svg b/htdocs/theme/common/octicons/build/svg/home.svg
new file mode 100644
index 00000000000..f3d3138fe7c
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M16 9l-3-3V2h-2v2L8 1 0 9h2l1 5c0 .55.45 1 1 1h8c.55 0 1-.45 1-1l1-5h2zm-4 5H9v-4H7v4H4L2.81 7.69 8 2.5l5.19 5.19L12 14z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/horizontal-rule.svg b/htdocs/theme/common/octicons/build/svg/horizontal-rule.svg
new file mode 100644
index 00000000000..9a05c305c3d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/horizontal-rule.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M1 7h2v2h1V3H3v3H1V3H0v6h1V7zm9 2V7H9v2h1zm0-3V4H9v2h1zM7 6V4h2V3H6v6h1V7h2V6H7zm-7 7h10v-2H0v2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/hubot.svg b/htdocs/theme/common/octicons/build/svg/hubot.svg
new file mode 100644
index 00000000000..fea9f4b2237
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/hubot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M3 6c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h8c.55 0 1-.45 1-1V7c0-.55-.45-1-1-1H3zm8 1.75L9.75 9h-1.5L7 7.75 5.75 9h-1.5L3 7.75V7h.75L5 8.25 6.25 7h1.5L9 8.25 10.25 7H11v.75zM5 11h4v1H5v-1zm2-9C3.14 2 0 4.91 0 8.5V13c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V8.5C14 4.91 10.86 2 7 2zm6 11H1V8.5c0-3.09 2.64-5.59 6-5.59s6 2.5 6 5.59V13z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/inbox.svg b/htdocs/theme/common/octicons/build/svg/inbox.svg
new file mode 100644
index 00000000000..f9cfec28bce
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/inbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M14 9l-1.13-7.14c-.08-.48-.5-.86-1-.86H2.13c-.5 0-.92.38-1 .86L0 9v5c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V9zm-3.28.55l-.44.89c-.17.34-.52.56-.91.56H4.61c-.38 0-.72-.22-.89-.55l-.44-.91c-.17-.33-.52-.55-.89-.55H1l1-7h10l1 7h-1.38c-.39 0-.73.22-.91.55l.01.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/info.svg b/htdocs/theme/common/octicons/build/svg/info.svg
new file mode 100644
index 00000000000..745ef337a3d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M6.3 5.71a.942.942 0 0 1-.28-.7c0-.28.09-.52.28-.7.19-.18.42-.28.7-.28.28 0 .52.09.7.28.18.19.28.42.28.7 0 .28-.09.52-.28.7a1 1 0 0 1-.7.3c-.28 0-.52-.11-.7-.3zM8 8.01c-.02-.25-.11-.48-.31-.69-.2-.19-.42-.3-.69-.31H6c-.27.02-.48.13-.69.31-.2.2-.3.44-.31.69h1v3c.02.27.11.5.31.69.2.2.42.31.69.31h1c.27 0 .48-.11.69-.31.2-.19.3-.42.31-.69H8V8v.01zM7 2.32C3.86 2.32 1.3 4.86 1.3 8c0 3.14 2.56 5.7 5.7 5.7s5.7-2.55 5.7-5.7c0-3.15-2.56-5.69-5.7-5.69v.01zM7 1c3.86 0 7 3.14 7 7s-3.14 7-7 7-7-3.12-7-7 3.14-7 7-7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/issue-closed.svg b/htdocs/theme/common/octicons/build/svg/issue-closed.svg
new file mode 100644
index 00000000000..0a7819ac084
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/issue-closed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7 10h2v2H7v-2zm2-6H7v5h2V4zm1.5 1.5l-1 1L12 9l4-4.5-1-1L12 7l-1.5-1.5zM8 13.7A5.71 5.71 0 0 1 2.3 8c0-3.14 2.56-5.7 5.7-5.7 1.83 0 3.45.88 4.5 2.2l.92-.92A6.947 6.947 0 0 0 8 1C4.14 1 1 4.14 1 8s3.14 7 7 7 7-3.14 7-7l-1.52 1.52c-.66 2.41-2.86 4.19-5.48 4.19v-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/issue-opened.svg b/htdocs/theme/common/octicons/build/svg/issue-opened.svg
new file mode 100644
index 00000000000..a88cbcc7fd1
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/issue-opened.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/issue-reopened.svg b/htdocs/theme/common/octicons/build/svg/issue-reopened.svg
new file mode 100644
index 00000000000..789e18bffb5
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/issue-reopened.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M8 9H6V4h2v5zm-2 3h2v-2H6v2zm6.33-2H10l1.5 1.5c-1.05 1.33-2.67 2.2-4.5 2.2A5.71 5.71 0 0 1 1.3 8c0-.34.03-.67.09-1H.08C.03 7.33 0 7.66 0 8c0 3.86 3.14 7 7 7 2.19 0 4.13-1.02 5.41-2.59L14 14v-4h-1.67zM1.67 6H4L2.5 4.5C3.55 3.17 5.17 2.3 7 2.3c3.14 0 5.7 2.56 5.7 5.7 0 .34-.03.67-.09 1h1.31c.05-.33.08-.66.08-1 0-3.86-3.14-7-7-7-2.19 0-4.13 1.02-5.41 2.59L0 2v4h1.67z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/italic.svg b/htdocs/theme/common/octicons/build/svg/italic.svg
new file mode 100644
index 00000000000..51d65f10a1a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/italic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="16" viewBox="0 0 6 16"><path fill-rule="evenodd" d="M2.81 5h1.98L3 14H1l1.81-9zm.36-2.7c0-.7.58-1.3 1.33-1.3.56 0 1.13.38 1.13 1.03 0 .75-.59 1.3-1.33 1.3-.58 0-1.13-.38-1.13-1.03z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/jersey.svg b/htdocs/theme/common/octicons/build/svg/jersey.svg
new file mode 100644
index 00000000000..776e4567941
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/jersey.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M4.5 6l-.5.5v5l.5.5h2l.5-.5v-5L6.5 6h-2zM6 11H5V7h1v4zm6.27-7.25C12.05 2.37 11.96 1.12 12 0H9.02c0 .27-.13.48-.39.69-.25.2-.63.3-1.13.3-.5 0-.88-.09-1.13-.3-.23-.2-.36-.42-.36-.69H3c.05 1.13-.03 2.38-.25 3.75C2.55 5.13 1.95 5.88 1 6v9c.02.27.11.48.31.69.2.21.42.3.69.31h11c.27-.02.48-.11.69-.31.21-.2.3-.42.31-.69V6c-.95-.13-1.53-.88-1.75-2.25h.02zM13 15H2V7c.89-.5 1.48-1.25 1.72-2.25S4.03 2.5 4 1h1c-.02.78.16 1.47.52 2.06.36.58 1.02.89 2 .94.98-.02 1.64-.33 2-.94.36-.59.5-1.28.48-2.06h1c.02 1.42.13 2.55.33 3.38.2.81.69 2 1.67 2.63v8V15zM8.5 6l-.5.5v5l.5.5h2l.5-.5v-5l-.5-.5h-2zm1.5 5H9V7h1v4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/kebab-horizontal.svg b/htdocs/theme/common/octicons/build/svg/kebab-horizontal.svg
new file mode 100644
index 00000000000..7c472d3657e
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/kebab-horizontal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="16" viewBox="0 0 13 16"><path fill-rule="evenodd" d="M1.5 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zm5 0a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zM13 7.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/kebab-vertical.svg b/htdocs/theme/common/octicons/build/svg/kebab-vertical.svg
new file mode 100644
index 00000000000..2aaee6009fe
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/kebab-vertical.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="3" height="16" viewBox="0 0 3 16"><path fill-rule="evenodd" d="M0 2.5a1.5 1.5 0 1 0 3 0 1.5 1.5 0 0 0-3 0zm0 5a1.5 1.5 0 1 0 3 0 1.5 1.5 0 0 0-3 0zM1.5 14a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/key.svg b/htdocs/theme/common/octicons/build/svg/key.svg
new file mode 100644
index 00000000000..ac8badc2661
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M12.83 2.17C12.08 1.42 11.14 1.03 10 1c-1.13.03-2.08.42-2.83 1.17S6.04 3.86 6.01 5c0 .3.03.59.09.89L0 12v1l1 1h2l1-1v-1h1v-1h1v-1h2l1.09-1.11c.3.08.59.11.91.11 1.14-.03 2.08-.42 2.83-1.17S13.97 6.14 14 5c-.03-1.14-.42-2.08-1.17-2.83zM11 5.38c-.77 0-1.38-.61-1.38-1.38 0-.77.61-1.38 1.38-1.38.77 0 1.38.61 1.38 1.38 0 .77-.61 1.38-1.38 1.38z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/keyboard.svg b/htdocs/theme/common/octicons/build/svg/keyboard.svg
new file mode 100644
index 00000000000..89712ade509
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/keyboard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10 5H9V4h1v1zM3 6H2v1h1V6zm5-2H7v1h1V4zM4 4H2v1h2V4zm8 7h2v-1h-2v1zM8 7h1V6H8v1zm-4 3H2v1h2v-1zm8-6h-1v1h1V4zm2 0h-1v1h1V4zm-2 5h2V6h-2v3zm4-6v9c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h14c.55 0 1 .45 1 1zm-1 0H1v9h14V3zM6 7h1V6H6v1zm0-3H5v1h1V4zM4 7h1V6H4v1zm1 4h6v-1H5v1zm5-4h1V6h-1v1zM3 8H2v1h1V8zm5 0v1h1V8H8zM6 8v1h1V8H6zM5 8H4v1h1V8zm5 1h1V8h-1v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/law.svg b/htdocs/theme/common/octicons/build/svg/law.svg
new file mode 100644
index 00000000000..5ccc46420fc
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/law.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 4c-.83 0-1.5-.67-1.5-1.5S6.17 1 7 1s1.5.67 1.5 1.5S7.83 4 7 4zm7 6c0 1.11-.89 2-2 2h-1c-1.11 0-2-.89-2-2l2-4h-1c-.55 0-1-.45-1-1H8v8c.42 0 1 .45 1 1h1c.42 0 1 .45 1 1H3c0-.55.58-1 1-1h1c0-.55.58-1 1-1h.03L6 5H5c0 .55-.45 1-1 1H3l2 4c0 1.11-.89 2-2 2H2c-1.11 0-2-.89-2-2l2-4H1V5h3c0-.55.45-1 1-1h4c.55 0 1 .45 1 1h3v1h-1l2 4zM2.5 7L1 10h3L2.5 7zM13 10l-1.5-3-1.5 3h3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/light-bulb.svg b/htdocs/theme/common/octicons/build/svg/light-bulb.svg
new file mode 100644
index 00000000000..d2ff74ce4f7
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/light-bulb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M6.5 0C3.48 0 1 2.19 1 5c0 .92.55 2.25 1 3 1.34 2.25 1.78 2.78 2 4v1h5v-1c.22-1.22.66-1.75 2-4 .45-.75 1-2.08 1-3 0-2.81-2.48-5-5.5-5zm3.64 7.48c-.25.44-.47.8-.67 1.11-.86 1.41-1.25 2.06-1.45 3.23-.02.05-.02.11-.02.17H5c0-.06 0-.13-.02-.17-.2-1.17-.59-1.83-1.45-3.23-.2-.31-.42-.67-.67-1.11C2.44 6.78 2 5.65 2 5c0-2.2 2.02-4 4.5-4 1.22 0 2.36.42 3.22 1.19C10.55 2.94 11 3.94 11 5c0 .66-.44 1.78-.86 2.48zM4 14h5c-.23 1.14-1.3 2-2.5 2s-2.27-.86-2.5-2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/link-external.svg b/htdocs/theme/common/octicons/build/svg/link-external.svg
new file mode 100644
index 00000000000..70b569d3742
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/link-external.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11 10h1v3c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h3v1H1v10h10v-3zM6 2l2.25 2.25L5 7.5 6.5 9l3.25-3.25L12 8V2H6z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/link.svg b/htdocs/theme/common/octicons/build/svg/link.svg
new file mode 100644
index 00000000000..820aef771e0
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/list-ordered.svg b/htdocs/theme/common/octicons/build/svg/list-ordered.svg
new file mode 100644
index 00000000000..64126c3b8ef
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/list-ordered.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M12.01 13c0 .59 0 1-.59 1H4.6c-.59 0-.59-.41-.59-1 0-.59 0-1 .59-1h6.81c.59 0 .59.41.59 1h.01zM4.6 4h6.81C12 4 12 3.59 12 3c0-.59 0-1-.59-1H4.6c-.59 0-.59.41-.59 1 0 .59 0 1 .59 1zm6.81 3H4.6c-.59 0-.59.41-.59 1 0 .59 0 1 .59 1h6.81C12 9 12 8.59 12 8c0-.59 0-1-.59-1zm-9.4-6h-.72c-.3.19-.58.25-1.03.34V2h.75v2.14H.17V5h2.84v-.86h-1V1zm.25 8.13c-.17 0-.45.03-.66.06.53-.56 1.14-1.25 1.14-1.89C2.72 6.52 2.18 6 1.38 6c-.59 0-.97.2-1.38.64l.58.58c.19-.19.38-.38.64-.38.28 0 .48.16.48.52 0 .53-.77 1.2-1.7 2.06V10h3l-.09-.88h-.66l.01.01zm-.08 3.78v-.03c.44-.19.64-.47.64-.86 0-.7-.56-1.11-1.44-1.11-.48 0-.89.19-1.28.52l.55.64c.25-.2.44-.31.69-.31.27 0 .42.13.42.36 0 .27-.2.44-.86.44v.75c.83 0 .98.17.98.47 0 .25-.23.38-.58.38-.28 0-.56-.14-.81-.38l-.48.66c.3.36.77.56 1.41.56.83 0 1.53-.41 1.53-1.16 0-.5-.31-.81-.77-.94v.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/list-unordered.svg b/htdocs/theme/common/octicons/build/svg/list-unordered.svg
new file mode 100644
index 00000000000..0b435366758
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/list-unordered.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M2 13c0 .59 0 1-.59 1H.59C0 14 0 13.59 0 13c0-.59 0-1 .59-1h.81c.59 0 .59.41.59 1H2zm2.59-9h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1H4.59C4 2 4 2.41 4 3c0 .59 0 1 .59 1zM1.41 7H.59C0 7 0 7.41 0 8c0 .59 0 1 .59 1h.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm0-5H.59C0 2 0 2.41 0 3c0 .59 0 1 .59 1h.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm10 5H4.59C4 7 4 7.41 4 8c0 .59 0 1 .59 1h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm0 5H4.59C4 12 4 12.41 4 13c0 .59 0 1 .59 1h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/location.svg b/htdocs/theme/common/octicons/build/svg/location.svg
new file mode 100644
index 00000000000..f6372a3c441
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/location.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M6 0C2.69 0 0 2.5 0 5.5 0 10.02 6 16 6 16s6-5.98 6-10.5C12 2.5 9.31 0 6 0zm0 14.55C4.14 12.52 1 8.44 1 5.5 1 3.02 3.25 1 6 1c1.34 0 2.61.48 3.56 1.36.92.86 1.44 1.97 1.44 3.14 0 2.94-3.14 7.02-5 9.05zM8 5.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/lock.svg b/htdocs/theme/common/octicons/build/svg/lock.svg
new file mode 100644
index 00000000000..55870644246
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M4 13H3v-1h1v1zm8-6v7c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V7c0-.55.45-1 1-1h1V4c0-2.2 1.8-4 4-4s4 1.8 4 4v2h1c.55 0 1 .45 1 1zM3.8 6h4.41V4c0-1.22-.98-2.2-2.2-2.2-1.22 0-2.2.98-2.2 2.2v2H3.8zM11 7H2v7h9V7zM4 8H3v1h1V8zm0 2H3v1h1v-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/logo-gist.svg b/htdocs/theme/common/octicons/build/svg/logo-gist.svg
new file mode 100644
index 00000000000..29f2213e1e8
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/logo-gist.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="25" height="16" viewBox="0 0 25 16"><path fill-rule="evenodd" d="M4.7 8.73h2.45v4.02c-.55.27-1.64.34-2.53.34-2.56 0-3.47-2.2-3.47-5.05 0-2.85.91-5.06 3.48-5.06 1.28 0 2.06.23 3.28.73V2.66C7.27 2.33 6.25 2 4.63 2 1.13 2 0 4.69 0 8.03c0 3.34 1.11 6.03 4.63 6.03 1.64 0 2.81-.27 3.59-.64V7.73H4.7v1zm6.39 3.72V6.06h-1.05v6.28c0 1.25.58 1.72 1.72 1.72v-.89c-.48 0-.67-.16-.67-.7v-.02zm.25-8.72c0-.44-.33-.78-.78-.78s-.77.34-.77.78.33.78.77.78.78-.34.78-.78zm4.34 5.69c-1.5-.13-1.78-.48-1.78-1.17 0-.77.33-1.34 1.88-1.34 1.05 0 1.66.16 2.27.36v-.94c-.69-.3-1.52-.39-2.25-.39-2.2 0-2.92 1.2-2.92 2.31 0 1.08.47 1.88 2.73 2.08 1.55.13 1.77.63 1.77 1.34 0 .73-.44 1.42-2.06 1.42-1.11 0-1.86-.19-2.33-.36v.94c.5.2 1.58.39 2.33.39 2.38 0 3.14-1.2 3.14-2.41 0-1.28-.53-2.03-2.75-2.23h-.03zm8.58-2.47v-.86h-2.42v-2.5l-1.08.31v2.11l-1.56.44v.48h1.56v5c0 1.53 1.19 2.13 2.5 2.13.19 0 .52-.02.69-.05v-.89c-.19.03-.41.03-.61.03-.97 0-1.5-.39-1.5-1.34V6.94h2.42v.02-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/logo-github.svg b/htdocs/theme/common/octicons/build/svg/logo-github.svg
new file mode 100644
index 00000000000..253c13ecbaa
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/logo-github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="45" height="16" viewBox="0 0 45 16"><path fill-rule="evenodd" d="M18.53 12.03h-.02c.009 0 .015.01.024.011h.006l-.01-.01zm.004.011c-.093.001-.327.05-.574.05-.78 0-1.05-.36-1.05-.83V8.13h1.59c.09 0 .16-.08.16-.19v-1.7c0-.09-.08-.17-.16-.17h-1.59V3.96c0-.08-.05-.13-.14-.13h-2.16c-.09 0-.14.05-.14.13v2.17s-1.09.27-1.16.28c-.08.02-.13.09-.13.17v1.36c0 .11.08.19.17.19h1.11v3.28c0 2.44 1.7 2.69 2.86 2.69.53 0 1.17-.17 1.27-.22.06-.02.09-.09.09-.16v-1.5a.177.177 0 0 0-.146-.18zm23.696-2.2c0-1.81-.73-2.05-1.5-1.97-.6.04-1.08.34-1.08.34v3.52s.49.34 1.22.36c1.03.03 1.36-.34 1.36-2.25zm2.43-.16c0 3.43-1.11 4.41-3.05 4.41-1.64 0-2.52-.83-2.52-.83s-.04.46-.09.52c-.03.06-.08.08-.14.08h-1.48c-.1 0-.19-.08-.19-.17l.02-11.11c0-.09.08-.17.17-.17h2.13c.09 0 .17.08.17.17v3.77s.82-.53 2.02-.53l-.01-.02c1.2 0 2.97.45 2.97 3.88zm-8.72-3.61H33.84c-.11 0-.17.08-.17.19v5.44s-.55.39-1.3.39-.97-.34-.97-1.09V6.25c0-.09-.08-.17-.17-.17h-2.14c-.09 0-.17.08-.17.17v5.11c0 2.2 1.23 2.75 2.92 2.75 1.39 0 2.52-.77 2.52-.77s.05.39.08.45c.02.05.09.09.16.09h1.34c.11 0 .17-.08.17-.17l.02-7.47c0-.09-.08-.17-.19-.17zm-23.7-.01h-2.13c-.09 0-.17.09-.17.2v7.34c0 .2.13.27.3.27h1.92c.2 0 .25-.09.25-.27V6.23c0-.09-.08-.17-.17-.17zm-1.05-3.38c-.77 0-1.38.61-1.38 1.38 0 .77.61 1.38 1.38 1.38.75 0 1.36-.61 1.36-1.38 0-.77-.61-1.38-1.36-1.38zm16.49-.25h-2.11c-.09 0-.17.08-.17.17v4.09h-3.31V2.6c0-.09-.08-.17-.17-.17h-2.13c-.09 0-.17.08-.17.17v11.11c0 .09.09.17.17.17h2.13c.09 0 .17-.08.17-.17V8.96h3.31l-.02 4.75c0 .09.08.17.17.17h2.13c.09 0 .17-.08.17-.17V2.6c0-.09-.08-.17-.17-.17zM8.81 7.35v5.74c0 .04-.01.11-.06.13 0 0-1.25.89-3.31.89-2.49 0-5.44-.78-5.44-5.92S2.58 1.99 5.1 2c2.18 0 3.06.49 3.2.58.04.05.06.09.06.14L7.94 4.5c0 .09-.09.2-.2.17-.36-.11-.9-.33-2.17-.33-1.47 0-3.05.42-3.05 3.73s1.5 3.7 2.58 3.7c.92 0 1.25-.11 1.25-.11v-2.3H4.88c-.11 0-.19-.08-.19-.17V7.35c0-.09.08-.17.19-.17h3.74c.11 0 .19.08.19.17z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/mail-read.svg b/htdocs/theme/common/octicons/build/svg/mail-read.svg
new file mode 100644
index 00000000000..bf4deaf9b29
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/mail-read.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M6 5H4V4h2v1zm3 1H4v1h5V6zm5-.48V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V5.52c0-.33.16-.63.42-.81L2 3.58V3c0-.55.45-1 1-1h1.2L7 0l2.8 2H11c.55 0 1 .45 1 1v.58l1.58 1.13c.27.19.42.48.42.81zM3 7.5L7 10l4-2.5V3H3v4.5zm-2 6l4.5-3-4.5-3v6zm11 .5l-5-3-5 3h10zm1-6.5l-4.5 3 4.5 3v-6z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/mail.svg b/htdocs/theme/common/octicons/build/svg/mail.svg
new file mode 100644
index 00000000000..9fca68be5d6
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/mail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M0 4v8c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1H1c-.55 0-1 .45-1 1zm13 0L7 9 1 4h12zM1 5.5l4 3-4 3v-6zM2 12l3.5-3L7 10.5 8.5 9l3.5 3H2zm11-.5l-4-3 4-3v6z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/mark-github.svg b/htdocs/theme/common/octicons/build/svg/mark-github.svg
new file mode 100644
index 00000000000..af1bfa1f96c
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/mark-github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/markdown.svg b/htdocs/theme/common/octicons/build/svg/markdown.svg
new file mode 100644
index 00000000000..999110e268c
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/markdown.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M14.85 3H1.15C.52 3 0 3.52 0 4.15v7.69C0 12.48.52 13 1.15 13h13.69c.64 0 1.15-.52 1.15-1.15v-7.7C16 3.52 15.48 3 14.85 3zM9 11H7V8L5.5 9.92 4 8v3H2V5h2l1.5 2L7 5h2v6zm2.99.5L9.5 8H11V5h2v3h1.5l-2.51 3.5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/megaphone.svg b/htdocs/theme/common/octicons/build/svg/megaphone.svg
new file mode 100644
index 00000000000..a62f82dc892
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/megaphone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10 1c-.17 0-.36.05-.52.14C8.04 2.02 4.5 4.58 3 5c-1.38 0-3 .67-3 2.5S1.63 10 3 10c.3.08.64.23 1 .41V15h2v-3.45c1.34.86 2.69 1.83 3.48 2.31.16.09.34.14.52.14.52 0 1-.42 1-1V2c0-.58-.48-1-1-1zm0 12c-.38-.23-.89-.58-1.5-1-.16-.11-.33-.22-.5-.34V3.31c.16-.11.31-.2.47-.31.61-.41 1.16-.77 1.53-1v11zm2-6h4v1h-4V7zm0 2l4 2v1l-4-2V9zm4-6v1l-4 2V5l4-2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/mention.svg b/htdocs/theme/common/octicons/build/svg/mention.svg
new file mode 100644
index 00000000000..c09499bd9cd
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/mention.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M6.58 15c1.25 0 2.52-.31 3.56-.94l-.42-.94c-.84.52-1.89.83-3.03.83-3.23 0-5.64-2.08-5.64-5.72 0-4.37 3.23-7.18 6.58-7.18 3.45 0 5.22 2.19 5.22 5.2 0 2.39-1.34 3.86-2.5 3.86-1.05 0-1.36-.73-1.05-2.19l.73-3.75H8.98l-.11.72c-.41-.63-.94-.83-1.56-.83-2.19 0-3.66 2.39-3.66 4.38 0 1.67.94 2.61 2.3 2.61.84 0 1.67-.53 2.3-1.25.11.94.94 1.45 1.98 1.45 1.67 0 3.77-1.67 3.77-5C14 2.61 11.59 0 7.83 0 3.66 0 0 3.33 0 8.33 0 12.71 2.92 15 6.58 15zm-.31-5c-.73 0-1.36-.52-1.36-1.67 0-1.45.94-3.22 2.41-3.22.52 0 .84.2 1.25.83l-.52 3.02c-.63.73-1.25 1.05-1.78 1.05V10z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/milestone.svg b/htdocs/theme/common/octicons/build/svg/milestone.svg
new file mode 100644
index 00000000000..803465bdba9
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/milestone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M8 2H6V0h2v2zm4 5H2c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h10l2 2-2 2zM8 4H6v2h2V4zM6 16h2V8H6v8z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/mirror.svg b/htdocs/theme/common/octicons/build/svg/mirror.svg
new file mode 100644
index 00000000000..76e0c37e070
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/mirror.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.5 4.7L8.5 0l-7 4.7c-.3.19-.5.45-.5.8V16l7.5-4 7.5 4V5.5c0-.34-.2-.61-.5-.8zm-.5 9.8l-6-3.25V10H8v1.25L2 14.5v-9l6-4V6h1V1.5l6 4v9zM6 7h5V5l3 3-3 3V9H6v2L3 8l3-3v2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/mortar-board.svg b/htdocs/theme/common/octicons/build/svg/mortar-board.svg
new file mode 100644
index 00000000000..302415b1736
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/mortar-board.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.808 9.405l-3.83-1.19c-4-8 0 1.5 0 2.5s1.8 1.5 4 1.5 4-.5 4-1.5v-2.5l-3.83 1.19a.73.73 0 0 1-.36 0h.02zm.28-6.39a.34.34 0 0 0-.2 0l-7.64 2.38a.35.35 0 0 0 0 .67l1.73.55v1.77c-.3.17-.5.5-.5.86 0 .19.05.36.14.5-.08.14-.14.31-.14.5v2.58c0 .55 2 .55 2 0v-2.58c0-.19-.05-.36-.14-.5.08-.14.14-.31.14-.5 0-.38-.2-.69-.5-.86v-1.45l4.89 1.53c.06.02.14.02.2 0l7.64-2.38a.35.35 0 0 0 0-.67l-7.63-2.39.01-.01zm-.09 3.2c-.55 0-1-.22-1-.5s.45-.5 1-.5 1 .22 1 .5-.45.5-1 .5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/mute.svg b/htdocs/theme/common/octicons/build/svg/mute.svg
new file mode 100644
index 00000000000..4d894a1cadd
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/mute.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 2.75v10.38c0 .67-.81 1-1.28.53L3 9.94H1c-.55 0-1-.45-1-1v-2c0-.55.45-1 1-1h2l3.72-3.72C7.19 1.75 8 2.08 8 2.75zm7.53 3.22l-1.06-1.06-1.97 1.97-1.97-1.97-1.06 1.06 1.97 1.97-1.97 1.97 1.06 1.06L12.5 9l1.97 1.97 1.06-1.06-1.97-1.97 1.97-1.97z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/no-newline.svg b/htdocs/theme/common/octicons/build/svg/no-newline.svg
new file mode 100644
index 00000000000..2a8fb94fe31
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/no-newline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M16 5v3c0 .55-.45 1-1 1h-3v2L9 8l3-3v2h2V5h2zM8 8c0 2.2-1.8 4-4 4s-4-1.8-4-4 1.8-4 4-4 4 1.8 4 4zM1.5 9.66L5.66 5.5C5.18 5.19 4.61 5 4 5 2.34 5 1 6.34 1 8c0 .61.19 1.17.5 1.66zM7 8c0-.61-.19-1.17-.5-1.66L2.34 10.5c.48.31 1.05.5 1.66.5 1.66 0 3-1.34 3-3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/note.svg b/htdocs/theme/common/octicons/build/svg/note.svg
new file mode 100644
index 00000000000..cbf7963eb1a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/note.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M3 10h4V9H3v1zm0-2h6V7H3v1zm0-2h8V5H3v1zm10 6H1V3h12v9zM1 2c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1H1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/octoface.svg b/htdocs/theme/common/octicons/build/svg/octoface.svg
new file mode 100644
index 00000000000..bb1a40dce94
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/octoface.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M14.7 5.34c.13-.32.55-1.59-.13-3.31 0 0-1.05-.33-3.44 1.3-1-.28-2.07-.32-3.13-.32s-2.13.04-3.13.32c-2.39-1.64-3.44-1.3-3.44-1.3-.68 1.72-.26 2.99-.13 3.31C.49 6.21 0 7.33 0 8.69 0 13.84 3.33 15 7.98 15S16 13.84 16 8.69c0-1.36-.49-2.48-1.3-3.35zM8 14.02c-3.3 0-5.98-.15-5.98-3.35 0-.76.38-1.48 1.02-2.07 1.07-.98 2.9-.46 4.96-.46 2.07 0 3.88-.52 4.96.46.65.59 1.02 1.3 1.02 2.07 0 3.19-2.68 3.35-5.98 3.35zM5.49 9.01c-.66 0-1.2.8-1.2 1.78s.54 1.79 1.2 1.79c.66 0 1.2-.8 1.2-1.79s-.54-1.78-1.2-1.78zm5.02 0c-.66 0-1.2.79-1.2 1.78s.54 1.79 1.2 1.79c.66 0 1.2-.8 1.2-1.79s-.53-1.78-1.2-1.78z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/organization.svg b/htdocs/theme/common/octicons/build/svg/organization.svg
new file mode 100644
index 00000000000..af333e418dd
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/organization.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M16 12.999c0 .439-.45 1-1 1H7.995c-.539 0-.994-.447-.995-.999H1c-.54 0-1-.561-1-1 0-2.634 3-4 3-4s.229-.409 0-1c-.841-.621-1.058-.59-1-3 .058-2.419 1.367-3 2.5-3s2.442.58 2.5 3c.058 2.41-.159 2.379-1 3-.229.59 0 1 0 1s1.549.711 2.42 2.088A6.78 6.78 0 0 1 10 8.999s.229-.409 0-1c-.841-.62-1.058-.59-1-3 .058-2.419 1.367-3 2.5-3s2.437.581 2.495 3c.059 2.41-.158 2.38-1 3-.229.59 0 1 0 1s3.005 1.366 3.005 4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/package.svg b/htdocs/theme/common/octicons/build/svg/package.svg
new file mode 100644
index 00000000000..720e30026a5
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/package.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1 4.732v7.47c0 .45.3.84.75.97l6.5 1.73c.16.05.34.05.5 0l6.5-1.73c.45-.13.75-.52.75-.97v-7.47c0-.45-.3-.84-.75-.97l-6.5-1.74a1.4 1.4 0 0 0-.5 0l-6.5 1.74c-.45.13-.75.52-.75.97zm7 9.09l-6-1.59v-6.77l6 1.61v6.75zm-6-9.36l2.5-.67 6.5 1.73-2.5.67L2 4.463zm13 7.77l-6 1.59v-6.75l2-.55v2.44l2-.53v-2.44l2-.53v6.77zm-2-7.24l-6.5-1.73 2-.53 6.5 1.73-2 .53z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/paintcan.svg b/htdocs/theme/common/octicons/build/svg/paintcan.svg
new file mode 100644
index 00000000000..08b4a4ba574
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/paintcan.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M6 0C2.69 0 0 2.69 0 6v1c0 .55.45 1 1 1v5c0 1.1 2.24 2 5 2s5-.9 5-2V8c.55 0 1-.45 1-1V6c0-3.31-2.69-6-6-6zm3 10v.5c0 .28-.22.5-.5.5s-.5-.22-.5-.5V10c0-.28-.22-.5-.5-.5s-.5.22-.5.5v2.5c0 .28-.22.5-.5.5s-.5-.22-.5-.5v-2c0-.28-.22-.5-.5-.5s-.5.22-.5.5v.5c0 .55-.45 1-1 1s-1-.45-1-1v-1c-.55 0-1-.45-1-1V7.2c.91.49 2.36.8 4 .8 1.64 0 3.09-.31 4-.8V9c0 .55-.45 1-1 1zM6 7c-1.68 0-3.12-.41-3.71-1C2.88 5.41 4.32 5 6 5c1.68 0 3.12.41 3.71 1-.59.59-2.03 1-3.71 1zm0-3c-2.76 0-5 .89-5 2 0-2.76 2.24-5 5-5s5 2.24 5 5c0-1.1-2.24-2-5-2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/pencil.svg b/htdocs/theme/common/octicons/build/svg/pencil.svg
new file mode 100644
index 00000000000..41c6e7ec6f8
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/pencil.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M0 11.592v3h3l8-8-3-3-8 8zm3 2H1v-2h1v1h1v1zm10.3-9.3l-1.3 1.3-3-3 1.3-1.3a.996.996 0 0 1 1.41 0l1.59 1.59c.39.39.39 1.02 0 1.41z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/person.svg b/htdocs/theme/common/octicons/build/svg/person.svg
new file mode 100644
index 00000000000..5871e2f447a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/person.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M12 14.002a.998.998 0 0 1-.998.998H1.001A1 1 0 0 1 0 13.999V13c0-2.633 4-4 4-4s.229-.409 0-1c-.841-.62-.944-1.59-1-4 .173-2.413 1.867-3 3-3s2.827.586 3 3c-.056 2.41-.159 3.38-1 4-.229.59 0 1 0 1s4 1.367 4 4v1.002z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/pin.svg b/htdocs/theme/common/octicons/build/svg/pin.svg
new file mode 100644
index 00000000000..861ae05afdc
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/pin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10 1.494v.8l.5 1-4.5 3H2.2c-.44 0-.67.53-.34.86L5 10.294l-4 5 5-4 3.14 3.14a.5.5 0 0 0 .86-.34v-3.8l3-4.5 1 .5h.8c.44 0 .67-.53.34-.86l-4.28-4.28a.5.5 0 0 0-.86.34z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/plug.svg b/htdocs/theme/common/octicons/build/svg/plug.svg
new file mode 100644
index 00000000000..42865d52931
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/plug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M14 6V5h-4V3H8v1H6c-1.03 0-1.77.81-2 2L3 7c-1.66 0-3 1.34-3 3v2h1v-2c0-1.11.89-2 2-2l1 1c.25 1.16.98 2 2 2h2v1h2v-2h4V9h-4V6h4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/plus-small.svg b/htdocs/theme/common/octicons/build/svg/plus-small.svg
new file mode 100644
index 00000000000..5e093a4bb22
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/plus-small.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="7" height="16" viewBox="0 0 7 16"><path fill-rule="evenodd" d="M4 4H3v3H0v1h3v3h1V8h3V7H4V4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/plus.svg b/htdocs/theme/common/octicons/build/svg/plus.svg
new file mode 100644
index 00000000000..23c27d8a45a
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M12 9H7v5H5V9H0V7h5V2h2v5h5v2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/primitive-dot.svg b/htdocs/theme/common/octicons/build/svg/primitive-dot.svg
new file mode 100644
index 00000000000..6f465da5a76
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/primitive-dot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16"><path fill-rule="evenodd" d="M0 8c0-2.2 1.8-4 4-4s4 1.8 4 4-1.8 4-4 4-4-1.8-4-4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/primitive-square.svg b/htdocs/theme/common/octicons/build/svg/primitive-square.svg
new file mode 100644
index 00000000000..9d4058bb51e
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/primitive-square.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16"><path fill-rule="evenodd" d="M8 12H0V4h8v8z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/project.svg b/htdocs/theme/common/octicons/build/svg/project.svg
new file mode 100644
index 00000000000..a728f7457ca
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/project.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="16" viewBox="0 0 15 16"><path fill-rule="evenodd" d="M10 12h3V2h-3v10zm-4-2h3V2H6v8zm-4 4h3V2H2v12zm-1 1h13V1H1v14zM14 0H1a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h13a1 1 0 0 0 1-1V1a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/pulse.svg b/htdocs/theme/common/octicons/build/svg/pulse.svg
new file mode 100644
index 00000000000..d87d04ea419
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/pulse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M11.5 8.4L8.8 5.8 6.6 8.9 5.5 2 2.38 8.4H0v2h3.6l.9-1.8.9 5.4L9 8.9l1.6 1.5H14v-2h-2.5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/question.svg b/htdocs/theme/common/octicons/build/svg/question.svg
new file mode 100644
index 00000000000..a6fc75310c9
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/question.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M6 10h2v2H6v-2zm4-3.5C10 8.64 8 9 8 9H6c0-.55.45-1 1-1h.5c.28 0 .5-.22.5-.5v-1c0-.28-.22-.5-.5-.5h-1c-.28 0-.5.22-.5.5V7H4c0-1.5 1.5-3 3-3s3 1 3 2.5zM7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/quote.svg b/htdocs/theme/common/octicons/build/svg/quote.svg
new file mode 100644
index 00000000000..7b5f4a7f191
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/quote.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M6.16 3.84C3.73 5.4 2.55 7.01 2.55 9.7c.16-.05.3-.05.44-.05 1.27 0 2.5.86 2.5 2.41 0 1.61-1.03 2.61-2.5 2.61-1.9 0-2.99-1.52-2.99-4.25C0 6.62 1.75 3.89 5.02 2l1.14 1.84zm7 0C10.73 5.4 9.55 7.01 9.55 9.7c.16-.05.3-.05.44-.05 1.27 0 2.5.86 2.5 2.41 0 1.61-1.03 2.61-2.5 2.61-1.89 0-2.98-1.52-2.98-4.25 0-3.8 1.75-6.53 5.02-8.42l1.14 1.84h-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/radio-tower.svg b/htdocs/theme/common/octicons/build/svg/radio-tower.svg
new file mode 100644
index 00000000000..a438661ce55
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/radio-tower.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.78 5.78c.25-.25.25-.67 0-.92-.32-.33-.48-.76-.48-1.19 0-.43.16-.86.48-1.19.25-.26.25-.67 0-.92a.613.613 0 0 0-.45-.19c-.16 0-.33.06-.45.19-.57.58-.85 1.35-.85 2.11 0 .76.29 1.53.85 2.11.25.25.66.25.9 0zM2.32.19a.651.651 0 0 0-.92 0C.47 1.15 0 2.41 0 3.66c0 1.26.47 2.52 1.4 3.48.25.26.66.26.91 0s.25-.68 0-.94c-.68-.7-1.02-1.62-1.02-2.54 0-.92.34-1.84 1.02-2.54a.66.66 0 0 0 .01-.93zm5.69 5.1a1.62 1.62 0 1 0-1.62-1.62c-.01.89.72 1.62 1.62 1.62zM14.58.2a.628.628 0 0 0-.91 0c-.25.26-.25.68 0 .94.68.7 1.02 1.62 1.02 2.54 0 .92-.34 1.83-1.02 2.54-.25.26-.25.68 0 .94a.651.651 0 0 0 .92 0c.93-.96 1.4-2.22 1.4-3.48A5.048 5.048 0 0 0 14.58.2zM8.01 6.59c-.41 0-.83-.1-1.2-.3l-3.15 8.37h1.49l.86-1h4l.84 1h1.49L9.2 6.29c-.38.2-.78.3-1.19.3zM8 7.07l1.01 3.6h-2L8 7.07zm-1.99 5.59l1-1h2l1 1h-4zm5.19-11.1c-.25.25-.25.67 0 .92.32.33.48.76.48 1.19 0 .43-.16.86-.48 1.19-.25.26-.25.67 0 .92a.63.63 0 0 0 .9 0c.57-.58.85-1.35.85-2.11 0-.76-.28-1.53-.85-2.11a.634.634 0 0 0-.9 0z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/reply.svg b/htdocs/theme/common/octicons/build/svg/reply.svg
new file mode 100644
index 00000000000..5f89aad3010
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/reply.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M6.5 3.5c3.92.44 8 3.125 8 10-2.312-5.062-4.75-6-8-6V11L1 5.5 6.5 0v3.5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/repo-clone.svg b/htdocs/theme/common/octicons/build/svg/repo-clone.svg
new file mode 100644
index 00000000000..32b86e87c88
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/repo-clone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15 0H9v7c0 .55.45 1 1 1h1v1h1V8h3c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1zm-4 7h-1V6h1v1zm4 0h-3V6h3v1zm0-2h-4V1h4v4zM4 5H3V4h1v1zm0-2H3V2h1v1zM2 1h6V0H1C.45 0 0 .45 0 1v12c0 .55.45 1 1 1h2v2l1.5-1.5L6 16v-2h5c.55 0 1-.45 1-1v-3H2V1zm9 10v2H6v-1H3v1H1v-2h10zM3 8h1v1H3V8zm1-1H3V6h1v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/repo-force-push.svg b/htdocs/theme/common/octicons/build/svg/repo-force-push.svg
new file mode 100644
index 00000000000..0aece33a4c9
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/repo-force-push.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M10 9H8v7H6V9H4l2.25-3H4l3-4 3 4H7.75L10 9zm1-9H1C.45 0 0 .45 0 1v12c0 .55.45 1 1 1h4v-1H1v-2h4v-1H2V1h9v9H9v1h2v2H9v1h2c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/repo-forked.svg b/htdocs/theme/common/octicons/build/svg/repo-forked.svg
new file mode 100644
index 00000000000..cc5e46a521c
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/repo-forked.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M8 1a1.993 1.993 0 0 0-1 3.72V6L5 8 3 6V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V6.5l3 3v1.78A1.993 1.993 0 0 0 5 15a1.993 1.993 0 0 0 1-3.72V9.5l3-3V4.72A1.993 1.993 0 0 0 8 1zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3 10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3-10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/repo-pull.svg b/htdocs/theme/common/octicons/build/svg/repo-pull.svg
new file mode 100644
index 00000000000..dfe8e6c9152
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/repo-pull.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M13 8V6H7V4h6V2l3 3-3 3zM4 2H3v1h1V2zm7 5h1v6c0 .55-.45 1-1 1H6v2l-1.5-1.5L3 16v-2H1c-.55 0-1-.45-1-1V1c0-.55.45-1 1-1h10c.55 0 1 .45 1 1v2h-1V1H2v9h9V7zm0 4H1v2h2v-1h3v1h5v-2zM4 6H3v1h1V6zm0-2H3v1h1V4zM3 9h1V8H3v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/repo-push.svg b/htdocs/theme/common/octicons/build/svg/repo-push.svg
new file mode 100644
index 00000000000..408dca6a089
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/repo-push.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M4 3H3V2h1v1zM3 5h1V4H3v1zm4 0L4 9h2v7h2V9h2L7 5zm4-5H1C.45 0 0 .45 0 1v12c0 .55.45 1 1 1h4v-1H1v-2h4v-1H2V1h9.02L11 10H9v1h2v2H9v1h2c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/repo.svg b/htdocs/theme/common/octicons/build/svg/repo.svg
new file mode 100644
index 00000000000..e653d4ecfcd
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/repo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M4 9H3V8h1v1zm0-3H3v1h1V6zm0-2H3v1h1V4zm0-2H3v1h1V2zm8-1v12c0 .55-.45 1-1 1H6v2l-1.5-1.5L3 16v-2H1c-.55 0-1-.45-1-1V1c0-.55.45-1 1-1h10c.55 0 1 .45 1 1zm-1 10H1v2h2v-1h3v1h5v-2zm0-10H2v9h9V1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/report.svg b/htdocs/theme/common/octicons/build/svg/report.svg
new file mode 100644
index 00000000000..3f93ee49a90
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/report.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 2a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1H7l-4 4v-4H1a1 1 0 0 1-1-1V2zm1 0h14v9H6.5L4 13.5V11H1V2zm6 6h2v2H7V8zm0-5h2v4H7V3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/rocket.svg b/htdocs/theme/common/octicons/build/svg/rocket.svg
new file mode 100644
index 00000000000..98303f854be
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/rocket.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12.17 3.83c-.27-.27-.47-.55-.63-.88-.16-.31-.27-.66-.34-1.02-.58.33-1.16.7-1.73 1.13-.58.44-1.14.94-1.69 1.48-.7.7-1.33 1.81-1.78 2.45H3L0 10h3l2-2c-.34.77-1.02 2.98-1 3l1 1c.02.02 2.23-.64 3-1l-2 2v3l3-3v-3c.64-.45 1.75-1.09 2.45-1.78.55-.55 1.05-1.13 1.47-1.7.44-.58.81-1.16 1.14-1.72-.36-.08-.7-.19-1.03-.34a3.39 3.39 0 0 1-.86-.63zM16 0s-.09.38-.3 1.06c-.2.7-.55 1.58-1.06 2.66-.7-.08-1.27-.33-1.66-.72-.39-.39-.63-.94-.7-1.64C13.36.84 14.23.48 14.92.28 15.62.08 16 0 16 0z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/rss.svg b/htdocs/theme/common/octicons/build/svg/rss.svg
new file mode 100644
index 00000000000..3b2705d2f04
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/rss.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M2 13H0v-2c1.11 0 2 .89 2 2zM0 3v1a9 9 0 0 1 9 9h1C10 7.48 5.52 3 0 3zm0 4v1c2.75 0 5 2.25 5 5h1c0-3.31-2.69-6-6-6z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/ruby.svg b/htdocs/theme/common/octicons/build/svg/ruby.svg
new file mode 100644
index 00000000000..846390841c3
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/ruby.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M13 6l-5 5V4h3l2 2zm3 0l-8 8-8-8 4-4h8l4 4zm-8 6.5L14.5 6l-3-3h-7l-3 3L8 12.5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/screen-full.svg b/htdocs/theme/common/octicons/build/svg/screen-full.svg
new file mode 100644
index 00000000000..e78d3718ba1
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/screen-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 10h1v3c0 .547-.453 1-1 1h-3v-1h3v-3zM1 10H0v3c0 .547.453 1 1 1h3v-1H1v-3zm0-7h3V2H1c-.547 0-1 .453-1 1v3h1V3zm1 1h10v8H2V4zm2 6h6V6H4v4zm6-8v1h3v3h1V3c0-.547-.453-1-1-1h-3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/screen-normal.svg b/htdocs/theme/common/octicons/build/svg/screen-normal.svg
new file mode 100644
index 00000000000..a884713e162
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/screen-normal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M2 4H0V3h2V1h1v2c0 .547-.453 1-1 1zm0 8H0v1h2v2h1v-2c0-.547-.453-1-1-1zm9-2c0 .547-.453 1-1 1H4c-.547 0-1-.453-1-1V6c0-.547.453-1 1-1h6c.547 0 1 .453 1 1v4zM9 7H5v2h4V7zm2 6v2h1v-2h2v-1h-2c-.547 0-1 .453-1 1zm1-10V1h-1v2c0 .547.453 1 1 1h2V3h-2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/search.svg b/htdocs/theme/common/octicons/build/svg/search.svg
new file mode 100644
index 00000000000..d0304b6a41e
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.7 13.3l-3.81-3.83A5.93 5.93 0 0 0 13 6c0-3.31-2.69-6-6-6S1 2.69 1 6s2.69 6 6 6c1.3 0 2.48-.41 3.47-1.11l3.83 3.81c.19.2.45.3.7.3.25 0 .52-.09.7-.3a.996.996 0 0 0 0-1.41v.01zM7 10.7c-2.59 0-4.7-2.11-4.7-4.7 0-2.59 2.11-4.7 4.7-4.7 2.59 0 4.7 2.11 4.7 4.7 0 2.59-2.11 4.7-4.7 4.7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/server.svg b/htdocs/theme/common/octicons/build/svg/server.svg
new file mode 100644
index 00000000000..78bc79f95ee
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/server.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11 6H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V7c0-.55-.45-1-1-1zM2 9H1V7h1v2zm2 0H3V7h1v2zm2 0H5V7h1v2zm2 0H7V7h1v2zm3-8H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1zM2 4H1V2h1v2zm2 0H3V2h1v2zm2 0H5V2h1v2zm2 0H7V2h1v2zm3-1h-1V2h1v1zm0 8H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-2c0-.55-.45-1-1-1zm-9 3H1v-2h1v2zm2 0H3v-2h1v2zm2 0H5v-2h1v2zm2 0H7v-2h1v2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/settings.svg b/htdocs/theme/common/octicons/build/svg/settings.svg
new file mode 100644
index 00000000000..f22b92e0ddc
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4 7H3V2h1v5zm-1 7h1v-3H3v3zm5 0h1V8H8v6zm5 0h1v-2h-1v2zm1-12h-1v6h1V2zM9 2H8v2h1V2zM5 8H2c-.55 0-1 .45-1 1s.45 1 1 1h3c.55 0 1-.45 1-1s-.45-1-1-1zm5-3H7c-.55 0-1 .45-1 1s.45 1 1 1h3c.55 0 1-.45 1-1s-.45-1-1-1zm5 4h-3c-.55 0-1 .45-1 1s.45 1 1 1h3c.55 0 1-.45 1-1s-.45-1-1-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/shield.svg b/htdocs/theme/common/octicons/build/svg/shield.svg
new file mode 100644
index 00000000000..087a96954b9
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/shield.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 0L0 2v6.02C0 12.69 5.31 16 7 16c1.69 0 7-3.31 7-7.98V2L7 0zM5 11l1.14-2.8a.568.568 0 0 0-.25-.59C5.33 7.25 5 6.66 5 6c0-1.09.89-2 1.98-2C8.06 4 9 4.91 9 6c0 .66-.33 1.25-.89 1.61-.19.13-.3.36-.25.59L9 11H5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/sign-in.svg b/htdocs/theme/common/octicons/build/svg/sign-in.svg
new file mode 100644
index 00000000000..91560c6ad61
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/sign-in.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 6.75V12h4V8h1v4c0 .55-.45 1-1 1H7v3l-5.45-2.72c-.33-.17-.55-.52-.55-.91V1c0-.55.45-1 1-1h9c.55 0 1 .45 1 1v3h-1V1H3l4 2v2.25L10 3v2h4v2h-4v2L7 6.75z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/sign-out.svg b/htdocs/theme/common/octicons/build/svg/sign-out.svg
new file mode 100644
index 00000000000..e0893cbce43
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/sign-out.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12 9V7H8V5h4V3l4 3-4 3zm-2 3H6V3L2 1h8v3h1V1c0-.55-.45-1-1-1H1C.45 0 0 .45 0 1v11.38c0 .39.22.73.55.91L6 16.01V13h4c.55 0 1-.45 1-1V8h-1v4z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/smiley.svg b/htdocs/theme/common/octicons/build/svg/smiley.svg
new file mode 100644
index 00000000000..0d93af54bdd
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/smiley.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm4.81 12.81a6.72 6.72 0 0 1-2.17 1.45c-.83.36-1.72.53-2.64.53-.92 0-1.81-.17-2.64-.53-.81-.34-1.55-.83-2.17-1.45a6.773 6.773 0 0 1-1.45-2.17A6.59 6.59 0 0 1 1.21 8c0-.92.17-1.81.53-2.64.34-.81.83-1.55 1.45-2.17.62-.62 1.36-1.11 2.17-1.45A6.59 6.59 0 0 1 8 1.21c.92 0 1.81.17 2.64.53.81.34 1.55.83 2.17 1.45.62.62 1.11 1.36 1.45 2.17.36.83.53 1.72.53 2.64 0 .92-.17 1.81-.53 2.64-.34.81-.83 1.55-1.45 2.17zM4 6.8v-.59c0-.66.53-1.19 1.2-1.19h.59c.66 0 1.19.53 1.19 1.19v.59c0 .67-.53 1.2-1.19 1.2H5.2C4.53 8 4 7.47 4 6.8zm5 0v-.59c0-.66.53-1.19 1.2-1.19h.59c.66 0 1.19.53 1.19 1.19v.59c0 .67-.53 1.2-1.19 1.2h-.59C9.53 8 9 7.47 9 6.8zm4 3.2c-.72 1.88-2.91 3-5 3s-4.28-1.13-5-3c-.14-.39.23-1 .66-1h8.59c.41 0 .89.61.75 1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/squirrel.svg b/htdocs/theme/common/octicons/build/svg/squirrel.svg
new file mode 100644
index 00000000000..7c974be5979
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/squirrel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M11.75 1c-2.21 0-4 1.31-4 2.92 0 1.94.5 3.03 0 6.08 0-4.5-2.77-6.34-4-6.34.05-.5-.48-.66-.48-.66s-.22.11-.3.34c-.27-.31-.56-.27-.56-.27l-.13.58S.45 4.29.43 6.87c.2.33 1.53.6 2.47.43.89.05.67.79.47.99C2.53 9.13 1.75 8 .75 8s-1 1 0 1 1 1 3 1c-3.09 1.2 0 4 0 4h-1c-1 0-1 1-1 1h6c3 0 5-1 5-3.47 0-.85-.43-1.79-1-2.53-1.11-1.46.23-2.68 1-2 .77.68 3 1 3-2 0-2.21-1.79-4-4-4zm-9.5 5c-.28 0-.5-.22-.5-.5s.22-.5.5-.5.5.22.5.5-.22.5-.5.5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/star.svg b/htdocs/theme/common/octicons/build/svg/star.svg
new file mode 100644
index 00000000000..9444880acf4
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/star.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M14 6l-4.9-.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14 7 11.67 11.33 14l-.93-4.74L14 6z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/stop.svg b/htdocs/theme/common/octicons/build/svg/stop.svg
new file mode 100644
index 00000000000..6ae8523457d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/stop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M10 1H4L0 5v6l4 4h6l4-4V5l-4-4zm3 9.5L9.5 14h-5L1 10.5v-5L4.5 2h5L13 5.5v5zM6 4h2v5H6V4zm0 6h2v2H6v-2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/sync.svg b/htdocs/theme/common/octicons/build/svg/sync.svg
new file mode 100644
index 00000000000..61bef53cbd0
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/sync.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M10.236 7.4a4.15 4.15 0 0 1-1.2 3.6 4.346 4.346 0 0 1-5.41.54l1.17-1.14-4.3-.6.6 4.2 1.31-1.26c2.36 1.74 5.7 1.57 7.84-.54a5.876 5.876 0 0 0 1.74-4.46l-1.75-.34zM2.956 5a4.346 4.346 0 0 1 5.41-.54L7.196 5.6l4.3.6-.6-4.2-1.31 1.26c-2.36-1.74-5.7-1.57-7.85.54-1.24 1.23-1.8 2.85-1.73 4.46l1.75.35A4.17 4.17 0 0 1 2.956 5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/tag.svg b/htdocs/theme/common/octicons/build/svg/tag.svg
new file mode 100644
index 00000000000..6c8a9c43c1e
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/tag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7.73 1.73C7.26 1.26 6.62 1 5.96 1H3.5C2.13 1 1 2.13 1 3.5v2.47c0 .66.27 1.3.73 1.77l6.06 6.06c.39.39 1.02.39 1.41 0l4.59-4.59a.996.996 0 0 0 0-1.41L7.73 1.73zM2.38 7.09c-.31-.3-.47-.7-.47-1.13V3.5c0-.88.72-1.59 1.59-1.59h2.47c.42 0 .83.16 1.13.47l6.14 6.13-4.73 4.73-6.13-6.15zM3.01 3h2v2H3V3h.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/tasklist.svg b/htdocs/theme/common/octicons/build/svg/tasklist.svg
new file mode 100644
index 00000000000..a0bd560991f
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/tasklist.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.41 9H7.59C7 9 7 8.59 7 8c0-.59 0-1 .59-1h7.81c.59 0 .59.41.59 1 0 .59 0 1-.59 1h.01zM9.59 4C9 4 9 3.59 9 3c0-.59 0-1 .59-1h5.81c.59 0 .59.41.59 1 0 .59 0 1-.59 1H9.59zM0 3.91l1.41-1.3L3 4.2 7.09 0 8.5 1.41 3 6.91l-3-3zM7.59 12h7.81c.59 0 .59.41.59 1 0 .59 0 1-.59 1H7.59C7 14 7 13.59 7 13c0-.59 0-1 .59-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/telescope.svg b/htdocs/theme/common/octicons/build/svg/telescope.svg
new file mode 100644
index 00000000000..ce4bfaaa184
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/telescope.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7.59 9l3 6h-1l-2-4v5h-1v-6l-2 5h-1l2-5 2-1zm-1-9h-1v1h1V0zm-2 3h-1v1h1V3zm-3-2h-1v1h1V1zM.22 9a.52.52 0 0 0-.16.67l.55.92c.13.23.41.31.64.2l1.39-.66-1.16-2-1.27.86.01.01zm7.89-5.39l-5.8 3.95L3.54 9.7l6.33-3.03L8.1 3.61h.01zm4.22 1.28l-1.47-2.52a.51.51 0 0 0-.72-.17l-1.2.83 1.84 3.2 1.33-.64c.27-.13.36-.44.22-.7z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/terminal.svg b/htdocs/theme/common/octicons/build/svg/terminal.svg
new file mode 100644
index 00000000000..d6072fc6611
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/terminal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 10h4v1H7v-1zm-3 1l3-3-3-3-.75.75L5.5 8l-2.25 2.25L4 11zm10-8v10c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h12c.55 0 1 .45 1 1zm-1 0H1v10h12V3z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/text-size.svg b/htdocs/theme/common/octicons/build/svg/text-size.svg
new file mode 100644
index 00000000000..f83a5f964fb
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/text-size.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="16" viewBox="0 0 18 16"><path fill-rule="evenodd" d="M13.62 9.08L12.1 3.66h-.06l-1.5 5.42h3.08zM5.7 10.13S4.68 6.52 4.53 6.02h-.08l-1.13 4.11H5.7zM17.31 14h-2.25l-.95-3.25h-4.07L9.09 14H6.84l-.69-2.33H2.87L2.17 14H0l3.3-9.59h2.5l2.17 6.34L10.86 2h2.52l3.94 12h-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/three-bars.svg b/htdocs/theme/common/octicons/build/svg/three-bars.svg
new file mode 100644
index 00000000000..bb3b2c86984
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/three-bars.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11.41 9H.59C0 9 0 8.59 0 8c0-.59 0-1 .59-1H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1h.01zm0-4H.59C0 5 0 4.59 0 4c0-.59 0-1 .59-1H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1h.01zM.59 11H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1H.59C0 13 0 12.59 0 12c0-.59 0-1 .59-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/thumbsdown.svg b/htdocs/theme/common/octicons/build/svg/thumbsdown.svg
new file mode 100644
index 00000000000..ac4c7c6996b
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/thumbsdown.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.98 7.83l-.97-5.95C14.84.5 13.13 0 12 0H5.69c-.2 0-.38.05-.53.14L3.72 1H2C.94 1 0 1.94 0 3v4c0 1.06.94 2.02 2 2h2c.91 0 1.39.45 2.39 1.55.91 1 .88 1.8.63 3.27-.08.5.06 1 .42 1.42.39.47.98.77 1.56.77 1.83 0 3-3.72 3-5.02l-.02-.98h2.04c1.16 0 1.95-.8 1.98-1.97 0-.06.02-.13-.02-.2v-.01zm-1.97 1.19h-1.99c-.7 0-1.03.28-1.03.97l.03 1.03c0 1.27-1.17 4-2 4-.5 0-1.08-.5-1-1 .25-1.58.34-2.78-.89-4.14C6.11 8.75 5.36 8 4 8V2l1.67-1H12c.73 0 1.95.31 2 1l.02.02 1 6c-.03.64-.38 1-1 1h-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/thumbsup.svg b/htdocs/theme/common/octicons/build/svg/thumbsup.svg
new file mode 100644
index 00000000000..e77f1e30e57
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/thumbsup.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M14 14c-.05.69-1.27 1-2 1H5.67L4 14V8c1.36 0 2.11-.75 3.13-1.88 1.23-1.36 1.14-2.56.88-4.13-.08-.5.5-1 1-1 .83 0 2 2.73 2 4l-.02 1.03c0 .69.33.97 1.02.97h2c.63 0 .98.36 1 1l-1 6L14 14zm0-8h-2.02l.02-.98C12 3.72 10.83 0 9 0c-.58 0-1.17.3-1.56.77-.36.41-.5.91-.42 1.41.25 1.48.28 2.28-.63 3.28-1 1.09-1.48 1.55-2.39 1.55H2C.94 7 0 7.94 0 9v4c0 1.06.94 2 2 2h1.72l1.44.86c.16.09.33.14.52.14h6.33c1.13 0 2.84-.5 3-1.88l.98-5.95c.02-.08.02-.14.02-.2-.03-1.17-.84-1.97-2-1.97H14z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/tools.svg b/htdocs/theme/common/octicons/build/svg/tools.svg
new file mode 100644
index 00000000000..67a5984052b
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/tools.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.48 7.27c.26.26 1.28 1.33 1.28 1.33l.56-.58-.88-.91 1.69-1.8s-.76-.74-.43-.45c.32-1.19.03-2.51-.87-3.44C4.93.5 3.66.2 2.52.51l1.93 2-.51 1.96-1.89.52-1.93-2C-.19 4.17.1 5.48 1 6.4c.94.98 2.29 1.26 3.48.87zm6.44 1.94l-2.33 2.3 3.84 3.98c.31.33.73.49 1.14.49.41 0 .82-.16 1.14-.49.63-.65.63-1.7 0-2.35l-3.79-3.93zM16 2.53L13.55 0 6.33 7.46l.88.91-4.31 4.46-.99.53-1.39 2.27.35.37 2.2-1.44.51-1.02L7.9 9.08l.88.91L16 2.53z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/trashcan.svg b/htdocs/theme/common/octicons/build/svg/trashcan.svg
new file mode 100644
index 00000000000..3d8c051f4cf
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/trashcan.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/triangle-down.svg b/htdocs/theme/common/octicons/build/svg/triangle-down.svg
new file mode 100644
index 00000000000..faa889630e7
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/triangle-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M0 5l6 6 6-6H0z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/triangle-left.svg b/htdocs/theme/common/octicons/build/svg/triangle-left.svg
new file mode 100644
index 00000000000..8762036160f
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/triangle-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="16" viewBox="0 0 6 16"><path fill-rule="evenodd" d="M6 2L0 8l6 6V2z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/triangle-right.svg b/htdocs/theme/common/octicons/build/svg/triangle-right.svg
new file mode 100644
index 00000000000..59c2ac6346d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/triangle-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="16" viewBox="0 0 6 16"><path fill-rule="evenodd" d="M0 14l6-6-6-6v12z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/triangle-up.svg b/htdocs/theme/common/octicons/build/svg/triangle-up.svg
new file mode 100644
index 00000000000..98d06543b8d
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/triangle-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M12 11L6 5l-6 6h12z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/unfold.svg b/htdocs/theme/common/octicons/build/svg/unfold.svg
new file mode 100644
index 00000000000..ab043392e69
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/unfold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M11.5 7.5L14 10c0 .55-.45 1-1 1H9v-1h3.5l-2-2h-7l-2 2H5v1H1c-.55 0-1-.45-1-1l2.5-2.5L0 5c0-.55.45-1 1-1h4v1H1.5l2 2h7l2-2H9V4h4c.55 0 1 .45 1 1l-2.5 2.5zM6 6h2V3h2L7 0 4 3h2v3zm2 3H6v3H4l3 3 3-3H8V9z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/unmute.svg b/htdocs/theme/common/octicons/build/svg/unmute.svg
new file mode 100644
index 00000000000..531aafc8b46
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/unmute.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12 7.96c0 1.09-.45 2.09-1.17 2.83l-.67-.67c.55-.56.89-1.31.89-2.16 0-.85-.34-1.61-.89-2.16l.67-.67A3.99 3.99 0 0 1 12 7.96zM7.72 2.22L4 5.94H2c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h2l3.72 3.72c.47.47 1.28.14 1.28-.53V2.75c0-.67-.81-1-1.28-.53zm5.94.08l-.67.67a6.996 6.996 0 0 1 2.06 4.98c0 1.94-.78 3.7-2.06 4.98l.67.67A7.973 7.973 0 0 0 16 7.94c0-2.22-.89-4.22-2.34-5.66v.02zm-1.41 1.41l-.69.67a5.05 5.05 0 0 1 1.48 3.58c0 1.39-.56 2.66-1.48 3.56l.69.67A5.97 5.97 0 0 0 14 7.96c0-1.65-.67-3.16-1.75-4.25z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/unverified.svg b/htdocs/theme/common/octicons/build/svg/unverified.svg
new file mode 100644
index 00000000000..becff6dfc8f
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/unverified.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.68 7.07L14.6 5.73c-.17-.22-.28-.48-.31-.77l-.19-1.7a1.51 1.51 0 0 0-1.33-1.33l-1.7-.19c-.3-.03-.56-.16-.78-.33L8.95.33c-.55-.44-1.33-.44-1.88 0L5.73 1.41c-.22.17-.48.28-.77.31l-1.7.19c-.7.08-1.25.63-1.33 1.33l-.19 1.7c-.03.3-.16.56-.33.78L.33 7.06c-.44.55-.44 1.33 0 1.88l1.08 1.34c.17.22.28.48.31.77l.19 1.7c.08.7.63 1.25 1.33 1.33l1.7.19c.3.03.56.16.78.33l1.34 1.08c.55.44 1.33.44 1.88 0l1.34-1.08c.22-.17.48-.28.77-.31l1.7-.19c.7-.08 1.25-.63 1.33-1.33l.19-1.7c.03-.3.16-.56.33-.78l1.08-1.34c.44-.55.44-1.33 0-1.88zm-6.67 4.44c0 .28-.22.5-.5.5h-1c-.27 0-.5-.22-.5-.5v-1c0-.28.23-.5.5-.5h1c.28 0 .5.22.5.5v1zm1.56-4.89c-.06.17-.17.33-.3.47-.13.16-.14.19-.33.38-.16.17-.31.3-.52.45-.11.09-.2.19-.28.27-.08.08-.14.17-.19.27-.05.1-.08.19-.11.3-.03.11-.03.13-.03.25H7.14c0-.22 0-.31.03-.48.03-.19.08-.36.14-.52.06-.14.14-.28.25-.42.11-.13.23-.25.41-.38.27-.19.36-.3.48-.52.12-.22.2-.38.2-.59 0-.27-.06-.45-.2-.58-.13-.13-.31-.19-.58-.19-.09 0-.19.02-.3.05-.11.03-.17.09-.25.16-.08.07-.14.11-.2.2a.41.41 0 0 0-.09.28h-2c0-.38.13-.56.27-.83.16-.27.36-.5.61-.67.25-.17.55-.3.88-.38.33-.08.7-.13 1.09-.13.44 0 .83.05 1.17.13.34.09.63.22.88.39.23.17.41.38.55.63.13.25.19.55.19.88 0 .22 0 .42-.08.59l-.02-.01z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/verified.svg b/htdocs/theme/common/octicons/build/svg/verified.svg
new file mode 100644
index 00000000000..8420d2ac554
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/verified.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.68 7.07L14.6 5.73c-.17-.22-.28-.48-.31-.77l-.19-1.7a1.51 1.51 0 0 0-1.33-1.33l-1.7-.19c-.3-.03-.56-.16-.78-.33L8.95.33c-.55-.44-1.33-.44-1.88 0L5.73 1.41c-.22.17-.48.28-.77.31l-1.7.19c-.7.08-1.25.63-1.33 1.33l-.19 1.7c-.03.3-.16.56-.33.78L.33 7.06c-.44.55-.44 1.33 0 1.88l1.08 1.34c.17.22.28.48.31.77l.19 1.7c.08.7.63 1.25 1.33 1.33l1.7.19c.3.03.56.16.78.33l1.34 1.08c.55.44 1.33.44 1.88 0l1.34-1.08c.22-.17.48-.28.77-.31l1.7-.19c.7-.08 1.25-.63 1.33-1.33l.19-1.7c.03-.3.16-.56.33-.78l1.08-1.34c.44-.55.44-1.33 0-1.88zm-9.17 4.94l-3.5-3.5 1.5-1.5 2 2 5-5 1.5 1.55-6.5 6.45z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/versions.svg b/htdocs/theme/common/octicons/build/svg/versions.svg
new file mode 100644
index 00000000000..274bbdb3ac8
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/versions.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M13 3H7c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h6c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1zm-1 8H8V5h4v6zM4 4h1v1H4v6h1v1H4c-.55 0-1-.45-1-1V5c0-.55.45-1 1-1zM1 5h1v1H1v4h1v1H1c-.55 0-1-.45-1-1V6c0-.55.45-1 1-1z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/watch.svg b/htdocs/theme/common/octicons/build/svg/watch.svg
new file mode 100644
index 00000000000..45b2499cff8
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/watch.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M6 8h2v1H5V5h1v3zm6 0c0 2.22-1.2 4.16-3 5.19V15c0 .55-.45 1-1 1H4c-.55 0-1-.45-1-1v-1.81C1.2 12.16 0 10.22 0 8s1.2-4.16 3-5.19V1c0-.55.45-1 1-1h4c.55 0 1 .45 1 1v1.81c1.8 1.03 3 2.97 3 5.19zm-1 0c0-2.77-2.23-5-5-5S1 5.23 1 8s2.23 5 5 5 5-2.23 5-5z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/x.svg b/htdocs/theme/common/octicons/build/svg/x.svg
new file mode 100644
index 00000000000..3725777be40
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M7.71 8.23l3.75 3.75-1.48 1.48-3.75-3.75-3.75 3.75L1 11.98l3.75-3.75L1 4.48 2.48 3l3.75 3.75L9.98 3l1.48 1.48-3.75 3.75z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/build/svg/zap.svg b/htdocs/theme/common/octicons/build/svg/zap.svg
new file mode 100644
index 00000000000..e778194b9de
--- /dev/null
+++ b/htdocs/theme/common/octicons/build/svg/zap.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M10 7H6l3-7-9 9h4l-3 7 9-9z"/></svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/index.js b/htdocs/theme/common/octicons/index.js
index 186af5cb46c..8fb8e4c9044 100644
--- a/htdocs/theme/common/octicons/index.js
+++ b/htdocs/theme/common/octicons/index.js
@@ -1,11 +1,12 @@
 var data = require('./build/data.json')
+var objectAssign = require('object-assign')
 
 Object.keys(data).forEach(function(key) {
 
   // Returns a string representation of html attributes
   var htmlAttributes = function(icon, options) {
     var attributes = []
-    var attrObj = Object.assign({}, data[key].options, options)
+    var attrObj = objectAssign({}, data[key].options, options)
 
     // If the user passed in options
     if (options) {
@@ -56,11 +57,6 @@ Object.keys(data).forEach(function(key) {
   data[key].toSVG = function(options) {
     return "<svg " + htmlAttributes(data[key], options) + ">" + data[key].path + "</svg>"
   }
-
-  // Function to return an SVG object with a use, assuming you use the svg sprite
-  data[key].toSVGUse = function(options) {
-    return "<svg " + htmlAttributes(data[key], options) + "><use xlink:href=\"#" + key + "\" /></svg>"
-  }
 })
 
 // Import data into exports
diff --git a/htdocs/theme/common/octicons/index.scss b/htdocs/theme/common/octicons/index.scss
new file mode 100644
index 00000000000..31d97867a12
--- /dev/null
+++ b/htdocs/theme/common/octicons/index.scss
@@ -0,0 +1,5 @@
+.octicon {
+  display: inline-block;
+  vertical-align: text-top;
+  fill: currentColor;
+}
diff --git a/htdocs/theme/common/octicons/lib/data.json b/htdocs/theme/common/octicons/lib/data.json
deleted file mode 100644
index af6b94aa6b1..00000000000
--- a/htdocs/theme/common/octicons/lib/data.json
+++ /dev/null
@@ -1,1174 +0,0 @@
-{
-  "alert": {
-    "keywords": [
-      "warning",
-      "triangle",
-      "exclamation",
-      "point"
-    ]
-  },
-  "arrow-down": {
-    "keywords": [
-      "point",
-      "direction"
-    ]
-  },
-  "arrow-left": {
-    "keywords": [
-      "point",
-      "direction"
-    ]
-  },
-  "arrow-right": {
-    "keywords": [
-      "point",
-      "direction"
-    ]
-  },
-  "arrow-small-down": {
-    "keywords": [
-      "point",
-      "direction"
-    ]
-  },
-  "arrow-small-left": {
-    "keywords": [
-      "point",
-      "direction",
-      "little",
-      "tiny"
-    ]
-  },
-  "arrow-small-right": {
-    "keywords": [
-      "point",
-      "direction",
-      "little",
-      "tiny"
-    ]
-  },
-  "arrow-small-up": {
-    "keywords": [
-      "point",
-      "direction",
-      "little",
-      "tiny"
-    ]
-  },
-  "arrow-up": {
-    "keywords": [
-      "point",
-      "direction"
-    ]
-  },
-  "beaker": {
-    "keywords": [
-      "experiment",
-      "labs",
-      "experimental",
-      "feature",
-      "test",
-      "science",
-      "education",
-      "study",
-      "development",
-      "testing"
-    ]
-  },
-  "bell": {
-    "keywords": [
-      "notification"
-    ]
-  },
-  "bold": {
-    "keywords": [
-      "bold"
-    ]
-  },
-  "book": {
-    "keywords": [
-      "book",
-      "journal",
-      "wiki",
-      "readme"
-    ]
-  },
-  "bookmark": {
-    "keywords": [
-      "tabbard"
-    ]
-  },
-  "briefcase": {
-    "keywords": [
-      "suitcase",
-      "business"
-    ]
-  },
-  "broadcast": {
-    "keywords": [
-      "rss",
-      "radio",
-      "signal"
-    ]
-  },
-  "browser": {
-    "keywords": [
-      "window",
-      "web"
-    ]
-  },
-  "bug": {
-    "keywords": [
-      "insect"
-    ]
-  },
-  "calendar": {
-    "keywords": [
-      "time",
-      "day",
-      "month",
-      "year"
-    ]
-  },
-  "check": {
-    "keywords": [
-      "mark",
-      "yes",
-      "confirm",
-      "accept",
-      "ok",
-      "success"
-    ]
-  },
-  "checklist": {
-    "keywords": [
-      "todo"
-    ]
-  },
-  "chevron-down": {
-    "keywords": [
-      "triangle",
-      "arrow"
-    ]
-  },
-  "chevron-left": {
-    "keywords": [
-      "triangle",
-      "arrow"
-    ]
-  },
-  "chevron-right": {
-    "keywords": [
-      "triangle",
-      "arrow"
-    ]
-  },
-  "chevron-up": {
-    "keywords": [
-      "triangle",
-      "arrow"
-    ]
-  },
-  "circle-slash": {
-    "keywords": [
-      "no",
-      "deny",
-      "fail",
-      "failure",
-      "error",
-      "bad"
-    ]
-  },
-  "circuit-board": {
-    "keywords": [
-      "developer",
-      "hardware",
-      "electricity"
-    ]
-  },
-  "clippy": {
-    "keywords": [
-      "copy",
-      "paste",
-      "save",
-      "capture"
-    ]
-  },
-  "clock": {
-    "keywords": [
-      "time",
-      "hour",
-      "minute",
-      "second"
-    ]
-  },
-  "cloud-download": {
-    "keywords": [
-      "save",
-      "install",
-      "get"
-    ]
-  },
-  "cloud-upload": {
-    "keywords": [
-      "put",
-      "export"
-    ]
-  },
-  "code": {
-    "keywords": [
-      "brackets"
-    ]
-  },
-  "comment": {
-    "keywords": [
-      "speak",
-      "bubble"
-    ]
-  },
-  "comment-discussion": {
-    "keywords": [
-      "converse",
-      "talk"
-    ]
-  },
-  "credit-card": {
-    "keywords": [
-      "money",
-      "billing",
-      "payments",
-      "transactions"
-    ]
-  },
-  "dash": {
-    "keywords": [
-      "hyphen",
-      "range"
-    ]
-  },
-  "dashboard": {
-    "keywords": [
-      "speed",
-      "dial"
-    ]
-  },
-  "database": {
-    "keywords": [
-      "disks",
-      "data"
-    ]
-  },
-  "desktop-download": {
-    "keywords": [
-      "clone",
-      "download"
-    ]
-  },
-  "device-camera": {
-    "keywords": [
-      "photo",
-      "picture",
-      "image",
-      "snapshot"
-    ]
-  },
-  "device-camera-video": {
-    "keywords": [
-      "watch",
-      "view",
-      "media",
-      "stream"
-    ]
-  },
-  "device-desktop": {
-    "keywords": [
-      "computer",
-      "monitor"
-    ]
-  },
-  "device-mobile": {
-    "keywords": [
-      "phone",
-      "iphone",
-      "cellphone"
-    ]
-  },
-  "diff": {
-    "keywords": [
-      "difference",
-      "changes",
-      "compare"
-    ]
-  },
-  "diff-added": {
-    "keywords": [
-      "new",
-      "addition"
-    ]
-  },
-  "diff-ignored": {
-    "keywords": [
-      "slash"
-    ]
-  },
-  "diff-modified": {
-    "keywords": [
-      "dot",
-      "changed",
-      "updated"
-    ]
-  },
-  "diff-removed": {
-    "keywords": [
-      "deleted",
-      "subtracted",
-      "dash"
-    ]
-  },
-  "diff-renamed": {
-    "keywords": [
-      "moved",
-      "arrow"
-    ]
-  },
-  "ellipses": {
-    "keywords": [
-      "dot",
-      "more"
-    ]
-  },
-  "ellipsis": {
-    "keywords": [
-      "read",
-      "more",
-      "hidden",
-      "expand"
-    ]
-  },
-  "eye": {
-    "keywords": [
-      "look",
-      "watch",
-      "see"
-    ]
-  },
-  "file": {
-    "keywords": [
-      "file"
-    ]
-  },
-  "file-binary": {
-    "keywords": [
-      "image",
-      "video",
-      "word",
-      "powerpoint",
-      "excel"
-    ]
-  },
-  "file-code": {
-    "keywords": [
-      "text",
-      "javascript",
-      "html",
-      "css",
-      "php",
-      "ruby",
-      "coffeescript",
-      "sass",
-      "scss"
-    ]
-  },
-  "file-directory": {
-    "keywords": [
-      "folder"
-    ]
-  },
-  "file-media": {
-    "keywords": [
-      "image",
-      "video",
-      "audio"
-    ]
-  },
-  "file-pdf": {
-    "keywords": [
-      "adobe"
-    ]
-  },
-  "file-submodule": {
-    "keywords": [
-      "folder"
-    ]
-  },
-  "file-symlink-directory": {
-    "keywords": [
-      "folder",
-      "subfolder",
-      "link",
-      "alias"
-    ]
-  },
-  "file-symlink-file": {
-    "keywords": [
-      "link",
-      "alias"
-    ]
-  },
-  "file-text": {
-    "keywords": [
-      "document"
-    ]
-  },
-  "file-zip": {
-    "keywords": [
-      "compress",
-      "archive"
-    ]
-  },
-  "flame": {
-    "keywords": [
-      "fire",
-      "hot",
-      "burn",
-      "trending"
-    ]
-  },
-  "fold": {
-    "keywords": [
-      "unfold",
-      "hide",
-      "collapse"
-    ]
-  },
-  "gear": {
-    "keywords": [
-      "settings"
-    ]
-  },
-  "gift": {
-    "keywords": [
-      "package",
-      "present",
-      "skill",
-      "craft",
-      "freebie"
-    ]
-  },
-  "gist": {
-    "keywords": [
-      "gist",
-      "github"
-    ]
-  },
-  "gist-secret": {
-    "keywords": [
-      "gist",
-      "secret",
-      "private"
-    ]
-  },
-  "git-branch": {
-    "keywords": [
-      "branch",
-      "git"
-    ]
-  },
-  "git-commit": {
-    "keywords": [
-      "save"
-    ]
-  },
-  "git-compare": {
-    "keywords": [
-      "difference",
-      "changes"
-    ]
-  },
-  "git-merge": {
-    "keywords": [
-      "join"
-    ]
-  },
-  "git-pull-request": {
-    "keywords": [
-      "review"
-    ]
-  },
-  "globe": {
-    "keywords": [
-      "world"
-    ]
-  },
-  "grabber": {
-    "keywords": [
-      "mover",
-      "drap",
-      "drop"
-    ]
-  },
-  "graph": {
-    "keywords": [
-      "trend",
-      "stats",
-      "statistics"
-    ]
-  },
-  "heart": {
-    "keywords": [
-      "love"
-    ]
-  },
-  "history": {
-    "keywords": [
-      "time",
-      "past",
-      "revert",
-      "back"
-    ]
-  },
-  "home": {
-    "keywords": [
-      "welcome",
-      "index",
-      "house",
-      "building"
-    ]
-  },
-  "horizontal-rule": {
-    "keywords": [
-      "hr"
-    ]
-  },
-  "hubot": {
-    "keywords": [
-      "robot"
-    ]
-  },
-  "inbox": {
-    "keywords": [
-      "mail",
-      "todo",
-      "new",
-      "messages"
-    ]
-  },
-  "info": {
-    "keywords": [
-      "help"
-    ]
-  },
-  "issue-closed": {
-    "keywords": [
-      "done",
-      "complete"
-    ]
-  },
-  "issue-opened": {
-    "keywords": [
-      "new"
-    ]
-  },
-  "issue-reopened": {
-    "keywords": [
-      "regression"
-    ]
-  },
-  "italic": {
-    "keywords": [
-      "font",
-      "italic",
-      "style"
-    ]
-  },
-  "jersey": {
-    "keywords": [
-      "team",
-      "game",
-      "basketball"
-    ]
-  },
-  "key": {
-    "keywords": [
-      "key",
-      "lock",
-      "secure",
-      "safe"
-    ]
-  },
-  "keyboard": {
-    "keywords": [
-      "type",
-      "keys",
-      "write",
-      "shortcuts"
-    ]
-  },
-  "law": {
-    "keywords": [
-      "legal",
-      "bill"
-    ]
-  },
-  "light-bulb": {
-    "keywords": [
-      "idea"
-    ]
-  },
-  "link": {
-    "keywords": [
-      "connect",
-      "hyperlink"
-    ]
-  },
-  "link-external": {
-    "keywords": [
-      "out",
-      "see",
-      "more",
-      "go",
-      "to"
-    ]
-  },
-  "list-ordered": {
-    "keywords": [
-      "numbers",
-      "tasks",
-      "todo",
-      "items"
-    ]
-  },
-  "list-unordered": {
-    "keywords": [
-      "bullet",
-      "point",
-      "tasks",
-      "todo",
-      "items"
-    ]
-  },
-  "location": {
-    "keywords": [
-      "here",
-      "marker"
-    ]
-  },
-  "lock": {
-    "keywords": [
-      "secure",
-      "safe",
-      "protected"
-    ]
-  },
-  "logo-gist": {
-    "keywords": [
-      "logo",
-      "gist"
-    ]
-  },
-  "logo-github": {
-    "keywords": [
-      "brand"
-    ]
-  },
-  "mail": {
-    "keywords": [
-      "email",
-      "unread"
-    ]
-  },
-  "mail-read": {
-    "keywords": [
-      "email",
-      "open"
-    ]
-  },
-  "mail-reply": {
-    "keywords": [
-      "email"
-    ]
-  },
-  "mark-github": {
-    "keywords": [
-      "octocat"
-    ]
-  },
-  "markdown": {
-    "keywords": [
-      "markup",
-      "style"
-    ]
-  },
-  "megaphone": {
-    "keywords": [
-      "bullhorn",
-      "loud",
-      "shout",
-      "broadcast"
-    ]
-  },
-  "mention": {
-    "keywords": [
-      "at",
-      "ping"
-    ]
-  },
-  "milestone": {
-    "keywords": [
-      "marker"
-    ]
-  },
-  "mirror": {
-    "keywords": [
-      "reflect"
-    ]
-  },
-  "mortar-board": {
-    "keywords": [
-      "education",
-      "learn",
-      "teach"
-    ]
-  },
-  "mute": {
-    "keywords": [
-      "quiet",
-      "sound",
-      "audio",
-      "turn",
-      "off"
-    ]
-  },
-  "no-newline": {
-    "keywords": [
-      "return"
-    ]
-  },
-  "note": {
-    "keywords": [
-      "card",
-      "paper",
-      "ticket"
-    ]
-  },
-  "octoface": {
-    "keywords": [
-      "octocat"
-    ]
-  },
-  "organization": {
-    "keywords": [
-      "people",
-      "group",
-      "team"
-    ]
-  },
-  "package": {
-    "keywords": [
-      "box",
-      "ship"
-    ]
-  },
-  "paintcan": {
-    "keywords": [
-      "style",
-      "theme",
-      "art",
-      "color"
-    ]
-  },
-  "pencil": {
-    "keywords": [
-      "edit",
-      "change",
-      "update",
-      "write"
-    ]
-  },
-  "person": {
-    "keywords": [
-      "people",
-      "man",
-      "woman",
-      "human"
-    ]
-  },
-  "pin": {
-    "keywords": [
-      "people",
-      "save",
-      "star",
-      "bookmark"
-    ]
-  },
-  "plug": {
-    "keywords": [
-      "hook",
-      "webhook"
-    ]
-  },
-  "plus": {
-    "keywords": [
-      "add",
-      "new",
-      "more"
-    ]
-  },
-  "plus-small": {
-    "keywords": [
-      "add",
-      "new",
-      "more",
-      "small"
-    ]
-  },
-  "primitive-dot": {
-    "keywords": [
-      "circle"
-    ]
-  },
-  "primitive-square": {
-    "keywords": [
-      "box"
-    ]
-  },
-  "project": {
-    "keywords": [
-      "board",
-      "kanban",
-      "columns",
-      "scrum"
-    ]
-  },
-  "pulse": {
-    "keywords": [
-      "graph",
-      "trend",
-      "line"
-    ]
-  },
-  "question": {
-    "keywords": [
-      "help",
-      "explain"
-    ]
-  },
-  "quote": {
-    "keywords": [
-      "quotation"
-    ]
-  },
-  "radio-tower": {
-    "keywords": [
-      "broadcast"
-    ]
-  },
-  "reply": {
-    "keywords": [
-      "reply all",
-      "back"
-    ]
-  },
-  "repo": {
-    "keywords": [
-      "book",
-      "journal"
-    ]
-  },
-  "repo-clone": {
-    "keywords": [
-      "book",
-      "journal"
-    ]
-  },
-  "repo-force-push": {
-    "keywords": [
-      "book",
-      "journal",
-      "put"
-    ]
-  },
-  "repo-forked": {
-    "keywords": [
-      "book",
-      "journal",
-      "copy"
-    ]
-  },
-  "repo-pull": {
-    "keywords": [
-      "book",
-      "journal",
-      "get"
-    ]
-  },
-  "repo-push": {
-    "keywords": [
-      "book",
-      "journal",
-      "put"
-    ]
-  },
-  "rocket": {
-    "keywords": [
-      "staff",
-      "stafftools",
-      "blast",
-      "off",
-      "space"
-    ]
-  },
-  "rss": {
-    "keywords": [
-      "broadcast",
-      "feed"
-    ]
-  },
-  "ruby": {
-    "keywords": [
-      "code"
-    ]
-  },
-  "screen-full": {
-    "keywords": [
-      "fullscreen",
-      "expand"
-    ]
-  },
-  "screen-normal": {
-    "keywords": [
-      "fullscreen",
-      "expand",
-      "exit"
-    ]
-  },
-  "search": {
-    "keywords": [
-      "magnifying",
-      "glass"
-    ]
-  },
-  "server": {
-    "keywords": [
-      "computers",
-      "racks",
-      "ops"
-    ]
-  },
-  "settings": {
-    "keywords": [
-      "sliders",
-      "filters"
-    ]
-  },
-  "shield": {
-    "keywords": [
-      "protect",
-      "shield",
-      "lock"
-    ]
-  },
-  "sign-in": {
-    "keywords": [
-      "door",
-      "arrow",
-      "direction",
-      "enter"
-    ]
-  },
-  "sign-out": {
-    "keywords": [
-      "door",
-      "arrow",
-      "direction",
-      "leave"
-    ]
-  },
-  "smiley": {
-    "keywords": [
-      "emoji",
-      "smile",
-      "mood",
-      "emotion"
-    ]
-  },
-  "squirrel": {
-    "keywords": [
-      "ship",
-      "shipit"
-    ]
-  },
-  "star": {
-    "keywords": [
-      "save",
-      "remember",
-      "like"
-    ]
-  },
-  "stop": {
-    "keywords": [
-      "block",
-      "spam"
-    ]
-  },
-  "sync": {
-    "keywords": [
-      "cycle",
-      "refresh",
-      "loop"
-    ]
-  },
-  "tag": {
-    "keywords": [
-      "release"
-    ]
-  },
-  "tasklist": {
-    "keywords": [
-      "todo"
-    ]
-  },
-  "telescope": {
-    "keywords": [
-      "science",
-      "space",
-      "look",
-      "view",
-      "explore"
-    ]
-  },
-  "terminal": {
-    "keywords": [
-      "code",
-      "ops",
-      "shell"
-    ]
-  },
-  "text-size": {
-    "keywords": [
-      "font",
-      "size",
-      "text"
-    ]
-  },
-  "three-bars": {
-    "keywords": [
-      "hamburger"
-    ]
-  },
-  "thumbsdown": {
-    "keywords": [
-      "thumb",
-      "thumbsdown",
-      "rejected"
-    ]
-  },
-  "thumbsup": {
-    "keywords": [
-      "thumb",
-      "thumbsup",
-      "prop",
-      "ship"
-    ]
-  },
-  "tools": {
-    "keywords": [
-      "screwdriver",
-      "wrench",
-      "settings"
-    ]
-  },
-  "trashcan": {
-    "keywords": [
-      "garbage",
-      "rubbish",
-      "recycle",
-      "delete"
-    ]
-  },
-  "triangle-down": {
-    "keywords": [
-      "arrow",
-      "point",
-      "direction"
-    ]
-  },
-  "triangle-left": {
-    "keywords": [
-      "arrow",
-      "point",
-      "direction"
-    ]
-  },
-  "triangle-right": {
-    "keywords": [
-      "arrow",
-      "point",
-      "direction"
-    ]
-  },
-  "triangle-up": {
-    "keywords": [
-      "arrow",
-      "point",
-      "direction"
-    ]
-  },
-  "unfold": {
-    "keywords": [
-      "expand",
-      "open",
-      "reveal"
-    ]
-  },
-  "unmute": {
-    "keywords": [
-      "loud",
-      "volume",
-      "audio",
-      "sound",
-      "play"
-    ]
-  },
-  "unverified": {
-    "keywords": [
-      "insecure",
-      "untrusted"
-    ]
-  },
-  "verified": {
-    "keywords": [
-      "trusted",
-      "secure",
-      "trustworthy"
-    ]
-  },
-  "versions": {
-    "keywords": [
-      "history"
-    ]
-  },
-  "watch": {
-    "keywords": [
-      "wait",
-      "hourglass"
-    ]
-  },
-  "x": {
-    "keywords": [
-      "remove",
-      "close",
-      "delete"
-    ]
-  },
-  "zap": {
-    "keywords": [
-      "electricity",
-      "lightning",
-      "props",
-      "like",
-      "star",
-      "save"
-    ]
-  }
-}
diff --git a/htdocs/theme/common/octicons/lib/octicons-master.sketch b/htdocs/theme/common/octicons/lib/octicons-master.sketch
deleted file mode 100644
index 85a3f1d431d..00000000000
Binary files a/htdocs/theme/common/octicons/lib/octicons-master.sketch and /dev/null differ
diff --git a/htdocs/theme/common/octicons/lib/svg/alert.svg b/htdocs/theme/common/octicons/lib/svg/alert.svg
deleted file mode 100644
index 3a75a6a4702..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/alert.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>alert</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="alert" fill="#000000">
-            <path d="M8.865,1.51999998 C8.685,1.20999998 8.355,1.01999998 7.995,1.01999998 C7.635,1.01999998 7.305,1.20999998 7.125,1.51999998 L0.275000001,13.5 C0.0950000006,13.81 0.0950000006,14.19 0.275000001,14.5 C0.465000001,14.81 0.795000001,15 1.145,15 L14.845,15 C15.205,15 15.535,14.81 15.705,14.5 C15.875,14.19 15.885,13.81 15.715,13.5 L8.865,1.51999998 Z M8.995,13 L6.995,13 L6.995,11 L8.995,11 L8.995,13 L8.995,13 Z M8.995,9.99999998 L6.995,9.99999998 L6.995,5.99999998 L8.995,5.99999998 L8.995,9.99999998 L8.995,9.99999998 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-down.svg b/htdocs/theme/common/octicons/lib/svg/arrow-down.svg
deleted file mode 100644
index 49a04c4b48d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/arrow-down.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-down</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="arrow-down" fill="#000000">
-            <polygon id="Shape" points="7 7 7 3 3 3 3 7 0 7 5 13 10 7"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-left.svg b/htdocs/theme/common/octicons/lib/svg/arrow-left.svg
deleted file mode 100644
index b6153c0eff2..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/arrow-left.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-left</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="arrow-left" fill="#000000">
-            <polygon id="Shape" points="6 3 0 8 6 13 6 10 10 10 10 6 6 6"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-right.svg b/htdocs/theme/common/octicons/lib/svg/arrow-right.svg
deleted file mode 100644
index 5d7f96ac2d8..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/arrow-right.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-right</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="arrow-right" fill="#000000">
-            <polygon id="Shape" points="10 8 4 3 4 6 0 6 0 10 4 10 4 13"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-small-down.svg b/htdocs/theme/common/octicons/lib/svg/arrow-small-down.svg
deleted file mode 100644
index bcb668d9c2c..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/arrow-small-down.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-small-down</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="arrow-small-down" fill="#000000">
-            <polygon id="Shape" points="4 7 4 5 2 5 2 7 0 7 3 11 6 7"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-small-left.svg b/htdocs/theme/common/octicons/lib/svg/arrow-small-left.svg
deleted file mode 100644
index a98f8a13e03..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/arrow-small-left.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-small-left</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="arrow-small-left" fill="#000000">
-            <polygon id="Shape" points="4 7 4 5 0 8 4 11 4 9 6 9 6 7"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-small-right.svg b/htdocs/theme/common/octicons/lib/svg/arrow-small-right.svg
deleted file mode 100644
index ac121726607..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/arrow-small-right.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-small-right</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="arrow-small-right" fill="#000000">
-            <polygon id="Shape" points="6 8 2 5 2 7 0 7 0 9 2 9 2 11"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-small-up.svg b/htdocs/theme/common/octicons/lib/svg/arrow-small-up.svg
deleted file mode 100644
index 9bd85161df4..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/arrow-small-up.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-small-up</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="arrow-small-up" fill="#000000">
-            <polygon id="Shape" points="3 5 0 9 2 9 2 11 4 11 4 9 6 9"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-up.svg b/htdocs/theme/common/octicons/lib/svg/arrow-up.svg
deleted file mode 100644
index a015f862bb2..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/arrow-up.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-up</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="arrow-up" fill="#000000">
-            <polygon id="Shape" points="5 3 0 9 3 9 3 13 7 13 7 9 10 9"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/beaker.svg b/htdocs/theme/common/octicons/lib/svg/beaker.svg
deleted file mode 100644
index 48aa51a85a2..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/beaker.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>beaker</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="beaker" fill="#000000">
-            <path d="M14.3797254,14.59 L10.9997254,7 L10.9997254,3 L11.9997254,3 L11.9997254,2 L2.99972539,2 L2.99972539,3 L3.99972539,3 L3.99972539,7 L0.62972539,14.59 C0.32972539,15.25 0.81972539,16 1.53972539,16 L13.4797254,16 C14.1997254,16 14.6797254,15.25 14.3897254,14.59 L14.3797254,14.59 Z M3.74972539,10 L4.99972539,7 L4.99972539,3 L9.99972539,3 L9.99972539,7 L11.2497254,10 L3.74972539,10 L3.74972539,10 Z M7.99972539,8 L8.99972539,8 L8.99972539,9 L7.99972539,9 L7.99972539,8 L7.99972539,8 Z M6.99972539,7 L5.99972539,7 L5.99972539,6 L6.99972539,6 L6.99972539,7 L6.99972539,7 Z M6.99972539,4 L7.99972539,4 L7.99972539,5 L6.99972539,5 L6.99972539,4 L6.99972539,4 Z M6.99972539,1 L5.99972539,1 L5.99972539,0 L6.99972539,0 L6.99972539,1 L6.99972539,1 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/bell.svg b/htdocs/theme/common/octicons/lib/svg/bell.svg
deleted file mode 100644
index 70607e932e7..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/bell.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>bell</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bell" fill="#000000">
-            <path d="M14,12 L14,13 L0,13 L0,12 L0.73,11.42 C1.5,10.65 1.54,8.87 1.92,7 C2.69,3.23 6,2 6,2 C6,1.45 6.45,1 7,1 C7.55,1 8,1.45 8,2 C8,2 11.39,3.23 12.16,7 C12.54,8.88 12.58,10.66 13.35,11.42 L14.01,12 L14,12 Z M7,16 C8.11,16 9,15.11 9,14 L5,14 C5,15.11 5.89,16 7,16 L7,16 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/bold.svg b/htdocs/theme/common/octicons/lib/svg/bold.svg
deleted file mode 100644
index a63af7ac7a1..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/bold.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>bold</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bold" fill="#000000">
-            <path d="M1,2 L4.83,2 C7.31,2 9.13,2.75 9.13,4.95 C9.13,6.09 8.5,7.18 7.46,7.56 L7.46,7.62 C8.79,7.92 9.76,8.85 9.76,10.48 C9.76,12.87 7.79,14 5.15,14 L1,14 L1,2 L1,2 Z M4.66,6.95 C6.33,6.95 7.04,6.29 7.04,5.26 C7.04,4.09 6.26,3.65 4.7,3.65 L3.13,3.65 L3.13,6.95 L4.66,6.95 L4.66,6.95 Z M4.93,12.34 C6.7,12.34 7.68,11.7 7.68,10.36 C7.68,9.09 6.73,8.55 4.93,8.55 L3.13,8.55 L3.13,12.35 L4.93,12.35 L4.93,12.34 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/book.svg b/htdocs/theme/common/octicons/lib/svg/book.svg
deleted file mode 100644
index 76026481ccb..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/book.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>book</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="book" fill="#000000">
-            <path d="M3,5 L7,5 L7,6 L3,6 L3,5 L3,5 Z M3,8 L7,8 L7,7 L3,7 L3,8 L3,8 Z M3,10 L7,10 L7,9 L3,9 L3,10 L3,10 Z M14,5 L10,5 L10,6 L14,6 L14,5 L14,5 Z M14,7 L10,7 L10,8 L14,8 L14,7 L14,7 Z M14,9 L10,9 L10,10 L14,10 L14,9 L14,9 Z M16,3 L16,12 C16,12.55 15.55,13 15,13 L9.5,13 L8.5,14 L7.5,13 L2,13 C1.45,13 1,12.55 1,12 L1,3 C1,2.45 1.45,2 2,2 L7.5,2 L8.5,3 L9.5,2 L15,2 C15.55,2 16,2.45 16,3 L16,3 Z M8,3.5 L7.5,3 L2,3 L2,12 L8,12 L8,3.5 L8,3.5 Z M15,3 L9.5,3 L9,3.5 L9,12 L15,12 L15,3 L15,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/bookmark.svg b/htdocs/theme/common/octicons/lib/svg/bookmark.svg
deleted file mode 100644
index 24fe161ed0d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/bookmark.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>bookmark</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bookmark" fill="#000000">
-            <path d="M9,0 L1,0 C0.27,0 0,0.27 0,1 L0,16 L5,12.91 L10,16 L10,1 C10,0.27 9.73,0 9,0 L9,0 Z M8.22,4.25 L6.36,5.61 L7.08,7.77 C7.14,7.99 7.06,8.05 6.88,7.94 L5,6.6 L3.12,7.94 C2.93,8.05 2.87,7.99 2.92,7.77 L3.64,5.61 L1.78,4.25 C1.61,4.09 1.64,4.02 1.87,4.02 L4.17,3.99 L4.87,1.83 L5.12,1.83 L5.82,3.99 L8.12,4.02 C8.35,4.02 8.39,4.1 8.21,4.25 L8.22,4.25 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/briefcase.svg b/htdocs/theme/common/octicons/lib/svg/briefcase.svg
deleted file mode 100644
index ae56b711b3c..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/briefcase.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>briefcase</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="briefcase" fill="#000000">
-            <path d="M9,4 L9,3 C9,2.45 8.55,2 8,2 L6,2 C5.45,2 5,2.45 5,3 L5,4 L1,4 C0.45,4 0,4.45 0,5 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,5 C14,4.45 13.55,4 13,4 L9,4 L9,4 Z M6,3 L8,3 L8,4 L6,4 L6,3 L6,3 Z M13,9 L8,9 L8,10 L6,10 L6,9 L1,9 L1,5 L2,5 L2,8 L12,8 L12,5 L13,5 L13,9 L13,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/broadcast.svg b/htdocs/theme/common/octicons/lib/svg/broadcast.svg
deleted file mode 100644
index 491048fb87a..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/broadcast.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>broadcast</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="broadcast" fill="#000000">
-            <path d="M9,9 L8,9 C8.55,9 9,8.55 9,8 L9,7 C9,6.45 8.55,6 8,6 L7,6 C6.45,6 6,6.45 6,7 L6,8 C6,8.55 6.45,9 7,9 L6,9 C5.45,9 5,9.45 5,10 L5,12 L6,12 L6,15 C6,15.55 6.45,16 7,16 L8,16 C8.55,16 9,15.55 9,15 L9,12 L10,12 L10,10 C10,9.45 9.55,9 9,9 L9,9 Z M7,7 L8,7 L8,8 L7,8 L7,7 L7,7 Z M9,11 L8,11 L8,15 L7,15 L7,11 L6,11 L6,10 L9,10 L9,11 L9,11 Z M11.09,7.5 C11.09,5.52 9.48,3.91 7.5,3.91 C5.52,3.91 3.91,5.52 3.91,7.5 C3.91,7.78 3.94,8.05 4,8.31 L4,10.29 C3.39,9.52 3,8.56 3,7.49 C3,5.01 5.02,2.99 7.5,2.99 C9.98,2.99 12,5.01 12,7.49 C12,8.55 11.61,9.52 11,10.29 L11,8.31 C11.06,8.04 11.09,7.78 11.09,7.5 L11.09,7.5 Z M15,7.5 C15,10.38 13.37,12.88 11,14.13 L11,13.08 C12.86,11.92 14.09,9.86 14.09,7.5 C14.09,3.86 11.14,0.91 7.5,0.91 C3.86,0.91 0.91,3.86 0.91,7.5 C0.91,9.86 2.14,11.92 4,13.08 L4,14.13 C1.63,12.88 0,10.38 0,7.5 C0,3.36 3.36,0 7.5,0 C11.64,0 15,3.36 15,7.5 L15,7.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/browser.svg b/htdocs/theme/common/octicons/lib/svg/browser.svg
deleted file mode 100644
index 5c9251d0f91..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/browser.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>browser</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="browser" fill="#000000">
-            <path d="M5,3 L6,3 L6,4 L5,4 L5,3 L5,3 Z M3,3 L4,3 L4,4 L3,4 L3,3 L3,3 Z M1,3 L2,3 L2,4 L1,4 L1,3 L1,3 Z M13,13 L1,13 L1,5 L13,5 L13,13 L13,13 Z M13,4 L7,4 L7,3 L13,3 L13,4 L13,4 Z M14,3 C14,2.45 13.55,2 13,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,3 L14,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/bug.svg b/htdocs/theme/common/octicons/lib/svg/bug.svg
deleted file mode 100644
index 8f515ad1b98..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/bug.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>bug</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bug" fill="#000000">
-            <path d="M11,10 L14,10 L14,9 L11,9 L11,8 L14.17,6.97 L13.83,6.03 L11,7 L11,6 C11,5.45 10.55,5 9.99999998,5 L9.99999998,4 C9.99999998,3.52 9.63999998,3.12 9.16999998,3.03 L10.2,2 L12,2 L12,1 L9.79999998,1 L7.79999998,3 L7.20999998,3 L5.19999998,1 L2.99999998,1 L2.99999998,2 L4.79999998,2 L5.82999998,3.03 C5.35999998,3.12 4.99999998,3.51 4.99999998,4 L4.99999998,5 C4.44999998,5 3.99999998,5.45 3.99999998,6 L3.99999998,7 L1.16999998,6.03 L0.829999983,6.97 L3.99999998,8 L3.99999998,9 L0.999999983,9 L0.999999983,10 L3.99999998,10 L3.99999998,11 L0.829999983,12.03 L1.16999998,12.97 L3.99999998,12 L3.99999998,13 C3.99999998,13.55 4.44999998,14 4.99999998,14 L5.99999998,14 L6.99999998,13 L6.99999998,6 L7.99999998,6 L7.99999998,13 L8.99999998,14 L9.99999998,14 C10.55,14 11,13.55 11,13 L11,12 L13.83,12.97 L14.17,12.03 L11,11 L11,10 L11,10 Z M8.99999998,5 L5.99999998,5 L5.99999998,4 L8.99999998,4 L8.99999998,5 L8.99999998,5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/calendar.svg b/htdocs/theme/common/octicons/lib/svg/calendar.svg
deleted file mode 100644
index 47755281156..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/calendar.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>calendar</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="calendar" fill="#000000">
-            <path d="M13,2 L12,2 L12,3.5 C12,3.78 11.78,4 11.5,4 L9.5,4 C9.22,4 9,3.78 9,3.5 L9,2 L6,2 L6,3.5 C6,3.78 5.78,4 5.5,4 L3.5,4 C3.22,4 3,3.78 3,3.5 L3,2 L2,2 C1.45,2 1,2.45 1,3 L1,14 C1,14.55 1.45,15 2,15 L13,15 C13.55,15 14,14.55 14,14 L14,3 C14,2.45 13.55,2 13,2 L13,2 Z M13,14 L2,14 L2,5 L13,5 L13,14 L13,14 Z M5,3 L4,3 L4,1 L5,1 L5,3 L5,3 Z M11,3 L10,3 L10,1 L11,1 L11,3 L11,3 Z M6,7 L5,7 L5,6 L6,6 L6,7 L6,7 Z M8,7 L7,7 L7,6 L8,6 L8,7 L8,7 Z M10,7 L9,7 L9,6 L10,6 L10,7 L10,7 Z M12,7 L11,7 L11,6 L12,6 L12,7 L12,7 Z M4,9 L3,9 L3,8 L4,8 L4,9 L4,9 Z M6,9 L5,9 L5,8 L6,8 L6,9 L6,9 Z M8,9 L7,9 L7,8 L8,8 L8,9 L8,9 Z M10,9 L9,9 L9,8 L10,8 L10,9 L10,9 Z M12,9 L11,9 L11,8 L12,8 L12,9 L12,9 Z M4,11 L3,11 L3,10 L4,10 L4,11 L4,11 Z M6,11 L5,11 L5,10 L6,10 L6,11 L6,11 Z M8,11 L7,11 L7,10 L8,10 L8,11 L8,11 Z M10,11 L9,11 L9,10 L10,10 L10,11 L10,11 Z M12,11 L11,11 L11,10 L12,10 L12,11 L12,11 Z M4,13 L3,13 L3,12 L4,12 L4,13 L4,13 Z M6,13 L5,13 L5,12 L6,12 L6,13 L6,13 Z M8,13 L7,13 L7,12 L8,12 L8,13 L8,13 Z M10,13 L9,13 L9,12 L10,12 L10,13 L10,13 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/check.svg b/htdocs/theme/common/octicons/lib/svg/check.svg
deleted file mode 100644
index fffa457ac33..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/check.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>check</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="check" fill="#000000">
-            <polygon id="Shape" points="12 5 4 13 0 9 1.5 7.5 4 10 10.5 3.5"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/checklist.svg b/htdocs/theme/common/octicons/lib/svg/checklist.svg
deleted file mode 100644
index 2ba6b100be0..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/checklist.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>checklist</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="checklist" fill="#000000">
-            <path d="M16,8.5 L10,14.5 L7,11.5 L8.5,10 L10,11.5 L14.5,7 L16,8.5 L16,8.5 Z M5.7,12.2 L6.5,13 L2,13 C1.45,13 1,12.55 1,12 L1,3 C1,2.45 1.45,2 2,2 L9,2 C9.55,2 10,2.45 10,3 L10,9.5 L9.2,8.7 C8.81,8.31 8.17,8.31 7.78,8.7 L5.7,10.8 C5.31,11.19 5.31,11.82 5.7,12.21 L5.7,12.2 Z M4,4 L9,4 L9,3 L4,3 L4,4 L4,4 Z M4,6 L9,6 L9,5 L4,5 L4,6 L4,6 Z M4,8 L7,8 L7,7 L4,7 L4,8 L4,8 Z M3,9 L2,9 L2,10 L3,10 L3,9 L3,9 Z M3,7 L2,7 L2,8 L3,8 L3,7 L3,7 Z M3,5 L2,5 L2,6 L3,6 L3,5 L3,5 Z M3,3 L2,3 L2,4 L3,4 L3,3 L3,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/chevron-down.svg b/htdocs/theme/common/octicons/lib/svg/chevron-down.svg
deleted file mode 100644
index a77c7eae8c0..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/chevron-down.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>chevron-down</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="chevron-down" fill="#000000">
-            <polygon id="Shape" points="5 11 0 6 1.5 4.5 5 8.25 8.5 4.5 10 6"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/chevron-left.svg b/htdocs/theme/common/octicons/lib/svg/chevron-left.svg
deleted file mode 100644
index d09f2f39e97..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/chevron-left.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>chevron-left</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="chevron-left" fill="#000000">
-            <polygon id="Shape" points="5.5 3 7 4.5 3.25 8 7 11.5 5.5 13 0.5 8"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/chevron-right.svg b/htdocs/theme/common/octicons/lib/svg/chevron-right.svg
deleted file mode 100644
index aaaa6f036f3..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/chevron-right.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>chevron-right</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="chevron-right" fill="#000000">
-            <polygon id="Shape" points="7.5 8 2.5 13 1 11.5 4.75 8 1 4.5 2.5 3"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/chevron-up.svg b/htdocs/theme/common/octicons/lib/svg/chevron-up.svg
deleted file mode 100644
index 4bd14a27c5d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/chevron-up.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>chevron-up</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="chevron-up" fill="#000000">
-            <polygon id="Shape" points="10 10 8.5 11.5 5 7.75 1.5 11.5 0 10 5 5"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/circle-slash.svg b/htdocs/theme/common/octicons/lib/svg/circle-slash.svg
deleted file mode 100644
index f0f5143a802..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/circle-slash.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>circle-slash</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="circle-slash" fill="#000000">
-            <path d="M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z M7,2.3 C8.3,2.3 9.5,2.74 10.47,3.47 L2.47,11.47 C1.74,10.5 1.3,9.3 1.3,8 C1.3,4.86 3.86,2.3 7,2.3 L7,2.3 Z M7,13.71 C5.7,13.71 4.5,13.27 3.53,12.54 L11.53,4.54 C12.26,5.51 12.7,6.71 12.7,8.01 C12.7,11.15 10.14,13.71 7,13.71 L7,13.71 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/circuit-board.svg b/htdocs/theme/common/octicons/lib/svg/circuit-board.svg
deleted file mode 100644
index 5c4e07e59b1..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/circuit-board.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>circuit-board</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="circuit-board" fill="#000000">
-            <path d="M3,5 C3,4.45 3.45,4 4,4 C4.55,4 5,4.45 5,5 C5,5.55 4.55,6 4,6 C3.45,6 3,5.55 3,5 L3,5 Z M11,5 C11,4.45 10.55,4 10,4 C9.45,4 9,4.45 9,5 C9,5.55 9.45,6 10,6 C10.55,6 11,5.55 11,5 L11,5 Z M11,11 C11,10.45 10.55,10 10,10 C9.45,10 9,10.45 9,11 C9,11.55 9.45,12 10,12 C10.55,12 11,11.55 11,11 L11,11 Z M13,1 L5,1 L5,3.17 C5.36,3.36 5.64,3.64 5.83,4 L8.17,4 C8.59,3.22 9.5,2.72 10.51,2.95 C11.26,3.14 11.87,3.75 12.04,4.5 C12.35,5.88 11.32,7.09 9.99,7.09 C9.19,7.09 8.51,6.65 8.16,6 L5.83,6 C5.41,6.8 4.5,7.28 3.49,7.03 C2.76,6.86 2.15,6.25 1.97,5.51 C1.72,4.49 2.2,3.59 3,3.17 L3,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L6,10 L8.17,10 C8.59,9.22 9.5,8.72 10.51,8.95 C11.26,9.14 11.87,9.75 12.04,10.5 C12.35,11.88 11.32,13.09 9.99,13.09 C9.19,13.09 8.51,12.65 8.16,12 L6.99,12 L4,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/clippy.svg b/htdocs/theme/common/octicons/lib/svg/clippy.svg
deleted file mode 100644
index 4001b75a296..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/clippy.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>clippy</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="clippy" fill="#000000">
-            <path d="M2,13 L6,13 L6,14 L2,14 L2,13 L2,13 Z M7,7 L2,7 L2,8 L7,8 L7,7 L7,7 Z M9,10 L9,8 L6,11 L9,14 L9,12 L14,12 L14,10 L9,10 L9,10 Z M4.5,9 L2,9 L2,10 L4.5,10 L4.5,9 L4.5,9 Z M2,12 L4.5,12 L4.5,11 L2,11 L2,12 L2,12 Z M11,13 L12,13 L12,15 C11.98,15.28 11.89,15.52 11.7,15.7 C11.51,15.88 11.28,15.98 11,16 L1,16 C0.45,16 0,15.55 0,15 L0,4 C0,3.45 0.45,3 1,3 L4,3 C4,1.89 4.89,1 6,1 C7.11,1 8,1.89 8,3 L11,3 C11.55,3 12,3.45 12,4 L12,9 L11,9 L11,6 L1,6 L1,15 L11,15 L11,13 L11,13 Z M2,5 L10,5 C10,4.45 9.55,4 9,4 L8,4 C7.45,4 7,3.55 7,3 C7,2.45 6.55,2 6,2 C5.45,2 5,2.45 5,3 C5,3.55 4.55,4 4,4 L3,4 C2.45,4 2,4.45 2,5 L2,5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/clock.svg b/htdocs/theme/common/octicons/lib/svg/clock.svg
deleted file mode 100644
index fb25a9ac451..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/clock.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>clock</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="clock" fill="#000000">
-            <path d="M8,8 L11,8 L11,10 L7,10 C6.45,10 6,9.55 6,9 L6,4 L8,4 L8,8 L8,8 Z M7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,11.14 10.14,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,4.86 3.86,2.3 7,2.3 L7,2.3 Z M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/cloud-download.svg b/htdocs/theme/common/octicons/lib/svg/cloud-download.svg
deleted file mode 100644
index 0cd213d57c4..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/cloud-download.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>cloud-download</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cloud-download" fill="#000000">
-            <path d="M9,12 L11,12 L8,15 L5,12 L7,12 L7,7 L9,7 L9,12 L9,12 Z M12,4 C12,3.56 11.09,1 7.5,1 C5.08,1 3,2.92 3,5 C1.02,5 0,6.52 0,8 C0,9.53 1,11 3,11 L6,11 L6,9.7 L3,9.7 C1.38,9.7 1.3,8.28 1.3,8 C1.3,7.83 1.35,6.3 3,6.3 L4.3,6.3 L4.3,5 C4.3,3.61 5.86,2.3 7.5,2.3 C10.05,2.3 10.63,3.85 10.7,4.1 L10.7,5.3 L12,5.3 C12.81,5.3 14.7,5.52 14.7,7.5 C14.7,9.59 12.45,9.7 12,9.7 L10,9.7 L10,11 L12,11 C14.08,11 16,9.84 16,7.5 C16,5.06 14.08,4 12,4 L12,4 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/cloud-upload.svg b/htdocs/theme/common/octicons/lib/svg/cloud-upload.svg
deleted file mode 100644
index b8c24ce596d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/cloud-upload.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>cloud-upload</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cloud-upload" fill="#000000">
-            <path d="M7,9 L5,9 L8,6 L11,9 L9,9 L9,14 L7,14 L7,9 L7,9 Z M12,5 C12,4.56 11.09,2 7.5,2 C5.08,2 3,3.92 3,6 C1.02,6 0,7.52 0,9 C0,10.53 1,12 3,12 L6,12 L6,10.7 L3,10.7 C1.38,10.7 1.3,9.28 1.3,9 C1.3,8.83 1.35,7.3 3,7.3 L4.3,7.3 L4.3,6 C4.3,4.61 5.86,3.3 7.5,3.3 C10.05,3.3 10.63,4.85 10.7,5.1 L10.7,6.3 L12,6.3 C12.81,6.3 14.7,6.52 14.7,8.5 C14.7,10.59 12.45,10.7 12,10.7 L10,10.7 L10,12 L12,12 C14.08,12 16,10.84 16,8.5 C16,6.06 14.08,5 12,5 L12,5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/code.svg b/htdocs/theme/common/octicons/lib/svg/code.svg
deleted file mode 100644
index a297c9ba1d6..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/code.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>code</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="code" fill="#000000">
-            <path d="M9.5,3 L8,4.5 L11.5,8 L8,11.5 L9.5,13 L14,8 L9.5,3 L9.5,3 Z M4.5,3 L0,8 L4.5,13 L6,11.5 L2.5,8 L6,4.5 L4.5,3 L4.5,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/comment-discussion.svg b/htdocs/theme/common/octicons/lib/svg/comment-discussion.svg
deleted file mode 100644
index 85243149efe..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/comment-discussion.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>comment-discussion</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="comment-discussion" fill="#000000">
-            <path d="M15,1 L6,1 C5.45,1 5,1.45 5,2 L5,4 L1,4 C0.45,4 0,4.45 0,5 L0,11 C0,11.55 0.45,12 1,12 L2,12 L2,15 L5,12 L9,12 C9.55,12 10,11.55 10,11 L10,9 L11,9 L14,12 L14,9 L15,9 C15.55,9 16,8.55 16,8 L16,2 C16,1.45 15.55,1 15,1 L15,1 Z M9,11 L4.5,11 L3,12.5 L3,11 L1,11 L1,5 L5,5 L5,8 C5,8.55 5.45,9 6,9 L9,9 L9,11 L9,11 Z M15,8 L13,8 L13,9.5 L11.5,8 L6,8 L6,2 L15,2 L15,8 L15,8 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/comment.svg b/htdocs/theme/common/octicons/lib/svg/comment.svg
deleted file mode 100644
index 55279771463..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/comment.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>comment</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="comment" fill="#000000">
-            <path d="M14,1 L2,1 C1.45,1 1,1.45 1,2 L1,10 C1,10.55 1.45,11 2,11 L4,11 L4,14.5 L7.5,11 L14,11 C14.55,11 15,10.55 15,10 L15,2 C15,1.45 14.55,1 14,1 L14,1 Z M14,10 L7,10 L5,12 L5,10 L2,10 L2,2 L14,2 L14,10 L14,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/credit-card.svg b/htdocs/theme/common/octicons/lib/svg/credit-card.svg
deleted file mode 100644
index c801be4b18a..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/credit-card.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>credit-card</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="credit-card" fill="#000000">
-            <path d="M12,9 L2,9 L2,8 L12,8 L12,9 L12,9 Z M16,3 L16,12 C16,12.55 15.55,13 15,13 L1,13 C0.45,13 0,12.55 0,12 L0,3 C0,2.45 0.45,2 1,2 L15,2 C15.55,2 16,2.45 16,3 L16,3 Z M15,6 L1,6 L1,12 L15,12 L15,6 L15,6 Z M15,3 L1,3 L1,4 L15,4 L15,3 L15,3 Z M6,10 L2,10 L2,11 L6,11 L6,10 L6,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/dash.svg b/htdocs/theme/common/octicons/lib/svg/dash.svg
deleted file mode 100644
index 6c000a991b0..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/dash.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>dash</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="dash" fill="#000000">
-            <polygon id="Shape" points="0 7 0 9 8 9 8 7"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/dashboard.svg b/htdocs/theme/common/octicons/lib/svg/dashboard.svg
deleted file mode 100644
index 7c37b3a6637..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/dashboard.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>dashboard</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="dashboard" fill="#000000">
-            <path d="M9,5 L8,5 L8,4 L9,4 L9,5 L9,5 Z M13,8 L12,8 L12,9 L13,9 L13,8 L13,8 Z M6,5 L5,5 L5,6 L6,6 L6,5 L6,5 Z M5,8 L4,8 L4,9 L5,9 L5,8 L5,8 Z M16,2.5 L15.5,2 L9,7 C8.94,6.98 8,7 8,7 C7.45,7 7,7.45 7,8 L7,9 C7,9.55 7.45,10 8,10 L9,10 C9.55,10 10,9.55 10,9 L10,8.08 L16,2.5 L16,2.5 Z M14.41,6.59 C14.6,7.2 14.71,7.84 14.71,8.5 C14.71,11.92 11.93,14.7 8.51,14.7 C5.09,14.7 2.3,11.92 2.3,8.5 C2.3,5.08 5.08,2.3 8.5,2.3 C9.7,2.3 10.81,2.64 11.77,3.24 L12.71,2.3 C11.52,1.49 10.07,1 8.51,1 C4.36,1 1,4.36 1,8.5 C1,12.64 4.36,16 8.5,16 C12.64,16 16,12.64 16,8.5 C16,7.47 15.8,6.48 15.41,5.59 L14.41,6.59 L14.41,6.59 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/database.svg b/htdocs/theme/common/octicons/lib/svg/database.svg
deleted file mode 100644
index f1b798a970c..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/database.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>database</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="database" fill="#000000">
-            <path d="M6,15 C2.69,15 0,14.1 0,13 L0,11 C0,10.83 0.09,10.66 0.21,10.5 C0.88,11.36 3.21,12 6,12 C8.79,12 11.12,11.36 11.79,10.5 C11.92,10.66 12,10.83 12,11 L12,13 C12,14.1 9.31,15 6,15 L6,15 Z M6,11 C2.69,11 0,10.1 0,9 L0,7 C0,6.89 0.04,6.79 0.09,6.69 L0.09,6.69 C0.12,6.63 0.16,6.56 0.21,6.5 C0.88,7.36 3.21,8 6,8 C8.79,8 11.12,7.36 11.79,6.5 C11.84,6.56 11.88,6.63 11.91,6.69 L11.91,6.69 C11.96,6.79 12,6.9 12,7 L12,9 C12,10.1 9.31,11 6,11 L6,11 Z M6,7 C2.69,7 0,6.1 0,5 L0,4 L0,3 C0,1.9 2.69,1 6,1 C9.31,1 12,1.9 12,3 L12,4 L12,5 C12,6.1 9.31,7 6,7 L6,7 Z M6,2 C3.79,2 2,2.45 2,3 C2,3.55 3.79,4 6,4 C8.21,4 10,3.55 10,3 C10,2.45 8.21,2 6,2 L6,2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/desktop-download.svg b/htdocs/theme/common/octicons/lib/svg/desktop-download.svg
deleted file mode 100644
index 6c9d08d97e0..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/desktop-download.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>desktop-download</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="desktop-download" fill="#000000">
-            <path d="M4,6 L7,6 L7,0 L9,0 L9,6 L12,6 L8,10 L4,6 L4,6 Z M15,2 L11,2 L11,3 L15,3 L15,11 L1,11 L1,3 L5,3 L5,2 L1,2 C0.45,2 0,2.45 0,3 L0,12 C0,12.55 0.45,13 1,13 L6.34,13 C6.09,13.61 5.48,14.39 4,15 L12,15 C10.52,14.39 9.91,13.61 9.66,13 L15,13 C15.55,13 16,12.55 16,12 L16,3 C16,2.45 15.55,2 15,2 L15,2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/device-camera-video.svg b/htdocs/theme/common/octicons/lib/svg/device-camera-video.svg
deleted file mode 100644
index e8e8167a812..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/device-camera-video.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>device-camera-video</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="device-camera-video" fill="#000000">
-            <path d="M15.2,2.09 L10,5.72 L10,3 C10,2.45 9.55,2 9,2 L1,2 C0.45,2 0,2.45 0,3 L0,12 C0,12.55 0.45,13 1,13 L9,13 C9.55,13 10,12.55 10,12 L10,9.28 L15.2,12.91 C15.53,13.14 16,12.91 16,12.5 L16,2.5 C16,2.09 15.53,1.86 15.2,2.09 L15.2,2.09 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/device-camera.svg b/htdocs/theme/common/octicons/lib/svg/device-camera.svg
deleted file mode 100644
index f0fa4bc7cfd..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/device-camera.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>device-camera</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="device-camera" fill="#000000">
-            <path d="M15,3 L7,3 C7,2.45 6.55,2 6,2 L2,2 C1.45,2 1,2.45 1,3 C0.45,3 0,3.45 0,4 L0,13 C0,13.55 0.45,14 1,14 L15,14 C15.55,14 16,13.55 16,13 L16,4 C16,3.45 15.55,3 15,3 L15,3 Z M6,5 L2,5 L2,4 L6,4 L6,5 L6,5 Z M10.5,12 C8.56,12 7,10.44 7,8.5 C7,6.56 8.56,5 10.5,5 C12.44,5 14,6.56 14,8.5 C14,10.44 12.44,12 10.5,12 L10.5,12 Z M13,8.5 C13,9.88 11.87,11 10.5,11 C9.13,11 8,9.87 8,8.5 C8,7.13 9.13,6 10.5,6 C11.87,6 13,7.13 13,8.5 L13,8.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/device-desktop.svg b/htdocs/theme/common/octicons/lib/svg/device-desktop.svg
deleted file mode 100644
index d2cae7ae900..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/device-desktop.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>device-desktop</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="device-desktop" fill="#000000">
-            <path d="M15,2 L1,2 C0.45,2 0,2.45 0,3 L0,12 C0,12.55 0.45,13 1,13 L6.34,13 C6.09,13.61 5.48,14.39 4,15 L12,15 C10.52,14.39 9.91,13.61 9.66,13 L15,13 C15.55,13 16,12.55 16,12 L16,3 C16,2.45 15.55,2 15,2 L15,2 Z M15,11 L1,11 L1,3 L15,3 L15,11 L15,11 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/device-mobile.svg b/htdocs/theme/common/octicons/lib/svg/device-mobile.svg
deleted file mode 100644
index 549767577c0..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/device-mobile.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>device-mobile</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="device-mobile" fill="#000000">
-            <path d="M9,0 L1,0 C0.45,0 0,0.45 0,1 L0,15 C0,15.55 0.45,16 1,16 L9,16 C9.55,16 10,15.55 10,15 L10,1 C10,0.45 9.55,0 9,0 L9,0 Z M5,15.3 C4.28,15.3 3.7,14.72 3.7,14 C3.7,13.28 4.28,12.7 5,12.7 C5.72,12.7 6.3,13.28 6.3,14 C6.3,14.72 5.72,15.3 5,15.3 L5,15.3 Z M9,12 L1,12 L1,2 L9,2 L9,12 L9,12 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-added.svg b/htdocs/theme/common/octicons/lib/svg/diff-added.svg
deleted file mode 100644
index 0b1cd1779c3..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/diff-added.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>diff-added</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="diff-added" fill="#000000">
-            <path d="M13,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z M13,14 L1,14 L1,2 L13,2 L13,14 L13,14 Z M6,9 L3,9 L3,7 L6,7 L6,4 L8,4 L8,7 L11,7 L11,9 L8,9 L8,12 L6,12 L6,9 L6,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-ignored.svg b/htdocs/theme/common/octicons/lib/svg/diff-ignored.svg
deleted file mode 100644
index bd11f983b1e..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/diff-ignored.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>diff-ignored</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="diff-ignored" fill="#000000">
-            <path d="M13,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z M13,14 L1,14 L1,2 L13,2 L13,14 L13,14 Z M4.5,12 L3,12 L3,10.5 L9.5,4 L11,4 L11,5.5 L4.5,12 L4.5,12 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-modified.svg b/htdocs/theme/common/octicons/lib/svg/diff-modified.svg
deleted file mode 100644
index 03929da650f..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/diff-modified.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>diff-modified</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="diff-modified" fill="#000000">
-            <path d="M13,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z M13,14 L1,14 L1,2 L13,2 L13,14 L13,14 Z M4,8 C4,6.34 5.34,5 7,5 C8.66,5 10,6.34 10,8 C10,9.66 8.66,11 7,11 C5.34,11 4,9.66 4,8 L4,8 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-removed.svg b/htdocs/theme/common/octicons/lib/svg/diff-removed.svg
deleted file mode 100644
index b5c25a3ccc6..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/diff-removed.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>diff-removed</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="diff-removed" fill="#000000">
-            <path d="M13,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z M13,14 L1,14 L1,2 L13,2 L13,14 L13,14 Z M11,9 L3,9 L3,7 L11,7 L11,9 L11,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-renamed.svg b/htdocs/theme/common/octicons/lib/svg/diff-renamed.svg
deleted file mode 100644
index 3f385f1fab8..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/diff-renamed.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>diff-renamed</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="diff-renamed" fill="#000000">
-            <path d="M6,9 L3,9 L3,7 L6,7 L6,4 L11,8 L6,12 L6,9 L6,9 Z M14,2 L14,14 C14,14.55 13.55,15 13,15 L1,15 C0.45,15 0,14.55 0,14 L0,2 C0,1.45 0.45,1 1,1 L13,1 C13.55,1 14,1.45 14,2 L14,2 Z M13,2 L1,2 L1,14 L13,14 L13,2 L13,2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff.svg b/htdocs/theme/common/octicons/lib/svg/diff.svg
deleted file mode 100644
index 0ea237dfbd7..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/diff.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="13px" height="16px" viewBox="0 0 13 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>diff</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="diff" fill="#000000">
-            <path d="M6,7 L8,7 L8,8 L6,8 L6,10 L5,10 L5,8 L3,8 L3,7 L5,7 L5,5 L6,5 L6,7 L6,7 Z M3,13 L8,13 L8,12 L3,12 L3,13 L3,13 Z M7.5,2 L11,5.5 L11,15 C11,15.55 10.55,16 10,16 L1,16 C0.45,16 0,15.55 0,15 L0,3 C0,2.45 0.45,2 1,2 L7.5,2 L7.5,2 Z M10,6 L7,3 L1,3 L1,15 L10,15 L10,6 L10,6 Z M8.5,0 L3,0 L3,1 L8,1 L12,5 L12,13 L13,13 L13,4.5 L8.5,0 L8.5,0 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/ellipses.svg b/htdocs/theme/common/octicons/lib/svg/ellipses.svg
deleted file mode 100644
index cba76eb46dd..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/ellipses.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>ellipses</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="ellipses" fill="#000000">
-            <path d="M11,5 L1,5 C0.45,5 0,5.45 0,6 L0,10 C0,10.55 0.45,11 1,11 L11,11 C11.55,11 12,10.55 12,10 L12,6 C12,5.45 11.55,5 11,5 L11,5 Z M4,9 L2,9 L2,7 L4,7 L4,9 L4,9 Z M7,9 L5,9 L5,7 L7,7 L7,9 L7,9 Z M10,9 L8,9 L8,7 L10,7 L10,9 L10,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/ellipsis.svg b/htdocs/theme/common/octicons/lib/svg/ellipsis.svg
deleted file mode 100644
index 60acf955383..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/ellipsis.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg height="16" width="12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 16">
-  <path d="M11 5H1c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1h10c0.55 0 1-0.45 1-1V6c0-0.55-0.45-1-1-1zM4 9H2V7h2v2z m3 0H5V7h2v2z m3 0H8V7h2v2z" />
-</svg>
diff --git a/htdocs/theme/common/octicons/lib/svg/eye.svg b/htdocs/theme/common/octicons/lib/svg/eye.svg
deleted file mode 100644
index f2021488709..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/eye.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>eye</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="eye" fill="#000000">
-            <path d="M8.06,2 C3,2 0,8 0,8 C0,8 3,14 8.06,14 C13,14 16,8 16,8 C16,8 13,2 8.06,2 L8.06,2 Z M8,12 C5.8,12 4,10.22 4,8 C4,5.8 5.8,4 8,4 C10.22,4 12,5.8 12,8 C12,10.22 10.22,12 8,12 L8,12 Z M10,8 C10,9.11 9.11,10 8,10 C6.89,10 6,9.11 6,8 C6,6.89 6.89,6 8,6 C9.11,6 10,6.89 10,8 L10,8 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-binary.svg b/htdocs/theme/common/octicons/lib/svg/file-binary.svg
deleted file mode 100644
index 8efbe8f5d2b..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-binary.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-binary</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-binary" fill="#000000">
-            <path d="M4,12 L5,12 L5,13 L2,13 L2,12 L3,12 L3,10 L2,10 L2,9 L4,9 L4,12 L4,12 Z M12,4.5 L12,14 C12,14.55 11.55,15 11,15 L1,15 C0.45,15 0,14.55 0,14 L0,2 C0,1.45 0.45,1 1,1 L8.5,1 L12,4.5 L12,4.5 Z M11,5 L8,2 L1,2 L1,14 L11,14 L11,5 L11,5 Z M8,4 L6,4 L6,5 L7,5 L7,7 L6,7 L6,8 L9,8 L9,7 L8,7 L8,4 L8,4 Z M2,4 L5,4 L5,8 L2,8 L2,4 L2,4 Z M3,7 L4,7 L4,5 L3,5 L3,7 L3,7 Z M6,9 L9,9 L9,13 L6,13 L6,9 L6,9 Z M7,12 L8,12 L8,10 L7,10 L7,12 L7,12 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-code.svg b/htdocs/theme/common/octicons/lib/svg/file-code.svg
deleted file mode 100644
index 3bc2b299a42..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-code.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-code</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-code" fill="#000000">
-            <path d="M8.5,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L11,15 C11.55,15 12,14.55 12,14 L12,4.5 L8.5,1 L8.5,1 Z M11,14 L1,14 L1,2 L8,2 L11,5 L11,14 L11,14 Z M5,6.98 L3.5,8.5 L5,10 L4.5,11 L2,8.5 L4.5,6 L5,6.98 L5,6.98 Z M7.5,6 L10,8.5 L7.5,11 L7,10.02 L8.5,8.5 L7,7 L7.5,6 L7.5,6 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-directory.svg b/htdocs/theme/common/octicons/lib/svg/file-directory.svg
deleted file mode 100644
index 3b0ea6d66cb..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-directory.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-directory</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-directory" fill="#000000">
-            <path d="M13,4 L7,4 L7,3 C7,2.34 6.69,2 6,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,5 C14,4.45 13.55,4 13,4 L13,4 Z M6,4 L1,4 L1,3 L6,3 L6,4 L6,4 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-media.svg b/htdocs/theme/common/octicons/lib/svg/file-media.svg
deleted file mode 100644
index db00315d134..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-media.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-media</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-media" fill="#000000">
-            <path d="M6,5 L8,5 L8,7 L6,7 L6,5 L6,5 Z M12,4.5 L12,14 C12,14.55 11.55,15 11,15 L1,15 C0.45,15 0,14.55 0,14 L0,2 C0,1.45 0.45,1 1,1 L8.5,1 L12,4.5 L12,4.5 Z M11,5 L8,2 L1,2 L1,13 L4,8 L6,12 L8,10 L11,13 L11,5 L11,5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-pdf.svg b/htdocs/theme/common/octicons/lib/svg/file-pdf.svg
deleted file mode 100644
index dcd774e9bc4..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-pdf.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-pdf</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-pdf" fill="#010101">
-            <path d="M8.5,1 L1,1 C0.44771525,1 0,1.44771525 0,2 L0,14 C0,14.5522847 0.44771525,15 1,15 L11,15 C11.5522847,15 12,14.5522847 12,14 L12,4.5 L8.5,1 Z M1,2 L5,2 C4.88021121,2.03682695 4.77292941,2.10604101 4.69,2.2 C4.57596619,2.33544491 4.49698141,2.4968486 4.46,2.67 C4.34406753,3.15093672 4.3136037,3.64851254 4.37,4.14 C4.42970074,4.74889969 4.54348307,5.35127671 4.71,5.94 C4.39913981,6.85020329 4.02832805,7.73881526 3.6,8.6 C3.1,9.6 2.8,10.26 2.69,10.44 C2.45490116,10.527838 2.22458325,10.6279762 2,10.74 C1.63797844,10.9047863 1.30126564,11.1202825 1,11.38 L1,2 L1,2 Z M5.42,6.8 C5.65615226,7.57227694 6.05511596,8.28495569 6.59,8.89 C6.8651023,9.12723152 7.18463148,9.30739159 7.53,9.42 C6.89,9.51 6.3,9.62 5.72,9.75 C5.10224214,9.89929979 4.49707287,10.0965649 3.91,10.34 C3.32292713,10.5834351 4.13,9.9 4.52,9.09 C4.8853939,8.349364 5.18973729,7.58014443 5.43,6.79 L5.43,6.79 L5.42,6.8 Z M11,14 L1.5,14 C1.44352149,14.0065306 1.38647851,14.0065306 1.33,14 C1.60061185,13.9042665 1.84896383,13.7545749 2.06,13.56 C2.76700578,12.8583965 3.36677981,12.0564515 3.84,11.18 C4.15,11.05 4.42,10.95 4.65,10.87 L5.07,10.73 C5.52,10.6 6.01,10.5 6.51,10.4 C7.01,10.3 7.51,10.24 7.99,10.2 C8.43725403,10.4162545 8.9023067,10.5935768 9.38,10.73 C9.78288787,10.8407498 10.1943157,10.9176835 10.61,10.96 L10.99,10.96 L10.99,14 L10.99,14 L11,14 Z M11,9.14 C10.7958695,9.02690387 10.5816018,8.93316173 10.36,8.86 C10.113806,8.8009088 9.86279363,8.76409365 9.61,8.75 C9.19880419,8.75303183 8.78812424,8.77974272 8.38,8.83 C8.0073597,8.68541471 7.66736947,8.46782096 7.38,8.19 C6.78281632,7.51840635 6.34221217,6.72258646 6.09,5.86 C6.20098287,5.19851127 6.26779732,4.53036675 6.29,3.86 C6.30923951,3.61037016 6.30923951,3.35962984 6.29,3.11 C6.35921678,2.80151577 6.28575056,2.47826438 6.09,2.23 C5.92718989,2.07232702 5.70638123,1.9890713 5.48,2 L8,2 L11,5 L11,9.13 L11,9.13 L11,9.14 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-submodule.svg b/htdocs/theme/common/octicons/lib/svg/file-submodule.svg
deleted file mode 100644
index aa782e68dff..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-submodule.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-submodule</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-submodule" fill="#000000">
-            <path d="M10,7 L4,7 L4,14 L13,14 C13.55,14 14,13.55 14,13 L14,8 L10,8 L10,7 L10,7 Z M9,9 L5,9 L5,8 L9,8 L9,9 L9,9 Z M13,4 L7,4 L7,3 C7,2.34 6.69,2 6,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L3,14 L3,7 C3,6.45 3.45,6 4,6 L10,6 C10.55,6 11,6.45 11,7 L14,7 L14,5 C14,4.45 13.55,4 13,4 L13,4 Z M6,4 L1,4 L1,3 L6,3 L6,4 L6,4 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-symlink-directory.svg b/htdocs/theme/common/octicons/lib/svg/file-symlink-directory.svg
deleted file mode 100644
index 5d689bec548..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-symlink-directory.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-symlink-directory</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-symlink-directory" fill="#000000">
-            <path d="M13,4 L7,4 L7,3 C7,2.34 6.69,2 6,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,5 C14,4.45 13.55,4 13,4 L13,4 Z M1,3 L6,3 L6,4 L1,4 L1,3 L1,3 Z M7,12 L7,10 C6.02,9.98 5.16,10.22 4.45,10.7 C3.74,11.18 3.26,11.95 3,13 C3.02,11.36 3.39,10.12 4.13,9.27 C4.86,8.43 5.82,8 7.01,8 L7.01,6 L11.01,9 L7.01,12 L7,12 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-symlink-file.svg b/htdocs/theme/common/octicons/lib/svg/file-symlink-file.svg
deleted file mode 100644
index 710224295de..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-symlink-file.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-symlink-file</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-symlink-file" fill="#000000">
-            <path d="M8.5,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L11,15 C11.55,15 12,14.55 12,14 L12,4.5 L8.5,1 L8.5,1 Z M11,14 L1,14 L1,2 L8,2 L11,5 L11,14 L11,14 Z M6,4.5 L10,7.5 L6,10.5 L6,8.5 C5.02,8.48 4.16,8.72 3.45,9.2 C2.74,9.68 2.26,10.45 2,11.5 C2.02,9.86 2.39,8.62 3.13,7.77 C3.86,6.93 4.82,6.5 6.01,6.5 L6.01,4.5 L6,4.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-text.svg b/htdocs/theme/common/octicons/lib/svg/file-text.svg
deleted file mode 100644
index 874cf5b9100..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-text.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg height="16" width="12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 16">
-  <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z" />
-</svg>
diff --git a/htdocs/theme/common/octicons/lib/svg/file-zip.svg b/htdocs/theme/common/octicons/lib/svg/file-zip.svg
deleted file mode 100644
index c0d0f282fb5..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file-zip.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file-zip</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file-zip" fill="#010101">
-            <path d="M8.5,1 L1,1 C0.44771525,1 0,1.44771525 0,2 L0,14 C0,14.5522847 0.44771525,15 1,15 L11,15 C11.5522847,15 12,14.5522847 12,14 L12,4.5 L8.5,1 Z M11,14 L1,14 L1,2 L4,2 L4,3 L5,3 L5,2 L8,2 L11,5 L11,14 L11,14 Z M5,4 L5,3 L6,3 L6,4 L5,4 L5,4 Z M4,4 L5,4 L5,5 L4,5 L4,4 L4,4 Z M5,6 L5,5 L6,5 L6,6 L5,6 L5,6 Z M4,6 L5,6 L5,7 L4,7 L4,6 L4,6 Z M5,8 L5,7 L6,7 L6,8 L5,8 L5,8 Z M4,9.28 C3.38491093,9.63510459 3.00428692,10.2897779 3,11 L3,12 L7,12 L7,11 C7,9.8954305 6.1045695,9 5,9 L5,8 L4,8 L4,9.28 L4,9.28 Z M6,10 L6,11 L4,11 L4,10 L6,10 L6,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file.svg b/htdocs/theme/common/octicons/lib/svg/file.svg
deleted file mode 100644
index a704f0c7118..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/file.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>file</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="file" fill="#000000">
-            <path d="M6,5 L2,5 L2,4 L6,4 L6,5 L6,5 Z M2,8 L9,8 L9,7 L2,7 L2,8 L2,8 Z M2,10 L9,10 L9,9 L2,9 L2,10 L2,10 Z M2,12 L9,12 L9,11 L2,11 L2,12 L2,12 Z M12,4.5 L12,14 C12,14.55 11.55,15 11,15 L1,15 C0.45,15 0,14.55 0,14 L0,2 C0,1.45 0.45,1 1,1 L8.5,1 L12,4.5 L12,4.5 Z M11,5 L8,2 L1,2 L1,14 L11,14 L11,5 L11,5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/flame.svg b/htdocs/theme/common/octicons/lib/svg/flame.svg
deleted file mode 100644
index a9b69abaafc..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/flame.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>flame</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="flame" fill="#000000">
-            <path d="M5.05,0.31 C5.86,2.48 5.46,3.69 4.53,4.62 C3.55,5.67 1.98,6.45 0.9,7.98 C-0.55,10.03 -0.8,14.51 4.43,15.68 C2.23,14.52 1.76,11.16 4.13,9.07 C3.52,11.1 4.66,12.4 6.07,11.93 C7.46,11.46 8.37,12.46 8.34,13.6 C8.32,14.38 8.03,15.04 7.21,15.41 C10.63,14.82 11.99,11.99 11.99,9.85 C11.99,7.01 9.46,6.63 10.74,4.24 C9.22,4.37 8.71,5.37 8.85,6.99 C8.94,8.07 7.83,8.79 6.99,8.32 C6.32,7.91 6.33,7.13 6.93,6.54 C8.18,5.31 8.68,2.45 5.05,0.32 L5.03,0.3 L5.05,0.31 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/fold.svg b/htdocs/theme/common/octicons/lib/svg/fold.svg
deleted file mode 100644
index 5446d76a46e..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/fold.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>fold</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="fold" fill="#000000">
-            <path d="M7,9 L10,12 L8,12 L8,15 L6,15 L6,12 L4,12 L7,9 L7,9 Z M10,3 L8,3 L8,0 L6,0 L6,3 L4,3 L7,6 L10,3 L10,3 Z M14,5 C14,4.45 13.55,4 13,4 L10.5,4 L9.5,5 L12.5,5 L10.5,7 L3.5,7 L1.5,5 L4.5,5 L3.5,4 L1,4 C0.45,4 0,4.45 0,5 L2.5,7.5 L0,10 C0,10.55 0.45,11 1,11 L3.5,11 L4.5,10 L1.5,10 L3.5,8 L10.5,8 L12.5,10 L9.5,10 L10.5,11 L13,11 C13.55,11 14,10.55 14,10 L11.5,7.5 L14,5 L14,5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/gear.svg b/htdocs/theme/common/octicons/lib/svg/gear.svg
deleted file mode 100644
index 2fdf75deec1..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/gear.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>gear</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="gear" fill="#000000">
-            <path d="M14,8.77 L14,7.17 L12.06,6.53 L11.61,5.44 L12.49,3.6 L11.36,2.47 L9.55,3.38 L8.46,2.93 L7.77,1.01 L6.17,1.01 L5.54,2.95 L4.43,3.4 L2.59,2.52 L1.46,3.65 L2.37,5.46 L1.92,6.55 L0,7.23 L0,8.82 L1.94,9.46 L2.39,10.55 L1.51,12.39 L2.64,13.52 L4.45,12.61 L5.54,13.06 L6.23,14.98 L7.82,14.98 L8.45,13.04 L9.56,12.59 L11.4,13.47 L12.53,12.34 L11.61,10.53 L12.08,9.44 L14,8.75 L14,8.77 Z M7,11 C5.34,11 4,9.66 4,8 C4,6.34 5.34,5 7,5 C8.66,5 10,6.34 10,8 C10,9.66 8.66,11 7,11 L7,11 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/gift.svg b/htdocs/theme/common/octicons/lib/svg/gift.svg
deleted file mode 100644
index 1cb9cff4535..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/gift.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>gift</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="gift" fill="#000000">
-            <path d="M13,4 L11.62,4 C11.81,3.67 11.95,3.33 11.98,3.09 C12.04,2.42 11.87,1.87 11.46,1.48 C11.1,1.1 10.65,1 10.1,1 L9.99,1 C9.46,1.02 8.88,1.25 8.46,1.58 C8.04,1.91 7.73,2.3 7.49,2.78 C7.26,2.3 6.94,1.9 6.52,1.58 C6.1,1.26 5.52,1 4.99,1 L4.96,1 C4.4,1 3.9,1.09 3.52,1.48 C3.11,1.87 2.94,2.42 3,3.09 C3.03,3.32 3.17,3.67 3.36,4 L1.98,4 C1.43,4 0.98,4.45 0.98,5 L0.98,8 L1.98,8 L1.98,13 C1.98,13.55 2.43,14 2.98,14 L11.98,14 C12.53,14 12.98,13.55 12.98,13 L12.98,8 L13.98,8 L13.98,5 C13.98,4.45 13.53,4 12.98,4 L13,4 Z M8.22,3.12 C8.39,2.76 8.64,2.45 8.97,2.2 C9.27,1.97 9.69,1.81 10.02,1.79 L10.11,1.79 C10.56,1.79 10.77,1.9 10.91,2.04 C11.05,2.18 11.24,2.43 11.21,2.99 C11.16,3.18 10.96,3.6 10.71,3.99 L7.81,3.99 L8.22,3.11 L8.22,3.12 Z M4.09,2.04 C4.22,1.91 4.4,1.79 5,1.79 C5.31,1.79 5.72,1.96 6.03,2.2 C6.36,2.45 6.61,2.75 6.78,3.12 L7.2,4 L4.3,4 C4.05,3.61 3.85,3.19 3.8,3 C3.77,2.44 3.96,2.19 4.1,2.05 L4.09,2.04 Z M7,12.99 L3,12.99 L3,8 L7,8 L7,13 L7,12.99 Z M7,6.99 L2,6.99 L2,5 L7,5 L7,7 L7,6.99 Z M12,12.99 L8,12.99 L8,8 L12,8 L12,13 L12,12.99 Z M13,6.99 L8,6.99 L8,5 L13,5 L13,7 L13,6.99 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/gist-secret.svg b/htdocs/theme/common/octicons/lib/svg/gist-secret.svg
deleted file mode 100644
index e427060c776..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/gist-secret.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>gist-secret</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="gist-secret" fill="#000000">
-            <path d="M8,10.5 L9,14 L5,14 L6,10.5 L5.25,9 L8.75,9 L8,10.5 L8,10.5 Z M10,6 L4,6 L2,7 L12,7 L10,6 L10,6 Z M9,2 L7,3 L5,2 L4,5 L10,5 L9,2 L9,2 Z M13.03,9.75 L10,9 L11,11 L9,14 L12.22,14 C12.67,14 13.08,13.69 13.19,13.25 L13.75,10.97 C13.89,10.44 13.56,9.89 13.03,9.75 L13.03,9.75 Z M4,9 L0.97,9.75 C0.44,9.89 0.11,10.44 0.25,10.97 L0.81,13.25 C0.92,13.69 1.33,14 1.78,14 L5,14 L3,11 L4,9 L4,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/gist.svg b/htdocs/theme/common/octicons/lib/svg/gist.svg
deleted file mode 100644
index ff79f169b27..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/gist.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>gist</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="gist" fill="#000000">
-            <path d="M7.5,5 L10,7.5 L7.5,10 L6.75,9.25 L8.5,7.5 L6.75,5.75 L7.5,5 L7.5,5 Z M4.5,5 L2,7.5 L4.5,10 L5.25,9.25 L3.5,7.5 L5.25,5.75 L4.5,5 L4.5,5 Z M0,13 L0,2 C0,1.45 0.45,1 1,1 L11,1 C11.55,1 12,1.45 12,2 L12,13 C12,13.55 11.55,14 11,14 L1,14 C0.45,14 0,13.55 0,13 L0,13 Z M1,13 L11,13 L11,2 L1,2 L1,13 L1,13 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-branch.svg b/htdocs/theme/common/octicons/lib/svg/git-branch.svg
deleted file mode 100644
index 0d2e53fd28f..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/git-branch.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>git-branch</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="git-branch" fill="#000000">
-            <path d="M10,5 C10,3.89 9.11,3 8,3 C6.89,3 6,3.89 6,5 C6,5.73 6.41,6.38 7,6.72 L7,7.02 C6.98,7.54 6.77,8 6.37,8.4 C5.97,8.8 5.51,9.01 4.99,9.03 C4.16,9.05 3.51,9.19 2.99,9.48 L2.99,4.72 C3.58,4.38 3.99,3.74 3.99,3 C3.99,1.89 3.1,1 1.99,1 C0.88,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,11.28 C0.41,11.63 0,12.27 0,13 C0,14.11 0.89,15 2,15 C3.11,15 4,14.11 4,13 C4,12.47 3.8,12 3.47,11.64 C3.56,11.58 3.95,11.23 4.06,11.17 C4.31,11.06 4.62,11 5,11 C6.05,10.95 6.95,10.55 7.75,9.75 C8.55,8.95 8.95,7.77 9,6.73 L8.98,6.73 C9.59,6.37 10,5.73 10,5 L10,5 Z M2,1.8 C2.66,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 C1.35,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 L2,1.8 Z M2,14.21 C1.34,14.21 0.8,13.66 0.8,13.01 C0.8,12.36 1.35,11.81 2,11.81 C2.65,11.81 3.2,12.36 3.2,13.01 C3.2,13.66 2.65,14.21 2,14.21 L2,14.21 Z M8,6.21 C7.34,6.21 6.8,5.66 6.8,5.01 C6.8,4.36 7.35,3.81 8,3.81 C8.65,3.81 9.2,4.36 9.2,5.01 C9.2,5.66 8.65,6.21 8,6.21 L8,6.21 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-commit.svg b/htdocs/theme/common/octicons/lib/svg/git-commit.svg
deleted file mode 100644
index 0ee7457f455..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/git-commit.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>git-commit</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="git-commit" fill="#000000">
-            <path d="M10.86,7 C10.41,5.28 8.86,4 7,4 C5.14,4 3.59,5.28 3.14,7 L0,7 L0,9 L3.14,9 C3.59,10.72 5.14,12 7,12 C8.86,12 10.41,10.72 10.86,9 L14,9 L14,7 L10.86,7 L10.86,7 Z M7,10.2 C5.78,10.2 4.8,9.22 4.8,8 C4.8,6.78 5.78,5.8 7,5.8 C8.22,5.8 9.2,6.78 9.2,8 C9.2,9.22 8.22,10.2 7,10.2 L7,10.2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-compare.svg b/htdocs/theme/common/octicons/lib/svg/git-compare.svg
deleted file mode 100644
index 6f7481f8293..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/git-compare.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>git-compare</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="git-compare" fill="#000000">
-            <path d="M5,12 L4,12 C3.73,11.98 3.52,11.89 3.31,11.69 C3.1,11.49 3.01,11.27 3,11 L3,4.72 C3.59,4.38 4,3.74 4,3 C4,1.89 3.11,1 2,1 C0.89,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,11 C1.03,11.78 1.34,12.47 1.94,13.06 C2.54,13.65 3.22,13.97 4,14 L5,14 L5,16 L8,13 L5,10 L5,12 L5,12 Z M2,1.8 C2.66,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 C1.35,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 L2,1.8 Z M13,11.28 L13,5 C12.97,4.22 12.66,3.53 12.06,2.94 C11.46,2.35 10.78,2.03 10,2 L9,2 L9,0 L6,3 L9,6 L9,4 L10,4 C10.27,4.02 10.48,4.11 10.69,4.31 C10.9,4.51 10.99,4.73 11,5 L11,11.28 C10.41,11.62 10,12.26 10,13 C10,14.11 10.89,15 12,15 C13.11,15 14,14.11 14,13 C14,12.27 13.59,11.62 13,11.28 L13,11.28 Z M12,14.2 C11.34,14.2 10.8,13.65 10.8,13 C10.8,12.35 11.35,11.8 12,11.8 C12.65,11.8 13.2,12.35 13.2,13 C13.2,13.65 12.65,14.2 12,14.2 L12,14.2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-merge.svg b/htdocs/theme/common/octicons/lib/svg/git-merge.svg
deleted file mode 100644
index d0f41029b10..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/git-merge.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>git-merge</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="git-merge" fill="#000000">
-            <path d="M10,7 C9.27,7 8.62,7.41 8.27,8.02 L8.27,8 C7.22,7.98 6,7.64 5.14,6.98 C4.39,6.4 3.64,5.37 3.25,4.54 C3.7,4.18 4,3.62 4,2.99 C4,1.88 3.11,0.99 2,0.99 C0.89,0.99 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,11.28 C0.41,11.63 0,12.27 0,13 C0,14.11 0.89,15 2,15 C3.11,15 4,14.11 4,13 C4,12.27 3.59,11.62 3,11.28 L3,7.67 C3.67,8.37 4.44,8.94 5.3,9.36 C6.16,9.78 7.33,9.99 8.27,10 L8.27,9.98 C8.63,10.59 9.27,11 10,11 C11.11,11 12,10.11 12,9 C12,7.89 11.11,7 10,7 L10,7 Z M3.2,13 C3.2,13.66 2.65,14.2 2,14.2 C1.35,14.2 0.8,13.65 0.8,13 C0.8,12.35 1.35,11.8 2,11.8 C2.65,11.8 3.2,12.35 3.2,13 L3.2,13 Z M2,4.2 C1.34,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 C2.65,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 L2,4.2 Z M10,10.2 C9.34,10.2 8.8,9.65 8.8,9 C8.8,8.35 9.35,7.8 10,7.8 C10.65,7.8 11.2,8.35 11.2,9 C11.2,9.65 10.65,10.2 10,10.2 L10,10.2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-pull-request.svg b/htdocs/theme/common/octicons/lib/svg/git-pull-request.svg
deleted file mode 100644
index 492dda2ff46..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/git-pull-request.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>git-pull-request</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="git-pull-request" fill="#000000">
-            <path d="M11,11.28 L11,5 C10.97,4.22 10.66,3.53 10.06,2.94 C9.46,2.35 8.78,2.03 8,2 L7,2 L7,0 L4,3 L7,6 L7,4 L8,4 C8.27,4.02 8.48,4.11 8.69,4.31 C8.9,4.51 8.99,4.73 9,5 L9,11.28 C8.41,11.62 8,12.26 8,13 C8,14.11 8.89,15 10,15 C11.11,15 12,14.11 12,13 C12,12.27 11.59,11.62 11,11.28 L11,11.28 Z M10,14.2 C9.34,14.2 8.8,13.65 8.8,13 C8.8,12.35 9.35,11.8 10,11.8 C10.65,11.8 11.2,12.35 11.2,13 C11.2,13.65 10.65,14.2 10,14.2 L10,14.2 Z M4,3 C4,1.89 3.11,1 2,1 C0.89,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,11.28 C0.41,11.62 0,12.26 0,13 C0,14.11 0.89,15 2,15 C3.11,15 4,14.11 4,13 C4,12.27 3.59,11.62 3,11.28 L3,4.72 C3.59,4.38 4,3.74 4,3 L4,3 Z M3.2,13 C3.2,13.66 2.65,14.2 2,14.2 C1.35,14.2 0.8,13.65 0.8,13 C0.8,12.35 1.35,11.8 2,11.8 C2.65,11.8 3.2,12.35 3.2,13 L3.2,13 Z M2,4.2 C1.34,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 C2.65,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 L2,4.2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/globe.svg b/htdocs/theme/common/octicons/lib/svg/globe.svg
deleted file mode 100644
index 8e9d0196ff2..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/globe.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>globe</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="globe" fill="#000000">
-            <path d="M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C7.48,15 7.94,14.95 8.38,14.86 C8.21,14.78 8.18,14.13 8.36,13.77 C8.55,13.36 9.17,12.32 8.56,11.97 C7.95,11.62 8.12,11.47 7.75,11.06 C7.38,10.65 7.53,10.59 7.5,10.48 C7.42,10.14 7.86,9.59 7.89,9.54 C7.91,9.48 7.91,9.27 7.89,9.21 C7.89,9.13 7.62,8.99 7.55,8.98 C7.49,8.98 7.44,9.09 7.35,9.11 C7.26,9.13 6.85,8.86 6.76,8.78 C6.67,8.7 6.62,8.55 6.49,8.44 C6.36,8.31 6.35,8.41 6.16,8.33 C5.97,8.25 5.36,8.02 4.88,7.85 C4.4,7.66 4.36,7.38 4.36,7.19 C4.34,6.99 4.06,6.72 3.94,6.52 C3.8,6.32 3.78,6.05 3.74,6.11 C3.7,6.17 3.99,6.89 3.94,6.92 C3.89,6.94 3.78,6.72 3.64,6.54 C3.5,6.35 3.78,6.45 3.34,5.59 C2.9,4.73 3.48,4.29 3.51,3.84 C3.54,3.39 3.89,4.01 3.7,3.71 C3.51,3.41 3.7,2.82 3.56,2.6 C3.43,2.38 2.68,2.85 2.68,2.85 C2.7,2.63 3.37,2.27 3.84,1.93 C4.31,1.59 4.62,1.87 5,1.98 C5.39,2.11 5.41,2.07 5.28,1.93 C5.15,1.8 5.34,1.76 5.64,1.8 C5.92,1.85 6.02,2.21 6.47,2.16 C6.94,2.13 6.52,2.25 6.58,2.38 C6.64,2.51 6.52,2.49 6.2,2.68 C5.9,2.88 6.22,2.9 6.75,3.29 C7.28,3.68 7.13,3.04 7.06,2.74 C6.99,2.44 7.45,2.68 7.45,2.68 C7.78,2.9 7.72,2.7 7.95,2.76 C8.18,2.82 8.86,3.4 8.86,3.4 C8.03,3.84 8.55,3.88 8.69,3.99 C8.83,4.1 8.41,4.29 8.41,4.29 C8.24,4.12 8.22,4.31 8.11,4.37 C8,4.43 8.09,4.59 8.09,4.59 C7.53,4.68 7.65,5.28 7.67,5.42 C7.67,5.56 7.29,5.78 7.2,6 C7.11,6.2 7.45,6.64 7.26,6.66 C7.07,6.69 6.92,6 5.95,6.25 C5.65,6.33 5.01,6.66 5.36,7.33 C5.72,8.02 6.28,7.14 6.47,7.24 C6.66,7.34 6.41,7.77 6.45,7.79 C6.49,7.81 6.98,7.81 7.01,8.4 C7.04,8.99 7.78,8.93 7.93,8.95 C8.1,8.95 8.63,8.51 8.7,8.5 C8.76,8.47 9.08,8.22 9.73,8.59 C10.39,8.95 10.71,8.9 10.93,9.06 C11.15,9.22 11.01,9.53 11.21,9.64 C11.41,9.75 12.27,9.61 12.49,9.95 C12.71,10.29 11.61,12.04 11.27,12.23 C10.93,12.42 10.79,12.87 10.43,13.15 C10.07,13.43 9.62,13.79 9.16,14.06 C8.75,14.29 8.69,14.72 8.5,14.86 C11.64,14.16 13.98,11.36 13.98,8.02 C13.98,4.16 10.84,1.02 6.98,1.02 L7,1 Z M8.64,7.56 C8.55,7.59 8.36,7.78 7.86,7.48 C7.38,7.18 7.05,7.25 7,7.2 C7,7.2 6.95,7.09 7.17,7.06 C7.61,7.01 8.15,7.47 8.28,7.47 C8.41,7.47 8.47,7.34 8.69,7.42 C8.91,7.5 8.74,7.55 8.64,7.56 L8.64,7.56 Z M6.34,1.7 C6.29,1.67 6.37,1.62 6.43,1.56 C6.46,1.53 6.45,1.45 6.48,1.42 C6.59,1.31 7.09,1.17 7,1.45 C6.89,1.72 6.42,1.75 6.34,1.7 L6.34,1.7 Z M7.57,2.59 C7.38,2.57 6.99,2.54 7.05,2.45 C7.35,2.17 6.96,2.07 6.71,2.07 C6.46,2.05 6.37,1.91 6.49,1.88 C6.61,1.85 7.1,1.9 7.19,1.96 C7.27,2.02 7.71,2.21 7.74,2.34 C7.76,2.47 7.74,2.59 7.57,2.59 L7.57,2.59 Z M9.04,2.54 C8.9,2.63 8.21,2.13 8.09,2.02 C7.53,1.54 7.2,1.71 7.09,1.61 C6.98,1.51 7.01,1.42 7.2,1.27 C7.39,1.12 7.89,1.33 8.2,1.36 C8.5,1.39 8.86,1.63 8.86,1.91 C8.88,2.16 9.19,2.41 9.05,2.54 L9.04,2.54 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/grabber.svg b/htdocs/theme/common/octicons/lib/svg/grabber.svg
deleted file mode 100644
index cd3b15112ca..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/grabber.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>grabber</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="grabber" fill="#000000">
-            <path d="M8,4 L8,5 L0,5 L0,4 L8,4 L8,4 Z M0,8 L8,8 L8,7 L0,7 L0,8 L0,8 Z M0,11 L8,11 L8,10 L0,10 L0,11 L0,11 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/graph.svg b/htdocs/theme/common/octicons/lib/svg/graph.svg
deleted file mode 100644
index f72a1875263..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/graph.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>graph</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="graph" fill="#000000">
-            <path d="M16,14 L16,15 L0,15 L0,0 L1,0 L1,14 L16,14 L16,14 Z M5,13 L3,13 L3,8 L5,8 L5,13 L5,13 Z M9,13 L7,13 L7,3 L9,3 L9,13 L9,13 Z M13,13 L11,13 L11,6 L13,6 L13,13 L13,13 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/heart.svg b/htdocs/theme/common/octicons/lib/svg/heart.svg
deleted file mode 100644
index 688a14d9a5e..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/heart.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>heart</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="heart" fill="#000000">
-            <path d="M11.2,3 C10.68,2.37 9.95,2.05 9,2 C8.03,2 7.31,2.42 6.8,3 C6.29,3.58 6.02,3.92 6,4 C5.98,3.92 5.72,3.58 5.2,3 C4.68,2.42 4.03,2 3,2 C2.05,2.05 1.31,2.38 0.8,3 C0.28,3.61 0.02,4.28 0,5 C0,5.52 0.09,6.52 0.67,7.67 C1.25,8.82 3.01,10.61 6,13 C8.98,10.61 10.77,8.83 11.34,7.67 C11.91,6.51 12,5.5 12,5 C11.98,4.28 11.72,3.61 11.2,2.98 L11.2,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/history.svg b/htdocs/theme/common/octicons/lib/svg/history.svg
deleted file mode 100644
index 77010ba5c6c..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/history.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>history</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="history" fill="#000000">
-            <path d="M8,13 L6,13 L6,6 L11,6 L11,8 L8,8 L8,13 L8,13 Z M7,1 C4.81,1 2.87,2.02 1.59,3.59 L0,2 L0,6 L4,6 L2.5,4.5 C3.55,3.17 5.17,2.3 7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,11.14 10.14,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,7.66 1.33,7.33 1.39,7 L0.08,7 C0.03,7.33 0,7.66 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/home.svg b/htdocs/theme/common/octicons/lib/svg/home.svg
deleted file mode 100644
index d2862e50f48..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/home.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>home</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="home" fill="#000000">
-            <path d="M16,9 L13,6 L13,2 L11,2 L11,4 L8,1 L0,9 L2,9 L3,14 C3,14.55 3.45,15 4,15 L12,15 C12.55,15 13,14.55 13,14 L14,9 L16,9 L16,9 Z M12,14 L9,14 L9,10 L7,10 L7,14 L4,14 L2.81,7.69 L8,2.5 L13.19,7.69 L12,14 L12,14 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/horizontal-rule.svg b/htdocs/theme/common/octicons/lib/svg/horizontal-rule.svg
deleted file mode 100644
index cf444e7b3d2..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/horizontal-rule.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>horizontal-rule</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="horizontal-rule" fill="#000000">
-            <path d="M1,7 L3,7 L3,9 L4,9 L4,3 L3,3 L3,6 L1,6 L1,3 L0,3 L0,9 L1,9 L1,7 L1,7 Z M10,9 L10,7 L9,7 L9,9 L10,9 L10,9 Z M10,6 L10,4 L9,4 L9,6 L10,6 L10,6 Z M7,6 L7,4 L9,4 L9,3 L6,3 L6,9 L7,9 L7,7 L9,7 L9,6 L7,6 L7,6 Z M0,13 L10,13 L10,11 L0,11 L0,13 L0,13 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/hubot.svg b/htdocs/theme/common/octicons/lib/svg/hubot.svg
deleted file mode 100644
index d2fb9ad052b..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/hubot.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>hubot</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hubot" fill="#000000">
-            <path d="M3,6 C2.45,6 2,6.45 2,7 L2,9 C2,9.55 2.45,10 3,10 L11,10 C11.55,10 12,9.55 12,9 L12,7 C12,6.45 11.55,6 11,6 L3,6 L3,6 Z M11,7.75 L9.75,9 L8.25,9 L7,7.75 L5.75,9 L4.25,9 L3,7.75 L3,7 L3.75,7 L5,8.25 L6.25,7 L7.75,7 L9,8.25 L10.25,7 L11,7 L11,7.75 L11,7.75 Z M5,11 L9,11 L9,12 L5,12 L5,11 L5,11 Z M7,2 C3.14,2 0,4.91 0,8.5 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,8.5 C14,4.91 10.86,2 7,2 L7,2 Z M13,13 L1,13 L1,8.5 C1,5.41 3.64,2.91 7,2.91 C10.36,2.91 13,5.41 13,8.5 L13,13 L13,13 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/inbox.svg b/htdocs/theme/common/octicons/lib/svg/inbox.svg
deleted file mode 100644
index 1b288f2570f..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/inbox.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>inbox</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="inbox" fill="#000000">
-            <path d="M14,9 L12.87,1.86 C12.79,1.38 12.37,1 11.87,1 L2.13,1 C1.63,1 1.21,1.38 1.13,1.86 L0,9 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,9 L14,9 Z M10.72,9.55 L10.28,10.44 C10.11,10.78 9.76,11 9.37,11 L4.61,11 C4.23,11 3.89,10.78 3.72,10.45 L3.28,9.54 C3.11,9.21 2.76,8.99 2.39,8.99 L1,8.99 L2,1.99 L12,1.99 L13,8.99 L11.62,8.99 C11.23,8.99 10.89,9.21 10.71,9.54 L10.72,9.55 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/info.svg b/htdocs/theme/common/octicons/lib/svg/info.svg
deleted file mode 100644
index 7c6de3ebd66..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/info.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>info</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="info" fill="#000000">
-            <path d="M6.3,5.69 C6.11,5.5 6.02,5.27 6.02,4.99 C6.02,4.71 6.11,4.47 6.3,4.29 C6.49,4.11 6.72,4.01 7,4.01 C7.28,4.01 7.52,4.1 7.7,4.29 C7.88,4.48 7.98,4.71 7.98,4.99 C7.98,5.27 7.89,5.51 7.7,5.69 C7.51,5.87 7.28,5.99 7,5.99 C6.72,5.99 6.48,5.88 6.3,5.69 L6.3,5.69 Z M8,7.99 C7.98,7.74 7.89,7.51 7.69,7.3 C7.49,7.11 7.27,7 7,6.99 L6,6.99 C5.73,7.01 5.52,7.12 5.31,7.3 C5.11,7.5 5.01,7.74 5,7.99 L6,7.99 L6,10.99 C6.02,11.26 6.11,11.49 6.31,11.68 C6.51,11.88 6.73,11.99 7,11.99 L8,11.99 C8.27,11.99 8.48,11.88 8.69,11.68 C8.89,11.49 8.99,11.26 9,10.99 L8,10.99 L8,7.98 L8,7.99 Z M7,2.3 C3.86,2.3 1.3,4.84 1.3,7.98 C1.3,11.12 3.86,13.68 7,13.68 C10.14,13.68 12.7,11.13 12.7,7.98 C12.7,4.83 10.14,2.29 7,2.29 L7,2.3 Z M7,0.98 C10.86,0.98 14,4.12 14,7.98 C14,11.84 10.86,14.98 7,14.98 C3.14,14.98 0,11.86 0,7.98 C0,4.1 3.14,0.98 7,0.98 L7,0.98 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/issue-closed.svg b/htdocs/theme/common/octicons/lib/svg/issue-closed.svg
deleted file mode 100644
index f06480bb847..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/issue-closed.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>issue-closed</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="issue-closed" fill="#000000">
-            <path d="M7,10 L9,10 L9,12 L7,12 L7,10 L7,10 Z M9,4 L7,4 L7,9 L9,9 L9,4 L9,4 Z M10.5,5.5 L9.5,6.5 L12,9 L16,4.5 L15,3.5 L12,7 L10.5,5.5 L10.5,5.5 Z M8,13.7 C4.86,13.7 2.3,11.14 2.3,8 C2.3,4.86 4.86,2.3 8,2.3 C9.83,2.3 11.45,3.18 12.5,4.5 L13.42,3.58 C12.14,2 10.19,1 8,1 C4.14,1 1,4.14 1,8 C1,11.86 4.14,15 8,15 C11.86,15 15,11.86 15,8 L13.48,9.52 C12.82,11.93 10.62,13.71 8,13.71 L8,13.7 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/issue-opened.svg b/htdocs/theme/common/octicons/lib/svg/issue-opened.svg
deleted file mode 100644
index d8ba7c46c35..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/issue-opened.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>issue-opened</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="issue-opened" fill="#000000">
-            <path d="M7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,11.14 10.14,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,4.86 3.86,2.3 7,2.3 L7,2.3 Z M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z M8,4 L6,4 L6,9 L8,9 L8,4 L8,4 Z M8,10 L6,10 L6,12 L8,12 L8,10 L8,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/issue-reopened.svg b/htdocs/theme/common/octicons/lib/svg/issue-reopened.svg
deleted file mode 100644
index 1d5eab6bdba..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/issue-reopened.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>issue-reopened</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="issue-reopened" fill="#000000">
-            <path d="M8,9 L6,9 L6,4 L8,4 L8,9 L8,9 Z M6,12 L8,12 L8,10 L6,10 L6,12 L6,12 Z M12.33,10 L10,10 L11.5,11.5 C10.45,12.83 8.83,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,7.66 1.33,7.33 1.39,7 L0.08,7 C0.03,7.33 0,7.66 0,8 C0,11.86 3.14,15 7,15 C9.19,15 11.13,13.98 12.41,12.41 L14,14 L14,10 L12.33,10 L12.33,10 Z M1.67,6 L4,6 L2.5,4.5 C3.55,3.17 5.17,2.3 7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,8.34 12.67,8.67 12.61,9 L13.92,9 C13.97,8.67 14,8.34 14,8 C14,4.14 10.86,1 7,1 C4.81,1 2.87,2.02 1.59,3.59 L0,2 L0,6 L1.67,6 L1.67,6 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/italic.svg b/htdocs/theme/common/octicons/lib/svg/italic.svg
deleted file mode 100644
index d488293cbe0..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/italic.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>italic</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="italic" fill="#000000">
-            <path d="M2.81,5 L4.79,5 L3,14 L1,14 L2.81,5 L2.81,5 Z M3.17,2.3 C3.17,1.6 3.75,1 4.5,1 C5.06,1 5.63,1.38 5.63,2.03 C5.63,2.78 5.04,3.33 4.3,3.33 C3.72,3.33 3.17,2.95 3.17,2.3 L3.17,2.3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/jersey.svg b/htdocs/theme/common/octicons/lib/svg/jersey.svg
deleted file mode 100644
index 56e85ee4cd8..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/jersey.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>jersey</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="jersey" fill="#000000">
-            <path d="M4.5,6 L4,6.5 L4,11.5 L4.5,12 L6.5,12 L7,11.5 L7,6.5 L6.5,6 L4.5,6 L4.5,6 Z M6,11 L5,11 L5,7 L6,7 L6,11 L6,11 Z M12.27,3.75 C12.05,2.37 11.96,1.12 12,0 L9.02,0 C9.02,0.27 8.89,0.48 8.63,0.69 C8.38,0.89 8,0.99 7.5,0.99 C7,0.99 6.62,0.9 6.37,0.69 C6.14,0.49 6.01,0.27 6.01,0 L3,0 C3.05,1.13 2.97,2.38 2.75,3.75 C2.55,5.13 1.95,5.88 1,6 L1,15 C1.02,15.27 1.11,15.48 1.31,15.69 C1.51,15.9 1.73,15.99 2,16 L13,16 C13.27,15.98 13.48,15.89 13.69,15.69 C13.9,15.49 13.99,15.27 14,15 L14,6 C13.05,5.87 12.47,5.12 12.25,3.75 L12.27,3.75 Z M13,15 L2,15 L2,7 C2.89,6.5 3.48,5.75 3.72,4.75 C3.96,3.75 4.03,2.5 4,1 L5,1 C4.98,1.78 5.16,2.47 5.52,3.06 C5.88,3.64 6.54,3.95 7.52,4 C8.5,3.98 9.16,3.67 9.52,3.06 C9.88,2.47 10.02,1.78 10,1 L11,1 C11.02,2.42 11.13,3.55 11.33,4.38 C11.53,5.19 12.02,6.38 13,7.01 L13,15.01 L13,15 Z M8.5,6 L8,6.5 L8,11.5 L8.5,12 L10.5,12 L11,11.5 L11,6.5 L10.5,6 L8.5,6 L8.5,6 Z M10,11 L9,11 L9,7 L10,7 L10,11 L10,11 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/key.svg b/htdocs/theme/common/octicons/lib/svg/key.svg
deleted file mode 100644
index bc3b52382af..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/key.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>key</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="key" fill="#000000">
-            <path d="M12.83,2.17 C12.08,1.42 11.14,1.03 10,1 C8.87,1.03 7.92,1.42 7.17,2.17 C6.42,2.92 6.04,3.86 6.01,5 C6.01,5.3 6.04,5.59 6.1,5.89 L0,12 L0,13 L1,14 L3,14 L4,13 L4,12 L5,12 L5,11 L6,11 L6,10 L8,10 L9.09,8.89 C9.39,8.97 9.68,9 10,9 C11.14,8.97 12.08,8.58 12.83,7.83 C13.58,7.08 13.97,6.14 14,5 C13.97,3.86 13.58,2.92 12.83,2.17 L12.83,2.17 Z M11,5.38 C10.23,5.38 9.62,4.77 9.62,4 C9.62,3.23 10.23,2.62 11,2.62 C11.77,2.62 12.38,3.23 12.38,4 C12.38,4.77 11.77,5.38 11,5.38 L11,5.38 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/keyboard.svg b/htdocs/theme/common/octicons/lib/svg/keyboard.svg
deleted file mode 100644
index 77aa0f5fe04..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/keyboard.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>keyboard</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="keyboard" fill="#000000">
-            <path d="M10,5 L9,5 L9,4 L10,4 L10,5 L10,5 Z M3,6 L2,6 L2,7 L3,7 L3,6 L3,6 Z M8,4 L7,4 L7,5 L8,5 L8,4 L8,4 Z M4,4 L2,4 L2,5 L4,5 L4,4 L4,4 Z M12,11 L14,11 L14,10 L12,10 L12,11 L12,11 Z M8,7 L9,7 L9,6 L8,6 L8,7 L8,7 Z M4,10 L2,10 L2,11 L4,11 L4,10 L4,10 Z M12,4 L11,4 L11,5 L12,5 L12,4 L12,4 Z M14,4 L13,4 L13,5 L14,5 L14,4 L14,4 Z M12,9 L14,9 L14,6 L12,6 L12,9 L12,9 Z M16,3 L16,12 C16,12.55 15.55,13 15,13 L1,13 C0.45,13 0,12.55 0,12 L0,3 C0,2.45 0.45,2 1,2 L15,2 C15.55,2 16,2.45 16,3 L16,3 Z M15,3 L1,3 L1,12 L15,12 L15,3 L15,3 Z M6,7 L7,7 L7,6 L6,6 L6,7 L6,7 Z M6,4 L5,4 L5,5 L6,5 L6,4 L6,4 Z M4,7 L5,7 L5,6 L4,6 L4,7 L4,7 Z M5,11 L11,11 L11,10 L5,10 L5,11 L5,11 Z M10,7 L11,7 L11,6 L10,6 L10,7 L10,7 Z M3,8 L2,8 L2,9 L3,9 L3,8 L3,8 Z M8,8 L8,9 L9,9 L9,8 L8,8 L8,8 Z M6,8 L6,9 L7,9 L7,8 L6,8 L6,8 Z M5,8 L4,8 L4,9 L5,9 L5,8 L5,8 Z M10,9 L11,9 L11,8 L10,8 L10,9 L10,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/law.svg b/htdocs/theme/common/octicons/lib/svg/law.svg
deleted file mode 100644
index 0b144363d9a..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/law.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>law</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="law" fill="#000000">
-            <path d="M7,4 C6.17,4 5.5,3.33 5.5,2.5 C5.5,1.67 6.17,1 7,1 C7.83,1 8.5,1.67 8.5,2.5 C8.5,3.33 7.83,4 7,4 L7,4 Z M14,10 C14,11.11 13.11,12 12,12 L11,12 C9.89,12 9,11.11 9,10 L11,6 L10,6 C9.45,6 9,5.55 9,5 L8,5 L8,13 C8.42,13 9,13.45 9,14 L10,14 C10.42,14 11,14.45 11,15 L3,15 C3,14.45 3.58,14 4,14 L5,14 C5,13.45 5.58,13 6,13 L6.03,13 L6,5 L5,5 C5,5.55 4.55,6 4,6 L3,6 L5,10 C5,11.11 4.11,12 3,12 L2,12 C0.89,12 0,11.11 0,10 L2,6 L1,6 L1,5 L4,5 C4,4.45 4.45,4 5,4 L9,4 C9.55,4 10,4.45 10,5 L13,5 L13,6 L12,6 L14,10 L14,10 Z M2.5,7 L1,10 L4,10 L2.5,7 L2.5,7 Z M13,10 L11.5,7 L10,10 L13,10 L13,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/light-bulb.svg b/htdocs/theme/common/octicons/lib/svg/light-bulb.svg
deleted file mode 100644
index 364cb691527..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/light-bulb.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>light-bulb</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="light-bulb" fill="#000000">
-            <path d="M6.5,0 C3.48,0 1,2.19 1,5 C1,5.92 1.55,7.25 2,8 C3.34,10.25 3.78,10.78 4,12 L4,13 L9,13 L9,12 C9.22,10.78 9.66,10.25 11,8 C11.45,7.25 12,5.92 12,5 C12,2.19 9.52,0 6.5,0 L6.5,0 Z M10.14,7.48 C9.89,7.92 9.67,8.28 9.47,8.59 C8.61,10 8.22,10.65 8.02,11.82 C8,11.87 8,11.93 8,11.99 L5,11.99 C5,11.93 5,11.86 4.98,11.82 C4.78,10.65 4.39,9.99 3.53,8.59 C3.33,8.28 3.11,7.92 2.86,7.48 C2.44,6.78 2,5.65 2,5 C2,2.8 4.02,1 6.5,1 C7.72,1 8.86,1.42 9.72,2.19 C10.55,2.94 11,3.94 11,5 C11,5.66 10.56,6.78 10.14,7.48 L10.14,7.48 Z M4,14 L9,14 C8.77,15.14 7.7,16 6.5,16 C5.3,16 4.23,15.14 4,14 L4,14 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/link-external.svg b/htdocs/theme/common/octicons/lib/svg/link-external.svg
deleted file mode 100644
index e4d0aecb71a..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/link-external.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>link-external</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="link-external" fill="#000000">
-            <path d="M11,10 L12,10 L12,13 C12,13.55 11.55,14 11,14 L1,14 C0.45,14 0,13.55 0,13 L0,3 C0,2.45 0.45,2 1,2 L4,2 L4,3 L1,3 L1,13 L11,13 L11,10 L11,10 Z M6,2 L8.25,4.25 L5,7.5 L6.5,9 L9.75,5.75 L12,8 L12,2 L6,2 L6,2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/link.svg b/htdocs/theme/common/octicons/lib/svg/link.svg
deleted file mode 100644
index b28cf283854..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/link.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>link</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="link" fill="#000000">
-            <path d="M4,9 L5,9 L5,10 L4,10 C2.5,10 1,8.31 1,6.5 C1,4.69 2.55,3 4,3 L8,3 C9.45,3 11,4.69 11,6.5 C11,7.91 10.09,9.22 9,9.75 L9,8.59 C9.58,8.14 10,7.32 10,6.5 C10,5.22 8.98,4 8,4 L4,4 C3.02,4 2,5.22 2,6.5 C2,7.78 3,9 4,9 L4,9 Z M13,6 L12,6 L12,7 L13,7 C14,7 15,8.22 15,9.5 C15,10.78 13.98,12 13,12 L9,12 C8.02,12 7,10.78 7,9.5 C7,8.67 7.42,7.86 8,7.41 L8,6.25 C6.91,6.78 6,8.09 6,9.5 C6,11.31 7.55,13 9,13 L13,13 C14.45,13 16,11.31 16,9.5 C16,7.69 14.5,6 13,6 L13,6 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/list-ordered.svg b/htdocs/theme/common/octicons/lib/svg/list-ordered.svg
deleted file mode 100644
index 16f458cbfe6..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/list-ordered.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>list-ordered</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="list-ordered" fill="#000000">
-            <path d="M12,13 C12,13.59 12,14 11.41,14 L4.59,14 C4,14 4,13.59 4,13 C4,12.41 4,12 4.59,12 L11.4,12 C11.99,12 11.99,12.41 11.99,13 L12,13 Z M4.59,4 L11.4,4 C11.99,4 11.99,3.59 11.99,3 C11.99,2.41 11.99,2 11.4,2 L4.59,2 C4,2 4,2.41 4,3 C4,3.59 4,4 4.59,4 L4.59,4 Z M11.4,7 L4.59,7 C4,7 4,7.41 4,8 C4,8.59 4,9 4.59,9 L11.4,9 C11.99,9 11.99,8.59 11.99,8 C11.99,7.41 11.99,7 11.4,7 L11.4,7 Z M2,1 L1.28,1 C0.98,1.19 0.7,1.25 0.25,1.34 L0.25,2 L1,2 L1,4.14 L0.16,4.14 L0.16,5 L3,5 L3,4.14 L2,4.14 L2,1 L2,1 Z M2.25,9.13 C2.08,9.13 1.8,9.16 1.59,9.19 C2.12,8.63 2.73,7.94 2.73,7.3 C2.71,6.52 2.17,6 1.37,6 C0.78,6 0.4,6.2 -0.01,6.64 L0.57,7.22 C0.76,7.03 0.95,6.84 1.21,6.84 C1.49,6.84 1.69,7 1.69,7.36 C1.69,7.89 0.92,8.56 -0.01,9.42 L-0.01,10 L2.99,10 L2.9,9.12 L2.24,9.12 L2.25,9.13 Z M2.17,12.91 L2.17,12.88 C2.61,12.69 2.81,12.41 2.81,12.02 C2.81,11.32 2.25,10.91 1.37,10.91 C0.89,10.91 0.48,11.1 0.09,11.43 L0.64,12.07 C0.89,11.87 1.08,11.76 1.33,11.76 C1.6,11.76 1.75,11.89 1.75,12.12 C1.75,12.39 1.55,12.56 0.89,12.56 L0.89,13.31 C1.72,13.31 1.87,13.48 1.87,13.78 C1.87,14.03 1.64,14.16 1.29,14.16 C1.01,14.16 0.73,14.02 0.48,13.78 L-2.22044605e-16,14.44 C0.3,14.8 0.77,15 1.41,15 C2.24,15 2.94,14.59 2.94,13.84 C2.94,13.34 2.63,13.03 2.17,12.9 L2.17,12.91 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/list-unordered.svg b/htdocs/theme/common/octicons/lib/svg/list-unordered.svg
deleted file mode 100644
index e0fce86f0b1..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/list-unordered.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>list-unordered</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="list-unordered" fill="#000000">
-            <path d="M2,13 C2,13.59 2,14 1.41,14 L0.59,14 C0,14 0,13.59 0,13 C0,12.41 0,12 0.59,12 L1.4,12 C1.99,12 1.99,12.41 1.99,13 L2,13 Z M4.59,4 L11.4,4 C11.99,4 11.99,3.59 11.99,3 C11.99,2.41 11.99,2 11.4,2 L4.59,2 C4,2 4,2.41 4,3 C4,3.59 4,4 4.59,4 L4.59,4 Z M1.41,7 L0.59,7 C0,7 0,7.41 0,8 C0,8.59 0,9 0.59,9 L1.4,9 C1.99,9 1.99,8.59 1.99,8 C1.99,7.41 1.99,7 1.4,7 L1.41,7 Z M1.41,2 L0.59,2 C0,2 0,2.41 0,3 C0,3.59 0,4 0.59,4 L1.4,4 C1.99,4 1.99,3.59 1.99,3 C1.99,2.41 1.99,2 1.4,2 L1.41,2 Z M11.41,7 L4.59,7 C4,7 4,7.41 4,8 C4,8.59 4,9 4.59,9 L11.4,9 C11.99,9 11.99,8.59 11.99,8 C11.99,7.41 11.99,7 11.4,7 L11.41,7 Z M11.41,12 L4.59,12 C4,12 4,12.41 4,13 C4,13.59 4,14 4.59,14 L11.4,14 C11.99,14 11.99,13.59 11.99,13 C11.99,12.41 11.99,12 11.4,12 L11.41,12 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/location.svg b/htdocs/theme/common/octicons/lib/svg/location.svg
deleted file mode 100644
index 2bb33c679b6..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/location.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>location</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="location" fill="#000000">
-            <path d="M6,0 C2.69,0 0,2.5 0,5.5 C0,10.02 6,16 6,16 C6,16 12,10.02 12,5.5 C12,2.5 9.31,0 6,0 L6,0 Z M6,14.55 C4.14,12.52 1,8.44 1,5.5 C1,3.02 3.25,1 6,1 C7.34,1 8.61,1.48 9.56,2.36 C10.48,3.22 11,4.33 11,5.5 C11,8.44 7.86,12.52 6,14.55 L6,14.55 Z M8,5.5 C8,6.61 7.11,7.5 6,7.5 C4.89,7.5 4,6.61 4,5.5 C4,4.39 4.89,3.5 6,3.5 C7.11,3.5 8,4.39 8,5.5 L8,5.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/lock.svg b/htdocs/theme/common/octicons/lib/svg/lock.svg
deleted file mode 100644
index 3e81d98ee0d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/lock.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>lock</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="lock" fill="#000000">
-            <path d="M4,13 L3,13 L3,12 L4,12 L4,13 L4,13 Z M12,7 L12,14 C12,14.55 11.55,15 11,15 L1,15 C0.45,15 0,14.55 0,14 L0,7 C0,6.45 0.45,6 1,6 L2,6 L2,4 C2,1.8 3.8,0 6,0 C8.2,0 10,1.8 10,4 L10,6 L11,6 C11.55,6 12,6.45 12,7 L12,7 Z M3.8,6 L8.21,6 L8.21,4 C8.21,2.78 7.23,1.8 6.01,1.8 C4.79,1.8 3.81,2.78 3.81,4 L3.81,6 L3.8,6 Z M11,7 L2,7 L2,14 L11,14 L11,7 L11,7 Z M4,8 L3,8 L3,9 L4,9 L4,8 L4,8 Z M4,10 L3,10 L3,11 L4,11 L4,10 L4,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/logo-gist.svg b/htdocs/theme/common/octicons/lib/svg/logo-gist.svg
deleted file mode 100644
index c95f58fc0cc..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/logo-gist.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="25px" height="16px" viewBox="0 0 25 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>logo-gist</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo-gist" fill="#000000">
-            <path d="M4.7,8.73 L7.15,8.73 L7.15,12.75 C6.6,13.02 5.51,13.09 4.62,13.09 C2.06,13.09 1.15,10.89 1.15,8.04 C1.15,5.19 2.06,2.98 4.63,2.98 C5.91,2.98 6.69,3.21 7.91,3.71 L7.91,2.66 C7.27,2.33 6.25,2 4.63,2 C1.13,2 0,4.69 0,8.03 C0,11.37 1.11,14.06 4.63,14.06 C6.27,14.06 7.44,13.79 8.22,13.42 L8.22,7.73 L4.7,7.73 L4.7,8.73 L4.7,8.73 Z M11.09,12.45 L11.09,6.06 L10.04,6.06 L10.04,12.34 C10.04,13.59 10.62,14.06 11.76,14.06 L11.76,13.17 C11.28,13.17 11.09,13.01 11.09,12.47 L11.09,12.45 L11.09,12.45 Z M11.34,3.73 C11.34,3.29 11.01,2.95 10.56,2.95 C10.11,2.95 9.79,3.29 9.79,3.73 C9.79,4.17 10.12,4.51 10.56,4.51 C11,4.51 11.34,4.17 11.34,3.73 L11.34,3.73 Z M15.68,9.42 C14.18,9.29 13.9,8.94 13.9,8.25 C13.9,7.48 14.23,6.91 15.78,6.91 C16.83,6.91 17.44,7.07 18.05,7.27 L18.05,6.33 C17.36,6.03 16.53,5.94 15.8,5.94 C13.6,5.94 12.88,7.14 12.88,8.25 C12.88,9.33 13.35,10.13 15.61,10.33 C17.16,10.46 17.38,10.96 17.38,11.67 C17.38,12.4 16.94,13.09 15.32,13.09 C14.21,13.09 13.46,12.9 12.99,12.73 L12.99,13.67 C13.49,13.87 14.57,14.06 15.32,14.06 C17.7,14.06 18.46,12.86 18.46,11.65 C18.46,10.37 17.93,9.62 15.71,9.42 L15.69,9.42 L15.68,9.42 Z M24.26,6.95 L24.26,6.09 L21.84,6.09 L21.84,3.59 L20.76,3.9 L20.76,6.01 L19.2,6.45 L19.2,6.93 L20.76,6.93 L20.76,11.93 C20.76,13.46 21.95,14.06 23.26,14.06 C23.45,14.06 23.78,14.04 23.95,14.01 L23.95,13.12 C23.76,13.15 23.54,13.15 23.34,13.15 C22.37,13.15 21.84,12.76 21.84,11.81 L21.84,6.94 L24.26,6.94 L24.26,6.96 L24.26,6.95 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/logo-github.svg b/htdocs/theme/common/octicons/lib/svg/logo-github.svg
deleted file mode 100644
index bb6c20a7b01..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/logo-github.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="45px" height="16px" viewBox="0 0 45 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>logo-github</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo-github" fill="#000000">
-            <path d="M18.53,12.0301 L18.51,12.0301 C18.519,12.0301 18.525,12.0391 18.534,12.0411 C18.535,12.0411 18.539,12.0401 18.54,12.0401 L18.53,12.0301 Z M18.534,12.0411 C18.441,12.0421 18.207,12.0901 17.96,12.0901 C17.18,12.0901 16.91,11.7301 16.91,11.2601 L16.91,8.1301 L18.5,8.1301 C18.59,8.1301 18.66,8.0501 18.66,7.9401 L18.66,6.2401 C18.66,6.1501 18.58,6.0701 18.5,6.0701 L16.91,6.0701 L16.91,3.9601 C16.91,3.8801 16.86,3.8301 16.77,3.8301 L14.61,3.8301 C14.52,3.8301 14.47,3.8801 14.47,3.9601 L14.47,6.1301 C14.47,6.1301 13.38,6.4001 13.31,6.4101 C13.23,6.4301 13.18,6.5001 13.18,6.5801 L13.18,7.9401 C13.18,8.0501 13.26,8.1301 13.35,8.1301 L14.46,8.1301 L14.46,11.4101 C14.46,13.8501 16.16,14.1001 17.32,14.1001 C17.85,14.1001 18.49,13.9301 18.59,13.8801 C18.65,13.8601 18.68,13.7901 18.68,13.7201 L18.68,12.2201 C18.68,12.1211 18.612,12.0551 18.534,12.0411 L18.534,12.0411 Z M42.23,9.8401 C42.23,8.0301 41.5,7.7901 40.73,7.8701 C40.13,7.9101 39.65,8.2101 39.65,8.2101 L39.65,11.7301 C39.65,11.7301 40.14,12.0701 40.87,12.0901 C41.9,12.1201 42.23,11.7501 42.23,9.8401 L42.23,9.8401 Z M44.66,9.6801 C44.66,13.1101 43.55,14.0901 41.61,14.0901 C39.97,14.0901 39.09,13.2601 39.09,13.2601 C39.09,13.2601 39.05,13.7201 39,13.7801 C38.97,13.8401 38.92,13.8601 38.86,13.8601 L37.38,13.8601 C37.28,13.8601 37.19,13.7801 37.19,13.6901 L37.21,2.5801 C37.21,2.4901 37.29,2.4101 37.38,2.4101 L39.51,2.4101 C39.6,2.4101 39.68,2.4901 39.68,2.5801 L39.68,6.3501 C39.68,6.3501 40.5,5.8201 41.7,5.8201 L41.69,5.8001 C42.89,5.8001 44.66,6.2501 44.66,9.6801 L44.66,9.6801 Z M35.94,6.0701 L35.93,6.0701 L33.84,6.0701 C33.73,6.0701 33.67,6.1501 33.67,6.2601 L33.67,11.7001 C33.67,11.7001 33.12,12.0901 32.37,12.0901 C31.62,12.0901 31.4,11.7501 31.4,11.0001 L31.4,6.2501 C31.4,6.1601 31.32,6.0801 31.23,6.0801 L29.09,6.0801 C29,6.0801 28.92,6.1601 28.92,6.2501 L28.92,11.3601 C28.92,13.5601 30.15,14.1101 31.84,14.1101 C33.23,14.1101 34.36,13.3401 34.36,13.3401 C34.36,13.3401 34.41,13.7301 34.44,13.7901 C34.46,13.8401 34.53,13.8801 34.6,13.8801 L35.94,13.8801 C36.05,13.8801 36.11,13.8001 36.11,13.7101 L36.13,6.2401 C36.13,6.1501 36.05,6.0701 35.94,6.0701 L35.94,6.0701 Z M12.24,6.0601 L10.11,6.0601 C10.02,6.0601 9.94,6.1501 9.94,6.2601 L9.94,13.6001 C9.94,13.8001 10.07,13.8701 10.24,13.8701 L12.16,13.8701 C12.36,13.8701 12.41,13.7801 12.41,13.6001 L12.41,6.2401 L12.41,6.2301 C12.41,6.1401 12.33,6.0601 12.24,6.0601 L12.24,6.0601 Z M11.19,2.6801 C10.42,2.6801 9.81,3.2901 9.81,4.0601 C9.81,4.8301 10.42,5.4401 11.19,5.4401 C11.94,5.4401 12.55,4.8301 12.55,4.0601 C12.55,3.2901 11.94,2.6801 11.19,2.6801 L11.19,2.6801 Z M27.68,2.4301 L25.57,2.4301 C25.48,2.4301 25.4,2.5101 25.4,2.6001 L25.4,6.6901 L22.09,6.6901 L22.09,2.6001 C22.09,2.5101 22.01,2.4301 21.92,2.4301 L19.79,2.4301 C19.7,2.4301 19.62,2.5101 19.62,2.6001 L19.62,13.7101 C19.62,13.8001 19.71,13.8801 19.79,13.8801 L21.92,13.8801 C22.01,13.8801 22.09,13.8001 22.09,13.7101 L22.09,8.9601 L25.4,8.9601 L25.38,13.7101 C25.38,13.8001 25.46,13.8801 25.55,13.8801 L27.68,13.8801 C27.77,13.8801 27.85,13.8001 27.85,13.7101 L27.85,2.6001 C27.85,2.5101 27.77,2.4301 27.68,2.4301 L27.68,2.4301 Z M8.81,7.3501 L8.81,13.0901 C8.81,13.1301 8.8,13.2001 8.75,13.2201 C8.75,13.2201 7.5,14.1101 5.44,14.1101 C2.95,14.1101 0,13.3301 0,8.1901 C0,3.0501 2.58,1.9901 5.1,2.0001 C7.28,2.0001 8.16,2.4901 8.3,2.5801 C8.34,2.6301 8.36,2.6701 8.36,2.7201 L7.94,4.5001 C7.94,4.5901 7.85,4.7001 7.74,4.6701 C7.38,4.5601 6.84,4.3401 5.57,4.3401 C4.1,4.3401 2.52,4.7601 2.52,8.0701 C2.52,11.3801 4.02,11.7701 5.1,11.7701 C6.02,11.7701 6.35,11.6601 6.35,11.6601 L6.35,9.3601 L4.88,9.3601 C4.77,9.3601 4.69,9.2801 4.69,9.1901 L4.69,7.3501 C4.69,7.2601 4.77,7.1801 4.88,7.1801 L8.62,7.1801 C8.73,7.1801 8.81,7.2601 8.81,7.3501 L8.81,7.3501 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mail-read.svg b/htdocs/theme/common/octicons/lib/svg/mail-read.svg
deleted file mode 100644
index 9a6ee16730d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/mail-read.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>mail-read</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mail-read" fill="#000000">
-            <path d="M6,5 L4,5 L4,4 L6,4 L6,5 L6,5 Z M9,6 L4,6 L4,7 L9,7 L9,6 L9,6 Z M14,5.52 L14,14 C14,14.55 13.55,15 13,15 L1,15 C0.45,15 0,14.55 0,14 L0,5.52 C0,5.19 0.16,4.89 0.42,4.71 L2,3.58 L2,3 C2,2.45 2.45,2 3,2 L4.2,2 L7,0 L9.8,2 L11,2 C11.55,2 12,2.45 12,3 L12,3.58 L13.58,4.71 C13.85,4.9 14,5.19 14,5.52 L14,5.52 Z M3,7.5 L7,10 L11,7.5 L11,3 L3,3 L3,7.5 L3,7.5 Z M1,13.5 L5.5,10.5 L1,7.5 L1,13.5 L1,13.5 Z M12,14 L7,11 L2,14 L12,14 L12,14 Z M13,7.5 L8.5,10.5 L13,13.5 L13,7.5 L13,7.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mail-reply.svg b/htdocs/theme/common/octicons/lib/svg/mail-reply.svg
deleted file mode 100644
index 03c8212f636..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/mail-reply.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.1 (28215) - http://www.bohemiancoding.com/sketch -->
-    <title>mail-reply</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mail-reply" fill="#000000">
-            <path d="M6,2.5 L0,7 L6,11.5 L6,8.5 C7.73,8.5 11.14,9.45 12,12.88 C12,8.33 8.94,5.83 6,5.5 L6,2.5 L6,2.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mail.svg b/htdocs/theme/common/octicons/lib/svg/mail.svg
deleted file mode 100644
index 1ff97533bb5..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/mail.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>mail</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mail" fill="#000000">
-            <path d="M0,4 L0,12 C0,12.55 0.45,13 1,13 L13,13 C13.55,13 14,12.55 14,12 L14,4 C14,3.45 13.55,3 13,3 L1,3 C0.45,3 0,3.45 0,4 L0,4 Z M13,4 L7,9 L1,4 L13,4 L13,4 Z M1,5.5 L5,8.5 L1,11.5 L1,5.5 L1,5.5 Z M2,12 L5.5,9 L7,10.5 L8.5,9 L12,12 L2,12 L2,12 Z M13,11.5 L9,8.5 L13,5.5 L13,11.5 L13,11.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mark-github.svg b/htdocs/theme/common/octicons/lib/svg/mark-github.svg
deleted file mode 100644
index 2bda9afa081..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/mark-github.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>mark-github</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mark-github" fill="#000000">
-            <path d="M8,0 C3.58,0 0,3.58 0,8 C0,11.54 2.29,14.53 5.47,15.59 C5.87,15.66 6.02,15.42 6.02,15.21 C6.02,15.02 6.01,14.39 6.01,13.72 C4,14.09 3.48,13.23 3.32,12.78 C3.23,12.55 2.84,11.84 2.5,11.65 C2.22,11.5 1.82,11.13 2.49,11.12 C3.12,11.11 3.57,11.7 3.72,11.94 C4.44,13.15 5.59,12.81 6.05,12.6 C6.12,12.08 6.33,11.73 6.56,11.53 C4.78,11.33 2.92,10.64 2.92,7.58 C2.92,6.71 3.23,5.99 3.74,5.43 C3.66,5.23 3.38,4.41 3.82,3.31 C3.82,3.31 4.49,3.1 6.02,4.13 C6.66,3.95 7.34,3.86 8.02,3.86 C8.7,3.86 9.38,3.95 10.02,4.13 C11.55,3.09 12.22,3.31 12.22,3.31 C12.66,4.41 12.38,5.23 12.3,5.43 C12.81,5.99 13.12,6.7 13.12,7.58 C13.12,10.65 11.25,11.33 9.47,11.53 C9.76,11.78 10.01,12.26 10.01,13.01 C10.01,14.08 10,14.94 10,15.21 C10,15.42 10.15,15.67 10.55,15.59 C13.71,14.53 16,11.53 16,8 C16,3.58 12.42,0 8,0 L8,0 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/markdown.svg b/htdocs/theme/common/octicons/lib/svg/markdown.svg
deleted file mode 100644
index fb33c140c80..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/markdown.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>markdown</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="markdown" fill="#000000">
-            <path d="M14.85,3 L1.15,3 C0.52,3 0,3.52 0,4.15 L0,11.84 C0,12.48 0.52,13 1.15,13 L14.84,13 C15.48,13 15.99,12.48 15.99,11.85 L15.99,4.15 C16,3.52 15.48,3 14.85,3 L14.85,3 Z M9,11 L7,11 L7,8 L5.5,9.92 L4,8 L4,11 L2,11 L2,5 L4,5 L5.5,7 L7,5 L9,5 L9,11 L9,11 Z M11.99,11.5 L9.5,8 L11,8 L11,5 L13,5 L13,8 L14.5,8 L11.99,11.5 L11.99,11.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/megaphone.svg b/htdocs/theme/common/octicons/lib/svg/megaphone.svg
deleted file mode 100644
index e8f10228767..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/megaphone.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>megaphone</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="megaphone" fill="#000000">
-            <path d="M10,1 C9.83,1 9.64,1.05 9.48,1.14 C8.04,2.02 4.5,4.58 3,5 C1.62,5 0,5.67 0,7.5 C0,9.33 1.63,10 3,10 C3.3,10.08 3.64,10.23 4,10.41 L4,15 L6,15 L6,11.55 C7.34,12.41 8.69,13.38 9.48,13.86 C9.64,13.95 9.82,14 10,14 C10.52,14 11,13.58 11,13 L11,2 C11,1.42 10.52,1 10,1 L10,1 Z M10,13 C9.62,12.77 9.11,12.42 8.5,12 C8.34,11.89 8.17,11.78 8,11.66 L8,3.31 C8.16,3.2 8.31,3.11 8.47,3 C9.08,2.59 9.63,2.23 10,2 L10,13 L10,13 Z M12,7 L16,7 L16,8 L12,8 L12,7 L12,7 Z M12,9 L16,11 L16,12 L12,10 L12,9 L12,9 Z M16,3 L16,4 L12,6 L12,5 L16,3 L16,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mention.svg b/htdocs/theme/common/octicons/lib/svg/mention.svg
deleted file mode 100644
index f82be86a72a..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/mention.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>mention</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mention" fill="#000000">
-            <path d="M6.58,15 C7.83,15 9.1,14.69 10.14,14.06 L9.72,13.12 C8.88,13.64 7.83,13.95 6.69,13.95 C3.46,13.95 1.05,11.87 1.05,8.23 C1.05,3.86 4.28,1.05 7.63,1.05 C11.08,1.05 12.85,3.24 12.85,6.25 C12.85,8.64 11.51,10.11 10.35,10.11 C9.3,10.11 8.99,9.38 9.3,7.92 L10.03,4.17 L8.98,4.17 L8.87,4.89 C8.46,4.26 7.93,4.06 7.31,4.06 C5.12,4.06 3.65,6.45 3.65,8.44 C3.65,10.11 4.59,11.05 5.95,11.05 C6.79,11.05 7.62,10.52 8.25,9.8 C8.36,10.74 9.19,11.25 10.23,11.25 C11.9,11.25 14,9.58 14,6.25 C14,2.61 11.59,0 7.83,0 C3.66,0 0,3.33 0,8.33 C0,12.71 2.92,15 6.58,15 L6.58,15 Z M6.27,10 C5.54,10 4.91,9.48 4.91,8.33 C4.91,6.88 5.85,5.11 7.32,5.11 C7.84,5.11 8.16,5.31 8.57,5.94 L8.05,8.96 C7.42,9.69 6.8,10.01 6.27,10.01 L6.27,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/milestone.svg b/htdocs/theme/common/octicons/lib/svg/milestone.svg
deleted file mode 100644
index 829bba95ef5..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/milestone.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>milestone</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="milestone" fill="#000000">
-            <path d="M8,2 L6,2 L6,0 L8,0 L8,2 L8,2 Z M12,7 L2,7 C1.45,7 1,6.55 1,6 L1,4 C1,3.45 1.45,3 2,3 L12,3 L14,5 L12,7 L12,7 Z M8,4 L6,4 L6,6 L8,6 L8,4 L8,4 Z M6,16 L8,16 L8,8 L6,8 L6,16 L6,16 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mirror.svg b/htdocs/theme/common/octicons/lib/svg/mirror.svg
deleted file mode 100644
index 39055e601eb..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/mirror.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>mirror</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mirror" fill="#000000">
-            <path d="M15.5,4.7 L8.5,0 L1.5,4.7 C1.2,4.89 1,5.15 1,5.5 L1,16 L8.5,12 L16,16 L16,5.5 C16,5.16 15.8,4.89 15.5,4.7 L15.5,4.7 Z M15,14.5 L9,11.25 L9,10 L8,10 L8,11.25 L2,14.5 L2,5.5 L8,1.5 L8,6 L9,6 L9,1.5 L15,5.5 L15,14.5 L15,14.5 Z M6,7 L11,7 L11,5 L14,8 L11,11 L11,9 L6,9 L6,11 L3,8 L6,5 L6,7 L6,7 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mortar-board.svg b/htdocs/theme/common/octicons/lib/svg/mortar-board.svg
deleted file mode 100644
index ee3b5f8b9a3..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/mortar-board.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>mortar-board</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mortar-board" fill="#000000">
-            <path d="M7.83,9.19 L4,8 C8.8817842e-16,1.33226763e-15 4,9.5 4,10.5 C4,11.5 5.8,12 8,12 C10.2,12 12,11.5 12,10.5 L12,8 L8.17,9.19 C8.06,9.22 7.94,9.22 7.81,9.19 L7.83,9.19 L7.83,9.19 Z M8.11,2.8 C8.05,2.78 7.97,2.78 7.91,2.8 L0.27,5.18 C-0.06,5.29 -0.06,5.74 0.27,5.85 L2,6.4 L2,8.17 C1.7,8.34 1.5,8.67 1.5,9.03 C1.5,9.22 1.55,9.39 1.64,9.53 C1.56,9.67 1.5,9.84 1.5,10.03 L1.5,12.61 C1.5,13.16 3.5,13.16 3.5,12.61 L3.5,10.03 C3.5,9.84 3.45,9.67 3.36,9.53 C3.44,9.39 3.5,9.22 3.5,9.03 C3.5,8.65 3.3,8.34 3,8.17 L3,6.72 L7.89,8.25 C7.95,8.27 8.03,8.27 8.09,8.25 L15.73,5.87 C16.06,5.76 16.06,5.31 15.73,5.2 L8.1,2.81 L8.11,2.8 Z M8.02,6 C7.47,6 7.02,5.78 7.02,5.5 C7.02,5.22 7.47,5 8.02,5 C8.57,5 9.02,5.22 9.02,5.5 C9.02,5.78 8.57,6 8.02,6 L8.02,6 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mute.svg b/htdocs/theme/common/octicons/lib/svg/mute.svg
deleted file mode 100644
index f29643f227d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/mute.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>mute</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mute" fill="#000000">
-            <path d="M8,2.81 L8,13.19 C8,13.86 7.19,14.19 6.72,13.72 L3,10 L1,10 C0.45,10 0,9.55 0,9 L0,7 C0,6.45 0.45,6 1,6 L3,6 L6.72,2.28 C7.19,1.81 8,2.14 8,2.81 L8,2.81 Z M15.53,6.03 L14.47,4.97 L12.5,6.94 L10.53,4.97 L9.47,6.03 L11.44,8 L9.47,9.97 L10.53,11.03 L12.5,9.06 L14.47,11.03 L15.53,9.97 L13.56,8 L15.53,6.03 L15.53,6.03 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/no-newline.svg b/htdocs/theme/common/octicons/lib/svg/no-newline.svg
deleted file mode 100644
index fae7c4fe789..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/no-newline.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>no-newline</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="no-newline" fill="#000000">
-            <path d="M16,5 L16,8 C16,8.55 15.55,9 15,9 L12,9 L12,11 L9,8 L12,5 L12,7 L14,7 L14,5 L16,5 L16,5 Z M8,8 C8,10.2 6.2,12 4,12 C1.8,12 0,10.2 0,8 C0,5.8 1.8,4 4,4 C6.2,4 8,5.8 8,8 L8,8 Z M1.5,9.66 L5.66,5.5 C5.18,5.19 4.61,5 4,5 C2.34,5 1,6.34 1,8 C1,8.61 1.19,9.17 1.5,9.66 L1.5,9.66 Z M7,8 C7,7.39 6.81,6.83 6.5,6.34 L2.34,10.5 C2.82,10.81 3.39,11 4,11 C5.66,11 7,9.66 7,8 L7,8 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/note.svg b/htdocs/theme/common/octicons/lib/svg/note.svg
deleted file mode 100644
index 49c1a3892b3..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/note.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>note</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="note" fill="#000000">
-            <path d="M3,10 L7,10 L7,9 L3,9 L3,10 L3,10 Z M3,8 L9,8 L9,7 L3,7 L3,8 L3,8 Z M3,6 L11,6 L11,5 L3,5 L3,6 L3,6 Z M13,12 L1,12 L1,3 L13,3 L13,12 L13,12 Z M1,2 C0.45,2 0,2.45 0,3 L0,12 C0,12.55 0.45,13 1,13 L13,13 C13.55,13 14,12.55 14,12 L14,3 C14,2.45 13.55,2 13,2 L1,2 L1,2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/octoface.svg b/htdocs/theme/common/octicons/lib/svg/octoface.svg
deleted file mode 100644
index 87aadac2360..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/octoface.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>octoface</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="octoface" fill="#000000">
-            <path d="M14.7,5.34 C14.83,5.02 15.25,3.75 14.57,2.03 C14.57,2.03 13.52,1.7 11.13,3.33 C10.13,3.05 9.06,3.01 8,3.01 C6.94,3.01 5.87,3.05 4.87,3.33 C2.48,1.69 1.43,2.03 1.43,2.03 C0.75,3.75 1.17,5.02 1.3,5.34 C0.49,6.21 0,7.33 0,8.69 C0,13.84 3.33,15 7.98,15 C12.63,15 16,13.84 16,8.69 C16,7.33 15.51,6.21 14.7,5.34 L14.7,5.34 Z M8,14.02 C4.7,14.02 2.02,13.87 2.02,10.67 C2.02,9.91 2.4,9.19 3.04,8.6 C4.11,7.62 5.94,8.14 8,8.14 C10.07,8.14 11.88,7.62 12.96,8.6 C13.61,9.19 13.98,9.9 13.98,10.67 C13.98,13.86 11.3,14.02 8,14.02 L8,14.02 Z M5.49,9.01 C4.83,9.01 4.29,9.81 4.29,10.79 C4.29,11.77 4.83,12.58 5.49,12.58 C6.15,12.58 6.69,11.78 6.69,10.79 C6.69,9.8 6.15,9.01 5.49,9.01 L5.49,9.01 Z M10.51,9.01 C9.85,9.01 9.31,9.8 9.31,10.79 C9.31,11.78 9.85,12.58 10.51,12.58 C11.17,12.58 11.71,11.78 11.71,10.79 C11.71,9.8 11.18,9.01 10.51,9.01 L10.51,9.01 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/organization.svg b/htdocs/theme/common/octicons/lib/svg/organization.svg
deleted file mode 100644
index 51cb253acfa..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/organization.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>organization</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="organization" fill="#221F20">
-            <path d="M16,12.999 C16,13.438 15.55,13.999 15,13.999 L7.995,13.999 C7.456,13.999 7.001,13.552 7,13 L1,13 C0.46,13 0,12.439 0,12 C0,9.366 3,8 3,8 C3,8 3.229,7.591 3,7 C2.159,6.379 1.942,6.41 2,4 C2.058,1.581 3.367,1 4.5,1 C5.633,1 6.942,1.58 7,4 C7.058,6.41 6.841,6.379 6,7 C5.771,7.59 6,8 6,8 C6,8 7.549,8.711 8.42,10.088 C9.196,9.369 10,8.999 10,8.999 C10,8.999 10.229,8.59 10,7.999 C9.159,7.379 8.942,7.409 9,4.999 C9.058,2.58 10.367,1.999 11.5,1.999 C12.633,1.999 13.937,2.58 13.995,4.999 C14.054,7.409 13.837,7.379 12.995,7.999 C12.766,8.589 12.995,8.999 12.995,8.999 C12.995,8.999 16,10.365 16,12.999" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/package.svg b/htdocs/theme/common/octicons/lib/svg/package.svg
deleted file mode 100644
index cb41bcf6a03..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/package.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>package</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="package" fill="#000000">
-            <path d="M1,4.27 L1,11.74 C1,12.19 1.3,12.58 1.75,12.71 L8.25,14.44 C8.41,14.49 8.59,14.49 8.75,14.44 L15.25,12.71 C15.7,12.58 16,12.19 16,11.74 L16,4.27 C16,3.82 15.7,3.43 15.25,3.3 L8.75,1.56 C8.59,1.53 8.41,1.53 8.25,1.56 L1.75,3.3 C1.3,3.43 1,3.82 1,4.27 L1,4.27 Z M8,13.36 L2,11.77 L2,5 L8,6.61 L8,13.36 L8,13.36 Z M2,4 L4.5,3.33 L11,5.06 L8.5,5.73 L2,4 L2,4 Z M15,11.77 L9,13.36 L9,6.61 L11,6.06 L11,8.5 L13,7.97 L13,5.53 L15,5 L15,11.77 L15,11.77 Z M13,4.53 L6.5,2.8 L8.5,2.27 L15,4 L13,4.53 L13,4.53 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/paintcan.svg b/htdocs/theme/common/octicons/lib/svg/paintcan.svg
deleted file mode 100644
index 387195bff62..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/paintcan.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>paintcan</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="paintcan" fill="#000000">
-            <path d="M6,0 C2.69,0 0,2.69 0,6 L0,7 C0,7.55 0.45,8 1,8 L1,13 C1,14.1 3.24,15 6,15 C8.76,15 11,14.1 11,13 L11,8 C11.55,8 12,7.55 12,7 L12,6 C12,2.69 9.31,0 6,0 L6,0 Z M9,10 L9,10.5 C9,10.78 8.78,11 8.5,11 C8.22,11 8,10.78 8,10.5 L8,10 C8,9.72 7.78,9.5 7.5,9.5 C7.22,9.5 7,9.72 7,10 L7,12.5 C7,12.78 6.78,13 6.5,13 C6.22,13 6,12.78 6,12.5 L6,10.5 C6,10.22 5.78,10 5.5,10 C5.22,10 5,10.22 5,10.5 L5,11 C5,11.55 4.55,12 4,12 C3.45,12 3,11.55 3,11 L3,10 C2.45,10 2,9.55 2,9 L2,7.2 C2.91,7.69 4.36,8 6,8 C7.64,8 9.09,7.69 10,7.2 L10,9 C10,9.55 9.55,10 9,10 L9,10 Z M6,7 C4.32,7 2.88,6.59 2.29,6 C2.88,5.41 4.32,5 6,5 C7.68,5 9.12,5.41 9.71,6 C9.12,6.59 7.68,7 6,7 L6,7 Z M6,4 C3.24,4 1,4.89 1,6 L1,6 C1,3.24 3.24,1 6,1 C8.76,1 11,3.24 11,6 C11,4.9 8.76,4 6,4 L6,4 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/pencil.svg b/htdocs/theme/common/octicons/lib/svg/pencil.svg
deleted file mode 100644
index 354df31f3f2..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/pencil.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>pencil</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="pencil" fill="#000000">
-            <path d="M0,12 L0,15 L3,15 L11,7 L8,4 L0,12 L0,12 Z M3,14 L1,14 L1,12 L2,12 L2,13 L3,13 L3,14 L3,14 Z M13.3,4.7 L12,6 L9,3 L10.3,1.7 C10.69,1.31 11.32,1.31 11.71,1.7 L13.3,3.29 C13.69,3.68 13.69,4.31 13.3,4.7 L13.3,4.7 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/person.svg b/htdocs/theme/common/octicons/lib/svg/person.svg
deleted file mode 100644
index a26225e1c4a..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/person.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>person</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="person" fill="#000000">
-            <path d="M12,14.002 C12,14.553 11.553,15 11.002,15 L1.001,15 C0.448,15 0,14.552 0,13.999 L0,13 C0,10.367 4,9 4,9 C4,9 4.229,8.591 4,8 C3.159,7.38 3.056,6.41 3,4 C3.173,1.587 4.867,1 6,1 C7.133,1 8.827,1.586 9,4 C8.944,6.41 8.841,7.38 8,8 C7.771,8.59 8,9 8,9 C8,9 12,10.367 12,13 L12,14.002 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/pin.svg b/htdocs/theme/common/octicons/lib/svg/pin.svg
deleted file mode 100644
index d08cb652dd1..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/pin.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>pin</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="pin" fill="#000000">
-            <path d="M10,1.2 L10,2 L10.5,3 L6,6 L2.2,6 C1.76,6 1.53,6.53 1.86,6.86 L5,10 L1,15 L6,11 L9.14,14.14 C9.47,14.47 10,14.23 10,13.8 L10,10 L13,5.5 L14,6 L14.8,6 C15.24,6 15.47,5.47 15.14,5.14 L10.86,0.86 C10.53,0.53 10,0.77 10,1.2 L10,1.2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/plug.svg b/htdocs/theme/common/octicons/lib/svg/plug.svg
deleted file mode 100644
index 8f4ee9f46ba..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/plug.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>plug</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="plug" fill="#000000">
-            <path d="M14,6 L14,5 L10,5 L10,3 L8,3 L8,4 L6,4 C4.97,4 4.23,4.81 4,6 L3,7 C1.34,7 0,8.34 0,10 L0,12 L1,12 L1,10 C1,8.89 1.89,8 3,8 L4,9 C4.25,10.16 4.98,11 6,11 L8,11 L8,12 L10,12 L10,10 L14,10 L14,9 L10,9 L10,6 L14,6 L14,6 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/plus-small.svg b/htdocs/theme/common/octicons/lib/svg/plus-small.svg
deleted file mode 100644
index ccb9d2d6256..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/plus-small.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="7px" height="16px" viewBox="0 0 7 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>plus-small</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="plus-small" fill="#000000">
-            <path d="M4,7 L4,4 L3,4 L3,7 L0,7 L0,8 L3,8 L3,11 L4,11 L4,8 L7,8 L7,7 L4,7 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/plus.svg b/htdocs/theme/common/octicons/lib/svg/plus.svg
deleted file mode 100644
index 3882ee5a1c7..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/plus.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>plus</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="plus" fill="#000000">
-            <polygon id="Shape" points="12 9 7 9 7 14 5 14 5 9 0 9 0 7 5 7 5 2 7 2 7 7 12 7"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/primitive-dot.svg b/htdocs/theme/common/octicons/lib/svg/primitive-dot.svg
deleted file mode 100644
index b9a2f416c28..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/primitive-dot.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>primitive-dot</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="primitive-dot" fill="#000000">
-            <path d="M0,8 C0,5.8 1.8,4 4,4 C6.2,4 8,5.8 8,8 C8,10.2 6.2,12 4,12 C1.8,12 0,10.2 0,8 L0,8 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/primitive-square.svg b/htdocs/theme/common/octicons/lib/svg/primitive-square.svg
deleted file mode 100644
index 361b7c383ac..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/primitive-square.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>primitive-square</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="primitive-square" fill="#000000">
-            <polygon id="Shape" points="8 12 0 12 0 4 8 4"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/project.svg b/htdocs/theme/common/octicons/lib/svg/project.svg
deleted file mode 100644
index 606672f3f52..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/project.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="15px" height="16px" viewBox="0 0 15 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>project</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="project" fill="#000000">
-            <path d="M10,12 L13,12 L13,2 L10,2 L10,12 L10,12 Z M6,10 L9,10 L9,2 L6,2 L6,10 L6,10 Z M2,14 L5,14 L5,2 L2,2 L2,14 L2,14 Z M1,15 L14,15 L14,1 L1,1 L1,15 L1,15 Z M14,0 L1,0 C0.448,0 0,0.448 0,1 L0,15 C0,15.552 0.448,16 1,16 L14,16 C14.552,16 15,15.552 15,15 L15,1 C15,0.448 14.552,0 14,0 L14,0 L14,0 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/pulse.svg b/htdocs/theme/common/octicons/lib/svg/pulse.svg
deleted file mode 100644
index a17f9c00d3a..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/pulse.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>pulse</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="pulse" fill="#000000">
-            <polygon id="Shape" points="11.5 8 8.8 5.4 6.6 8.5 5.5 1.6 2.38 8 0 8 0 10 3.6 10 4.5 8.2 5.4 13.6 9 8.5 10.6 10 14 10 14 8"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/question.svg b/htdocs/theme/common/octicons/lib/svg/question.svg
deleted file mode 100644
index 554fc5bf02c..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/question.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>question</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="question" fill="#000000">
-            <path d="M6,10 L8,10 L8,12 L6,12 L6,10 L6,10 Z M10,6.5 C10,8.64 8,9 8,9 L6,9 C6,8.45 6.45,8 7,8 L7.5,8 C7.78,8 8,7.78 8,7.5 L8,6.5 C8,6.22 7.78,6 7.5,6 L6.5,6 C6.22,6 6,6.22 6,6.5 L6,7 L4,7 C4,5.5 5.5,4 7,4 C8.5,4 10,5 10,6.5 L10,6.5 Z M7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,11.14 10.14,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,4.86 3.86,2.3 7,2.3 L7,2.3 Z M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/quote.svg b/htdocs/theme/common/octicons/lib/svg/quote.svg
deleted file mode 100644
index 882882f0fbd..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/quote.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>quote</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="quote" fill="#000000">
-            <path d="M6.16,3.50000004 C3.73,5.06000004 2.55,6.67000004 2.55,9.36000004 C2.71,9.31000004 2.85,9.31000004 2.99,9.31000004 C4.26,9.31000004 5.49,10.17 5.49,11.72 C5.49,13.33 4.46,14.33 2.99,14.33 C1.09,14.33 0,12.81 0,10.08 C0,6.28000004 1.75,3.55000004 5.02,1.66000004 L6.16,3.50000004 L6.16,3.50000004 Z M13.16,3.50000004 C10.73,5.06000004 9.55,6.67000004 9.55,9.36000004 C9.71,9.31000004 9.85,9.31000004 9.99,9.31000004 C11.26,9.31000004 12.49,10.17 12.49,11.72 C12.49,13.33 11.46,14.33 9.99,14.33 C8.1,14.33 7.01,12.81 7.01,10.08 C7.01,6.28000004 8.76,3.55000004 12.03,1.66000004 L13.17,3.50000004 L13.16,3.50000004 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/radio-tower.svg b/htdocs/theme/common/octicons/lib/svg/radio-tower.svg
deleted file mode 100644
index 6f27ab3d9ce..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/radio-tower.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>radio-tower</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="radio-tower" fill="#000000">
-            <path d="M4.79,6.11 C5.04,5.86 5.04,5.44 4.79,5.19 C4.47,4.86 4.31,4.43 4.31,4 C4.31,3.57 4.47,3.14 4.79,2.81 C5.04,2.55 5.04,2.14 4.79,1.89 C4.67,1.76 4.5,1.7 4.34,1.7 C4.18,1.7 4.01,1.76 3.89,1.89 C3.32,2.47 3.04,3.24 3.04,4 C3.04,4.76 3.33,5.53 3.89,6.11 C4.14,6.36 4.55,6.36 4.79,6.11 L4.79,6.11 Z M2.33,0.52 C2.2,0.39 2.04,0.33 1.87,0.33 C1.71,0.33 1.54,0.39 1.41,0.52 C0.48,1.48 0.01,2.74 0.01,3.99 C0.01,5.25 0.48,6.51 1.41,7.47 C1.66,7.73 2.07,7.73 2.32,7.47 C2.57,7.21 2.57,6.79 2.32,6.53 C1.64,5.83 1.3,4.91 1.3,3.99 C1.3,3.07 1.64,2.15 2.32,1.45 C2.58,1.2 2.58,0.78 2.33,0.52 L2.33,0.52 Z M8.02,5.62 C8.92,5.62 9.64,4.89 9.64,4 C9.64,3.1 8.91,2.38 8.02,2.38 C7.12,2.38 6.4,3.11 6.4,4 C6.39,4.89 7.12,5.62 8.02,5.62 L8.02,5.62 Z M14.59,0.53 C14.34,0.27 13.93,0.27 13.68,0.53 C13.43,0.79 13.43,1.21 13.68,1.47 C14.36,2.17 14.7,3.09 14.7,4.01 C14.7,4.93 14.36,5.84 13.68,6.55 C13.43,6.81 13.43,7.23 13.68,7.49 C13.81,7.62 13.97,7.68 14.14,7.68 C14.3,7.68 14.47,7.62 14.6,7.49 C15.53,6.53 16,5.27 16,4.01 C15.99,2.75 15.52,1.49 14.59,0.53 L14.59,0.53 Z M8.02,6.92 L8.02,6.92 C7.61,6.92 7.19,6.82 6.82,6.62 L3.67,14.99 L5.16,14.99 L6.02,13.99 L10.02,13.99 L10.86,14.99 L12.35,14.99 L9.21,6.62 C8.83,6.82 8.43,6.92 8.02,6.92 L8.02,6.92 Z M8.01,7.4 L9.02,11 L7.02,11 L8.01,7.4 L8.01,7.4 Z M6.02,12.99 L7.02,11.99 L9.02,11.99 L10.02,12.99 L6.02,12.99 L6.02,12.99 Z M11.21,1.89 C10.96,2.14 10.96,2.56 11.21,2.81 C11.53,3.14 11.69,3.57 11.69,4 C11.69,4.43 11.53,4.86 11.21,5.19 C10.96,5.45 10.96,5.86 11.21,6.11 C11.33,6.24 11.5,6.3 11.66,6.3 C11.82,6.3 11.98,6.24 12.11,6.11 C12.68,5.53 12.96,4.76 12.96,4 C12.96,3.24 12.68,2.47 12.11,1.89 C11.86,1.64 11.45,1.64 11.21,1.89 L11.21,1.89 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/reply.svg b/htdocs/theme/common/octicons/lib/svg/reply.svg
deleted file mode 100644
index 7dbde79bfa5..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/reply.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>reply</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="reply" fill="#000000">
-            <path d="M6,3.5 C9.92,3.94 14,6.625 14,13.5 C11.688,8.438 9.25,7.5 6,7.5 L6,11 L0.5,5.5 L6,0 L6,3.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-clone.svg b/htdocs/theme/common/octicons/lib/svg/repo-clone.svg
deleted file mode 100644
index 8fb3ea1688d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/repo-clone.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>repo-clone</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="repo-clone" fill="#000000">
-            <path d="M15,0 L9,0 L9,7 C9,7.55 9.45,8 10,8 L11,8 L11,9 L12,9 L12,8 L15,8 C15.55,8 16,7.55 16,7 L16,1 C16,0.45 15.55,0 15,0 L15,0 Z M11,7 L10,7 L10,6 L11,6 L11,7 L11,7 Z M15,7 L12,7 L12,6 L15,6 L15,7 L15,7 Z M15,5 L11,5 L11,1 L15,1 L15,5 L15,5 Z M4,5 L3,5 L3,4 L4,4 L4,5 L4,5 Z M4,3 L3,3 L3,2 L4,2 L4,3 L4,3 Z M2,1 L8,1 L8,0 L1,0 C0.45,0 0,0.45 0,1 L0,13 C0,13.55 0.45,14 1,14 L3,14 L3,16 L4.5,14.5 L6,16 L6,14 L11,14 C11.55,14 12,13.55 12,13 L12,10 L2,10 L2,1 L2,1 Z M11,11 L11,13 L6,13 L6,12 L3,12 L3,13 L1,13 L1,11 L11,11 L11,11 Z M3,8 L4,8 L4,9 L3,9 L3,8 L3,8 Z M4,7 L3,7 L3,6 L4,6 L4,7 L4,7 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-force-push.svg b/htdocs/theme/common/octicons/lib/svg/repo-force-push.svg
deleted file mode 100644
index a9cb1d62609..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/repo-force-push.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>repo-force-push</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="repo-force-push" fill="#000000">
-            <path d="M10,9 L8,9 L8,16 L6,16 L6,9 L4,9 L6.25,6 L4,6 L7,2 L10,6 L7.75,6 L10,9 L10,9 Z M11,0 L1,0 C0.45,0 0,0.45 0,1 L0,13 C0,13.55 0.45,14 1,14 L5,14 L5,13 L1,13 L1,11 L5,11 L5,10 L2,10 L2,1 L11,1 L11,10 L9,10 L9,11 L11,11 L11,13 L9,13 L9,14 L11,14 C11.55,14 12,13.55 12,13 L12,1 C12,0.45 11.55,0 11,0 L11,0 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-forked.svg b/htdocs/theme/common/octicons/lib/svg/repo-forked.svg
deleted file mode 100644
index b1db2556a49..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/repo-forked.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>repo-forked</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="repo-forked" fill="#000000">
-            <path d="M8,1 C6.89,1 6,1.89 6,3 C6,3.73 6.41,4.38 7,4.72 L7,6 L5,8 L3,6 L3,4.72 C3.59,4.38 4,3.74 4,3 C4,1.89 3.11,1 2,1 C0.89,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,6.5 L4,9.5 L4,11.28 C3.41,11.62 3,12.26 3,13 C3,14.11 3.89,15 5,15 C6.11,15 7,14.11 7,13 C7,12.27 6.59,11.62 6,11.28 L6,9.5 L9,6.5 L9,4.72 C9.59,4.38 10,3.74 10,3 C10,1.89 9.11,1 8,1 L8,1 Z M2,4.2 C1.34,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 C2.65,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 L2,4.2 Z M5,14.2 C4.34,14.2 3.8,13.65 3.8,13 C3.8,12.35 4.35,11.8 5,11.8 C5.65,11.8 6.2,12.35 6.2,13 C6.2,13.65 5.65,14.2 5,14.2 L5,14.2 Z M8,4.2 C7.34,4.2 6.8,3.65 6.8,3 C6.8,2.35 7.35,1.8 8,1.8 C8.65,1.8 9.2,2.35 9.2,3 C9.2,3.65 8.65,4.2 8,4.2 L8,4.2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-pull.svg b/htdocs/theme/common/octicons/lib/svg/repo-pull.svg
deleted file mode 100644
index 9ca11006c80..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/repo-pull.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>repo-pull</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="repo-pull" fill="#000000">
-            <path d="M13,8 L13,6 L7,6 L7,4 L13,4 L13,2 L16,5 L13,8 L13,8 Z M4,2 L3,2 L3,3 L4,3 L4,2 L4,2 Z M11,7 L12,7 L12,13 C12,13.55 11.55,14 11,14 L6,14 L6,16 L4.5,14.5 L3,16 L3,14 L1,14 C0.45,14 0,13.55 0,13 L0,1 C0,0.45 0.45,0 1,0 L11,0 C11.55,0 12,0.45 12,1 L12,3 L11,3 L11,1 L2,1 L2,10 L11,10 L11,7 L11,7 Z M11,11 L1,11 L1,13 L3,13 L3,12 L6,12 L6,13 L11,13 L11,11 L11,11 Z M4,6 L3,6 L3,7 L4,7 L4,6 L4,6 Z M4,4 L3,4 L3,5 L4,5 L4,4 L4,4 Z M3,9 L4,9 L4,8 L3,8 L3,9 L3,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-push.svg b/htdocs/theme/common/octicons/lib/svg/repo-push.svg
deleted file mode 100644
index be7433ce792..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/repo-push.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>repo-push</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="repo-push" fill="#000000">
-            <path d="M4,3 L3,3 L3,2 L4,2 L4,3 L4,3 Z M3,5 L4,5 L4,4 L3,4 L3,5 L3,5 Z M7,5 L4,9 L6,9 L6,16 L8,16 L8,9 L10,9 L7,5 L7,5 Z M11,0 L1,0 C0.45,0 0,0.45 0,1 L0,13 C0,13.55 0.45,14 1,14 L5,14 L5,13 L1,13 L1,11 L5,11 L5,10 L2,10 L2,1 L11.02,1 L11,10 L9,10 L9,11 L11,11 L11,13 L9,13 L9,14 L11,14 C11.55,14 12,13.55 12,13 L12,1 C12,0.45 11.55,0 11,0 L11,0 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo.svg b/htdocs/theme/common/octicons/lib/svg/repo.svg
deleted file mode 100644
index 613f72d52f3..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/repo.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>repo</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="repo" fill="#000000">
-            <path d="M4,9 L3,9 L3,8 L4,8 L4,9 L4,9 Z M4,6 L3,6 L3,7 L4,7 L4,6 L4,6 Z M4,4 L3,4 L3,5 L4,5 L4,4 L4,4 Z M4,2 L3,2 L3,3 L4,3 L4,2 L4,2 Z M12,1 L12,13 C12,13.55 11.55,14 11,14 L6,14 L6,16 L4.5,14.5 L3,16 L3,14 L1,14 C0.45,14 0,13.55 0,13 L0,1 C0,0.45 0.45,0 1,0 L11,0 C11.55,0 12,0.45 12,1 L12,1 Z M11,11 L1,11 L1,13 L3,13 L3,12 L6,12 L6,13 L11,13 L11,11 L11,11 Z M11,1 L2,1 L2,10 L11,10 L11,1 L11,1 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/rocket.svg b/htdocs/theme/common/octicons/lib/svg/rocket.svg
deleted file mode 100644
index 1f227b7dae8..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/rocket.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>rocket</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="rocket" fill="#000000">
-            <path d="M12.17,3.83 C11.9,3.56 11.7,3.28 11.54,2.95 C11.38,2.64 11.27,2.29 11.2,1.93 C10.62,2.26 10.04,2.63 9.47,3.06 C8.89,3.5 8.33,4 7.78,4.54 C7.08,5.24 6.45,6.35 6,6.99 L3,6.99 L0,10 L3,10 L5,8 C4.66,8.77 3.98,10.98 4,11 L5,12 C5.02,12.02 7.23,11.36 8,11 L6,13 L6,16 L9,13 L9,10 C9.64,9.55 10.75,8.91 11.45,8.22 C12,7.67 12.5,7.09 12.92,6.52 C13.36,5.94 13.73,5.36 14.06,4.8 C13.7,4.72 13.36,4.61 13.03,4.46 C12.72,4.3 12.44,4.1 12.17,3.83 M16,0 C16,0 15.91,0.38 15.7,1.06 C15.5,1.76 15.15,2.64 14.64,3.72 C13.94,3.64 13.37,3.39 12.98,3 C12.59,2.61 12.35,2.06 12.28,1.36 C13.36,0.84 14.23,0.48 14.92,0.28 C15.62,0.08 16,0 16,0" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/rss.svg b/htdocs/theme/common/octicons/lib/svg/rss.svg
deleted file mode 100644
index 6d82aaf8c20..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/rss.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>rss</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="rss" fill="#000000">
-            <path d="M2,13 L0,13 L0,11 C1.11,11 2,11.89 2,13 L2,13 Z M0,3 L0,4 C4.97,4 9,8.03 9,13 L10,13 C10,7.48 5.52,3 0,3 L0,3 Z M0,7 L0,8 C2.75,8 5,10.25 5,13 L6,13 C6,9.69 3.31,7 0,7 L0,7 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/ruby.svg b/htdocs/theme/common/octicons/lib/svg/ruby.svg
deleted file mode 100644
index fff3baf760c..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/ruby.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>ruby</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="ruby" fill="#000000">
-            <path d="M13,6 L8,11 L8,4 L11,4 L13,6 L13,6 Z M16,6 L8,14 L0,6 L4,2 L12,2 L16,6 L16,6 Z M8,12.5 L14.5,6 L11.5,3 L4.5,3 L1.5,6 L8,12.5 L8,12.5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/screen-full.svg b/htdocs/theme/common/octicons/lib/svg/screen-full.svg
deleted file mode 100644
index 302ef1725d4..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/screen-full.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>screen-full</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="screen-full" fill="#000000">
-            <path d="M13,10 L14,10 L14,13 C14,13.546875 13.546875,14 13,14 L10,14 L10,13 L13,13 L13,10 L13,10 L13,10 Z M1,10 L0,10 L0,13 C0,13.546875 0.453125,14 1,14 L4,14 L4,13 L1,13 L1,10 L1,10 L1,10 Z M1,3 L4,3 L4,2 L1,2 C0.453125,2 0,2.453125 0,3 L0,6 L1,6 L1,3 L1,3 L1,3 Z M2,4 L12,4 L12,12 L2,12 L2,4 L2,4 L2,4 Z M4,10 L10,10 L10,6 L4,6 L4,10 L4,10 L4,10 Z M10,2 L10,3 L13,3 L13,6 L14,6 L14,3 C14,2.453125 13.546875,2 13,2 L10,2 L10,2 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/screen-normal.svg b/htdocs/theme/common/octicons/lib/svg/screen-normal.svg
deleted file mode 100644
index e144fc5a04d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/screen-normal.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>screen-normal</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="screen-normal" fill="#000000">
-            <path d="M2,4 L0,4 L0,3 L2,3 L2,1 L3,1 L3,3 C3,3.546875 2.546875,4 2,4 L2,4 L2,4 Z M2,12 L0,12 L0,13 L2,13 L2,15 L3,15 L3,13 C3,12.453125 2.546875,12 2,12 L2,12 L2,12 Z M11,10 C11,10.546875 10.546875,11 10,11 L4,11 C3.453125,11 3,10.546875 3,10 L3,6 C3,5.453125 3.453125,5 4,5 L10,5 C10.546875,5 11,5.453125 11,6 L11,10 L11,10 L11,10 Z M9,7 L5,7 L5,9 L9,9 L9,7 L9,7 L9,7 Z M11,13 L11,15 L12,15 L12,13 L14,13 L14,12 L12,12 C11.453125,12 11,12.453125 11,13 L11,13 L11,13 Z M12,3 L12,1 L11,1 L11,3 C11,3.546875 11.453125,4 12,4 L14,4 L14,3 L12,3 L12,3 L12,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/search.svg b/htdocs/theme/common/octicons/lib/svg/search.svg
deleted file mode 100644
index 547eb505ef6..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/search.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>search</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="search" fill="#000000">
-            <path d="M15.7,13.3 L11.89,9.47 C12.59,8.49 13,7.3 13,6 C13,2.69 10.31,0 7,0 C3.69,0 1,2.69 1,6 C1,9.31 3.69,12 7,12 C8.3,12 9.48,11.59 10.47,10.89 L14.3,14.7 C14.49,14.9 14.75,15 15,15 C15.25,15 15.52,14.91 15.7,14.7 C16.09,14.31 16.09,13.68 15.7,13.29 L15.7,13.3 Z M7,10.7 C4.41,10.7 2.3,8.59 2.3,6 C2.3,3.41 4.41,1.3 7,1.3 C9.59,1.3 11.7,3.41 11.7,6 C11.7,8.59 9.59,10.7 7,10.7 L7,10.7 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/server.svg b/htdocs/theme/common/octicons/lib/svg/server.svg
deleted file mode 100644
index 3f439fd5a7c..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/server.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>server</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="server" fill="#000000">
-            <path d="M11,6 L1,6 C0.45,6 0,6.45 0,7 L0,9 C0,9.55 0.45,10 1,10 L11,10 C11.55,10 12,9.55 12,9 L12,7 C12,6.45 11.55,6 11,6 L11,6 Z M2,9 L1,9 L1,7 L2,7 L2,9 L2,9 Z M4,9 L3,9 L3,7 L4,7 L4,9 L4,9 Z M6,9 L5,9 L5,7 L6,7 L6,9 L6,9 Z M8,9 L7,9 L7,7 L8,7 L8,9 L8,9 Z M11,1 L1,1 C0.45,1 0,1.45 0,2 L0,4 C0,4.55 0.45,5 1,5 L11,5 C11.55,5 12,4.55 12,4 L12,2 C12,1.45 11.55,1 11,1 L11,1 Z M2,4 L1,4 L1,2 L2,2 L2,4 L2,4 Z M4,4 L3,4 L3,2 L4,2 L4,4 L4,4 Z M6,4 L5,4 L5,2 L6,2 L6,4 L6,4 Z M8,4 L7,4 L7,2 L8,2 L8,4 L8,4 Z M11,3 L10,3 L10,2 L11,2 L11,3 L11,3 Z M11,11 L1,11 C0.45,11 0,11.45 0,12 L0,14 C0,14.55 0.45,15 1,15 L11,15 C11.55,15 12,14.55 12,14 L12,12 C12,11.45 11.55,11 11,11 L11,11 Z M2,14 L1,14 L1,12 L2,12 L2,14 L2,14 Z M4,14 L3,14 L3,12 L4,12 L4,14 L4,14 Z M6,14 L5,14 L5,12 L6,12 L6,14 L6,14 Z M8,14 L7,14 L7,12 L8,12 L8,14 L8,14 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/settings.svg b/htdocs/theme/common/octicons/lib/svg/settings.svg
deleted file mode 100644
index 70f860c411e..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/settings.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>settings</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="settings" fill="#000000">
-            <path d="M4,7 L3,7 L3,2 L4,2 L4,7 L4,7 Z M3,14 L4,14 L4,11 L3,11 L3,14 L3,14 Z M8,14 L9,14 L9,8 L8,8 L8,14 L8,14 Z M13,14 L14,14 L14,12 L13,12 L13,14 L13,14 Z M14,2 L13,2 L13,8 L14,8 L14,2 L14,2 Z M9,2 L8,2 L8,4 L9,4 L9,2 L9,2 Z M5,8 L2,8 C1.45,8 1,8.45 1,9 C1,9.55 1.45,10 2,10 L5,10 C5.55,10 6,9.55 6,9 C6,8.45 5.55,8 5,8 L5,8 Z M10,5 L7,5 C6.45,5 6,5.45 6,6 C6,6.55 6.45,7 7,7 L10,7 C10.55,7 11,6.55 11,6 C11,5.45 10.55,5 10,5 L10,5 Z M15,9 L12,9 C11.45,9 11,9.45 11,10 C11,10.55 11.45,11 12,11 L15,11 C15.55,11 16,10.55 16,10 C16,9.45 15.55,9 15,9 L15,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/shield.svg b/htdocs/theme/common/octicons/lib/svg/shield.svg
deleted file mode 100644
index f83a8d0c549..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/shield.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>shield</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="shield" fill="#000000">
-            <path d="M7,0 L0,2 L0,8.02 C0,12.69 5.31,16 7,16 C8.69,16 14,12.69 14,8.02 L14,2 L7,0 L7,0 Z M5,11 L6.14,8.2 C6.19,7.97 6.08,7.73 5.89,7.61 C5.33,7.25 5,6.66 5,6 C5,4.91 5.89,4 6.98,4 C8.06,4 9,4.91 9,6 C9,6.66 8.67,7.25 8.11,7.61 C7.92,7.74 7.81,7.97 7.86,8.2 L9,11 L5,11 L5,11 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/sign-in.svg b/htdocs/theme/common/octicons/lib/svg/sign-in.svg
deleted file mode 100644
index 99bc42b6ccc..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/sign-in.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>sign-in</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="sign-in" fill="#000000">
-            <path d="M7,6.75 L7,12 L11,12 L11,8 L12,8 L12,12 C12,12.55 11.55,13 11,13 L7,13 L7,16 L1.55,13.28 C1.22,13.11 1,12.76 1,12.37 L1,1 C1,0.45 1.45,0 2,0 L11,0 C11.55,0 12,0.45 12,1 L12,4 L11,4 L11,1 L3,1 L7,3 L7,5.25 L10,3 L10,5 L14,5 L14,7 L10,7 L10,9 L7,6.75 L7,6.75 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/sign-out.svg b/htdocs/theme/common/octicons/lib/svg/sign-out.svg
deleted file mode 100644
index dca0faa5cb9..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/sign-out.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>sign-out</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="sign-out" fill="#000000">
-            <path d="M12,9 L12,7 L8,7 L8,5 L12,5 L12,3 L16,6 L12,9 L12,9 Z M10,12 L6,12 L6,3 L2,1 L10,1 L10,4 L11,4 L11,1 C11,0.45 10.55,0 10,0 L1,0 C0.45,0 0,0.45 0,1 L0,12.38 C0,12.77 0.22,13.11 0.55,13.29 L6,16.01 L6,13 L10,13 C10.55,13 11,12.55 11,12 L11,8 L10,8 L10,12 L10,12 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/smiley.svg b/htdocs/theme/common/octicons/lib/svg/smiley.svg
deleted file mode 100644
index 6041ee91f61..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/smiley.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>smiley</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="smiley" fill="#000000">
-            <path d="M8,0 C3.58,0 0,3.58 0,8 C0,12.42 3.58,16 8,16 C12.42,16 16,12.42 16,8 C16,3.58 12.42,0 8,0 L8,0 Z M12.81,12.81 C12.18,13.44 11.45,13.92 10.64,14.26 C9.81,14.62 8.92,14.79 8,14.79 C7.08,14.79 6.19,14.62 5.36,14.26 C4.55,13.92 3.81,13.43 3.19,12.81 C2.57,12.19 2.08,11.45 1.74,10.64 C1.38,9.81 1.21,8.92 1.21,8 C1.21,7.08 1.38,6.19 1.74,5.36 C2.08,4.55 2.57,3.81 3.19,3.19 C3.81,2.57 4.55,2.08 5.36,1.74 C6.19,1.38 7.08,1.21 8,1.21 C8.92,1.21 9.81,1.38 10.64,1.74 C11.45,2.08 12.19,2.57 12.81,3.19 C13.43,3.81 13.92,4.55 14.26,5.36 C14.62,6.19 14.79,7.08 14.79,8 C14.79,8.92 14.62,9.81 14.26,10.64 C13.92,11.45 13.43,12.19 12.81,12.81 L12.81,12.81 Z M4,6.8 L4,6.21 C4,5.55 4.53,5.02 5.2,5.02 L5.79,5.02 C6.45,5.02 6.98,5.55 6.98,6.21 L6.98,6.8 C6.98,7.47 6.45,8 5.79,8 L5.2,8 C4.53,8 4,7.47 4,6.8 L4,6.8 Z M9,6.8 L9,6.21 C9,5.55 9.53,5.02 10.2,5.02 L10.79,5.02 C11.45,5.02 11.98,5.55 11.98,6.21 L11.98,6.8 C11.98,7.47 11.45,8 10.79,8 L10.2,8 C9.53,8 9,7.47 9,6.8 L9,6.8 Z M13,10 C12.28,11.88 10.09,13 8,13 C5.91,13 3.72,11.87 3,10 C2.86,9.61 3.23,9 3.66,9 L12.25,9 C12.66,9 13.14,9.61 13,10 L13,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/squirrel.svg b/htdocs/theme/common/octicons/lib/svg/squirrel.svg
deleted file mode 100644
index 0cff65843f9..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/squirrel.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>squirrel</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="squirrel" fill="#000000">
-            <path d="M12,1 C9.79,1 8,2.31 8,3.92 C8,5.86 8.5,6.95 8,10 C8,5.5 5.23,3.66 4,3.66 C4.05,3.16 3.52,3 3.52,3 C3.52,3 3.3,3.11 3.22,3.34 C2.95,3.03 2.66,3.07 2.66,3.07 L2.53,3.65 C2.53,3.65 0.7,4.29 0.68,6.87 C0.88,7.2 2.21,7.47 3.15,7.3 C4.04,7.35 3.82,8.09 3.62,8.29 C2.78,9.13 2,8 1,8 C0,8 0,9 1,9 C2,9 2,10 4,10 C0.91,11.2 4,14 4,14 L3,14 C2,14 2,15 2,15 L8,15 C11,15 13,14 13,11.53 C13,10.68 12.57,9.74 12,9 C10.89,7.54 12.23,6.32 13,7 C13.77,7.68 16,8 16,5 C16,2.79 14.21,1 12,1 L12,1 Z M2.5,6 C2.22,6 2,5.78 2,5.5 C2,5.22 2.22,5 2.5,5 C2.78,5 3,5.22 3,5.5 C3,5.78 2.78,6 2.5,6 L2.5,6 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/star.svg b/htdocs/theme/common/octicons/lib/svg/star.svg
deleted file mode 100644
index 9d8ca6a7fc0..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/star.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>star</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="star" fill="#000000">
-            <polygon id="Shape" points="14 6 9.1 5.36 7 1 4.9 5.36 0 6 3.6 9.26 2.67 14 7 11.67 11.33 14 10.4 9.26"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/stop.svg b/htdocs/theme/common/octicons/lib/svg/stop.svg
deleted file mode 100644
index bc74f95f8d7..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/stop.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>stop</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="stop" fill="#000000">
-            <path d="M10,1 L4,1 L0,5 L0,11 L4,15 L10,15 L14,11 L14,5 L10,1 L10,1 Z M13,10.5 L9.5,14 L4.5,14 L1,10.5 L1,5.5 L4.5,2 L9.5,2 L13,5.5 L13,10.5 L13,10.5 Z M6,4 L8,4 L8,9 L6,9 L6,4 L6,4 Z M6,10 L8,10 L8,12 L6,12 L6,10 L6,10 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/sync.svg b/htdocs/theme/common/octicons/lib/svg/sync.svg
deleted file mode 100644
index 59b5f3c4000..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/sync.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>sync</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="sync" fill="#000000">
-            <path d="M10.24,7.4 C10.43,8.68 10.04,10.02 9.04,11 C7.57,12.45 5.3,12.63 3.63,11.54 L4.8,10.4 L0.5,9.8 L1.1,14 L2.41,12.74 C4.77,14.48 8.11,14.31 10.25,12.2 C11.49,10.97 12.06,9.35 11.99,7.74 L10.24,7.4 L10.24,7.4 Z M2.96,5 C4.43,3.55 6.7,3.37 8.37,4.46 L7.2,5.6 L11.5,6.2 L10.9,2 L9.59,3.26 C7.23,1.52 3.89,1.69 1.74,3.8 C0.5,5.03 -0.06,6.65 0.01,8.26 L1.76,8.61 C1.57,7.33 1.96,5.98 2.96,5 L2.96,5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/tag.svg b/htdocs/theme/common/octicons/lib/svg/tag.svg
deleted file mode 100644
index 1b425c8a69d..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/tag.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>tag</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="tag" fill="#000000">
-            <path d="M7.73,1.73 C7.26,1.26 6.62,1 5.96,1 L3.5,1 C2.13,1 1,2.13 1,3.5 L1,5.97 C1,6.63 1.27,7.27 1.73,7.74 L7.79,13.8 C8.18,14.19 8.81,14.19 9.2,13.8 L13.79,9.21 C14.18,8.82 14.18,8.19 13.79,7.8 L7.73,1.73 L7.73,1.73 Z M2.38,7.09 C2.07,6.79 1.91,6.39 1.91,5.96 L1.91,3.5 C1.91,2.62 2.63,1.91 3.5,1.91 L5.97,1.91 C6.39,1.91 6.8,2.07 7.1,2.38 L13.24,8.51 L8.51,13.24 L2.38,7.09 L2.38,7.09 Z M3.01,3 L5.01,3 L5.01,5 L3,5 L3,3 L3.01,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/tasklist.svg b/htdocs/theme/common/octicons/lib/svg/tasklist.svg
deleted file mode 100644
index e9291f70a26..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/tasklist.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>tasklist</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="tasklist" fill="#000000">
-            <path d="M15.41,9 L7.59,9 C7,9 7,8.59 7,8 C7,7.41 7,7 7.59,7 L15.4,7 C15.99,7 15.99,7.41 15.99,8 C15.99,8.59 15.99,9 15.4,9 L15.41,9 Z M9.59,4 C9,4 9,3.59 9,3 C9,2.41 9,2 9.59,2 L15.4,2 C15.99,2 15.99,2.41 15.99,3 C15.99,3.59 15.99,4 15.4,4 L9.59,4 L9.59,4 Z M0,3.91 L1.41,2.61 L3,4.2 L7.09,0 L8.5,1.41 L3,6.91 L0,3.91 L0,3.91 Z M7.59,12 L15.4,12 C15.99,12 15.99,12.41 15.99,13 C15.99,13.59 15.99,14 15.4,14 L7.59,14 C7,14 7,13.59 7,13 C7,12.41 7,12 7.59,12 L7.59,12 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/telescope.svg b/htdocs/theme/common/octicons/lib/svg/telescope.svg
deleted file mode 100644
index 961891fcf90..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/telescope.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>telescope</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="telescope" fill="#000000">
-            <path d="M8,9 L11,15 L10,15 L8,11 L8,16 L7,16 L7,10 L5,15 L4,15 L6,10 L8,9 L8,9 Z M7,0 L6,0 L6,1 L7,1 L7,0 L7,0 Z M5,3 L4,3 L4,4 L5,4 L5,3 L5,3 Z M2,1 L1,1 L1,2 L2,2 L2,1 L2,1 Z M0.63,9 C0.41,9.16 0.35,9.44 0.47,9.67 L1.02,10.59 C1.15,10.82 1.43,10.9 1.66,10.79 L3.05,10.13 L1.89,8.13 L0.62,8.99 L0.63,9 Z M8.52,3.61 L2.72,7.56 L3.95,9.7 L10.28,6.67 L8.51,3.61 L8.52,3.61 Z M12.74,4.89 L11.27,2.37 C11.13,2.12 10.8,2.04 10.55,2.2 L9.35,3.03 L11.19,6.23 L12.52,5.59 C12.79,5.46 12.88,5.15 12.74,4.89 L12.74,4.89 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/terminal.svg b/htdocs/theme/common/octicons/lib/svg/terminal.svg
deleted file mode 100644
index 9980e86827f..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/terminal.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>terminal</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="terminal" fill="#000000">
-            <path d="M7,10 L11,10 L11,11 L7,11 L7,10 L7,10 Z M4,11 L7,8 L4,5 L3.25,5.75 L5.5,8 L3.25,10.25 L4,11 L4,11 Z M14,3 L14,13 C14,13.55 13.55,14 13,14 L1,14 C0.45,14 0,13.55 0,13 L0,3 C0,2.45 0.45,2 1,2 L13,2 C13.55,2 14,2.45 14,3 L14,3 Z M13,3 L1,3 L1,13 L13,13 L13,3 L13,3 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/text-size.svg b/htdocs/theme/common/octicons/lib/svg/text-size.svg
deleted file mode 100644
index 9c40dd04ab3..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/text-size.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="16px" viewBox="0 0 18 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>text-size</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="text-size" fill="#000000">
-            <path d="M13.62,9.08 L12.1,3.66 L12.04,3.66 L10.54,9.08 L13.62,9.08 Z M5.7,10.13 C5.7,10.13 4.68,6.52 4.53,6.02 L4.45,6.02 L3.32,10.13 L5.7,10.13 Z M17.31,14 L15.06,14 L14.11,10.75 L10.04,10.75 L9.09,14 L6.84,14 L6.15,11.67 L2.87,11.67 L2.17,14 L0,14 L3.3,4.41 L5.8,4.41 L7.97,10.75 L10.86,2 L13.38,2 L17.32,14 L17.31,14 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/three-bars.svg b/htdocs/theme/common/octicons/lib/svg/three-bars.svg
deleted file mode 100644
index 585dfeee331..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/three-bars.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>three-bars</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="three-bars" fill="#000000">
-            <path d="M11.41,9 L0.59,9 C0,9 0,8.59 0,8 C0,7.41 0,7 0.59,7 L11.4,7 C11.99,7 11.99,7.41 11.99,8 C11.99,8.59 11.99,9 11.4,9 L11.41,9 Z M11.41,5 L0.59,5 C0,5 0,4.59 0,4 C0,3.41 0,3 0.59,3 L11.4,3 C11.99,3 11.99,3.41 11.99,4 C11.99,4.59 11.99,5 11.4,5 L11.41,5 Z M0.59,11 L11.4,11 C11.99,11 11.99,11.41 11.99,12 C11.99,12.59 11.99,13 11.4,13 L0.59,13 C0,13 0,12.59 0,12 C0,11.41 0,11 0.59,11 L0.59,11 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/thumbsdown.svg b/htdocs/theme/common/octicons/lib/svg/thumbsdown.svg
deleted file mode 100644
index e0e642d9455..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/thumbsdown.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>thumbsdown</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="thumbsdown" fill="#000000">
-            <path d="M15.98,7.83 L15.01,1.88 C14.84,0.5 13.13,0 12,0 L5.69,0 C5.49,0 5.31,0.05 5.16,0.14 L3.72,1 L2,1 C0.94,1 0,1.94 0,3 L0,7 C0,8.06 0.94,9.02 2,9 L4,9 C4.91,9 5.39,9.45 6.39,10.55 C7.3,11.55 7.27,12.35 7.02,13.82 C6.94,14.32 7.08,14.82 7.44,15.24 C7.83,15.71 8.42,16.01 9,16.01 C10.83,16.01 12,12.29 12,10.99 L11.98,10.01 L12,10.01 L14.02,10.01 C15.18,10.01 15.97,9.21 16,8.04 C16,7.98 16.02,7.91 15.98,7.84 L15.98,7.83 Z M14.01,9.02 L12.02,9.02 C11.32,9.02 10.99,9.3 10.99,9.99 L11.02,11.02 C11.02,12.29 9.85,15.02 9.02,15.02 C8.52,15.02 7.94,14.52 8.02,14.02 C8.27,12.44 8.36,11.24 7.13,9.88 C6.11,8.75 5.36,8 4,8 L4,2 L5.67,1 L12,1 C12.73,1 13.95,1.31 14,2 L14.02,2.02 L15.02,8.02 C14.99,8.66 14.64,9.02 14.02,9.02 L14.01,9.02 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/thumbsup.svg b/htdocs/theme/common/octicons/lib/svg/thumbsup.svg
deleted file mode 100644
index a9bc8529976..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/thumbsup.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>thumbsup</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="thumbsup" fill="#000000">
-            <path d="M14,14 C13.95,14.69 12.73,15 12,15 L5.67,15 L4,14 L4,8 C5.36,8 6.11,7.25 7.13,6.12 C8.36,4.76 8.27,3.56 8.01,1.99 C7.93,1.49 8.51,0.99 9.01,0.99 C9.84,0.99 11.01,3.72 11.01,4.99 L10.99,6.02 C10.99,6.71 11.32,6.99 12.01,6.99 L14.01,6.99 C14.64,6.99 14.99,7.35 15.01,7.99 L14.01,13.99 L14,14 Z M14,6 L12,6 L11.98,6 L12,5.02 C12,3.72 10.83,0 9,0 C8.42,0 7.83,0.3 7.44,0.77 C7.08,1.18 6.94,1.68 7.02,2.18 C7.27,3.66 7.3,4.46 6.39,5.46 C5.39,6.55 4.91,7.01 4,7.01 L2,7.01 C0.94,7 0,7.94 0,9 L0,13 C0,14.06 0.94,15 2,15 L3.72,15 L5.16,15.86 C5.32,15.95 5.49,16 5.68,16 L12.01,16 C13.14,16 14.85,15.5 15.01,14.12 L15.99,8.17 C16.01,8.09 16.01,8.03 16.01,7.97 C15.98,6.8 15.17,6 14.01,6 L14,6 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/tools.svg b/htdocs/theme/common/octicons/lib/svg/tools.svg
deleted file mode 100644
index 52aafd2555e..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/tools.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>tools</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="tools" fill="#000000">
-            <path d="M4.48,7.27 C4.74,7.53 5.76,8.6 5.76,8.6 L6.32,8.02 L5.44,7.11 L7.13,5.31 C7.13,5.31 6.37,4.57 6.7,4.86 C7.02,3.67 6.73,2.35 5.83,1.42 C4.93,0.5 3.66,0.2 2.52,0.51 L4.45,2.51 L3.94,4.47 L2.05,4.99 L0.12,2.99 C-0.19,4.17 0.1,5.48 1,6.4 C1.94,7.38 3.29,7.66 4.48,7.27 L4.48,7.27 Z M10.92,9.21 L8.59,11.51 L12.43,15.49 C12.74,15.82 13.16,15.98 13.57,15.98 C13.98,15.98 14.39,15.82 14.71,15.49 C15.34,14.84 15.34,13.79 14.71,13.14 L10.92,9.21 L10.92,9.21 Z M16,2.53 L13.55,0 L6.33,7.46 L7.21,8.37 L2.9,12.83 L1.91,13.36 L0.52,15.63 L0.87,16 L3.07,14.56 L3.58,13.54 L7.9,9.08 L8.78,9.99 L16,2.53 L16,2.53 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/trashcan.svg b/htdocs/theme/common/octicons/lib/svg/trashcan.svg
deleted file mode 100644
index 4a4ad77d458..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/trashcan.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>trashcan</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="trashcan" fill="#000000">
-            <path d="M11,2 L9,2 C9,1.45 8.55,1 8,1 L5,1 C4.45,1 4,1.45 4,2 L2,2 C1.45,2 1,2.45 1,3 L1,4 C1,4.55 1.45,5 2,5 L2,14 C2,14.55 2.45,15 3,15 L10,15 C10.55,15 11,14.55 11,14 L11,5 C11.55,5 12,4.55 12,4 L12,3 C12,2.45 11.55,2 11,2 L11,2 Z M10,14 L3,14 L3,5 L4,5 L4,13 L5,13 L5,5 L6,5 L6,13 L7,13 L7,5 L8,5 L8,13 L9,13 L9,5 L10,5 L10,14 L10,14 Z M11,4 L2,4 L2,3 L11,3 L11,4 L11,4 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/triangle-down.svg b/htdocs/theme/common/octicons/lib/svg/triangle-down.svg
deleted file mode 100644
index dba0fc4ac70..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/triangle-down.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>triangle-down</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="triangle-down" fill="#000000">
-            <polygon id="Shape" points="0 5 6 11 12 5"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/triangle-left.svg b/htdocs/theme/common/octicons/lib/svg/triangle-left.svg
deleted file mode 100644
index 7011b15bbe2..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/triangle-left.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>triangle-left</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="triangle-left" fill="#000000">
-            <polygon id="Shape" points="6 2 0 8 6 14"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/triangle-right.svg b/htdocs/theme/common/octicons/lib/svg/triangle-right.svg
deleted file mode 100644
index 8abb5e92e25..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/triangle-right.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>triangle-right</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="triangle-right" fill="#000000">
-            <polygon id="Shape" points="0 14 6 8 0 2"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/triangle-up.svg b/htdocs/theme/common/octicons/lib/svg/triangle-up.svg
deleted file mode 100644
index e6488cf35f3..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/triangle-up.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>triangle-up</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="triangle-up" fill="#000000">
-            <polygon id="Shape" points="12 11 6 5 0 11"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/unfold.svg b/htdocs/theme/common/octicons/lib/svg/unfold.svg
deleted file mode 100644
index 3f40744b9d9..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/unfold.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>unfold</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="unfold" fill="#000000">
-            <path d="M11.5,7.5 L14,10 C14,10.55 13.55,11 13,11 L9,11 L9,10 L12.5,10 L10.5,8 L3.5,8 L1.5,10 L5,10 L5,11 L1,11 C0.45,11 0,10.55 0,10 L2.5,7.5 L0,5 C0,4.45 0.45,4 1,4 L5,4 L5,5 L1.5,5 L3.5,7 L10.5,7 L12.5,5 L9,5 L9,4 L13,4 C13.55,4 14,4.45 14,5 L11.5,7.5 L11.5,7.5 Z M6,6 L8,6 L8,3 L10,3 L7,0 L4,3 L6,3 L6,6 L6,6 Z M8,9 L6,9 L6,12 L4,12 L7,15 L10,12 L8,12 L8,9 L8,9 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/unmute.svg b/htdocs/theme/common/octicons/lib/svg/unmute.svg
deleted file mode 100644
index 71a5624a738..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/unmute.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>unmute</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="unmute" fill="#000000">
-            <path d="M12,8.02 C12,9.11 11.55,10.11 10.83,10.85 L10.16,10.18 C10.71,9.62 11.05,8.87 11.05,8.02 C11.05,7.17 10.71,6.41 10.16,5.86 L10.83,5.19 C11.55,5.91 12,6.91 12,8.02 L12,8.02 Z M7.72,2.28 L4,6 L2,6 C1.45,6 1,6.45 1,7 L1,9 C1,9.55 1.45,10 2,10 L4,10 L7.72,13.72 C8.19,14.19 9,13.86 9,13.19 L9,2.81 C9,2.14 8.19,1.81 7.72,2.28 L7.72,2.28 Z M13.66,2.36 L12.99,3.03 C14.27,4.31 15.05,6.06 15.05,8.01 C15.05,9.95 14.27,11.71 12.99,12.99 L13.66,13.66 C15.11,12.21 16,10.21 16,8 C16,5.78 15.11,3.78 13.66,2.34 L13.66,2.36 Z M12.25,3.77 L11.56,4.44 C12.48,5.36 13.04,6.63 13.04,8.02 C13.04,9.41 12.48,10.68 11.56,11.58 L12.25,12.25 C13.33,11.17 14,9.67 14,8.02 C14,6.37 13.33,4.86 12.25,3.77 L12.25,3.77 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/unverified.svg b/htdocs/theme/common/octicons/lib/svg/unverified.svg
deleted file mode 100644
index c91b44e5f4a..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/unverified.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>unverified</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="unverified" fill="#000000">
-            <path d="M15.67,7.06 L14.59,5.72 C14.42,5.5 14.31,5.24 14.28,4.95 L14.09,3.25 C14.01,2.55 13.46,2 12.76,1.92 L11.06,1.73 C10.76,1.7 10.5,1.57 10.28,1.4 L8.94,0.32 C8.39,-0.12 7.61,-0.12 7.06,0.32 L5.72,1.4 C5.5,1.57 5.24,1.68 4.95,1.71 L3.25,1.9 C2.55,1.98 2,2.53 1.92,3.23 L1.73,4.93 C1.7,5.23 1.57,5.49 1.4,5.71 L0.32,7.05 C-0.12,7.6 -0.12,8.38 0.32,8.93 L1.4,10.27 C1.57,10.49 1.68,10.75 1.71,11.04 L1.9,12.74 C1.98,13.44 2.53,13.99 3.23,14.07 L4.93,14.26 C5.23,14.29 5.49,14.42 5.71,14.59 L7.05,15.67 C7.6,16.11 8.38,16.11 8.93,15.67 L10.27,14.59 C10.49,14.42 10.75,14.31 11.04,14.28 L12.74,14.09 C13.44,14.01 13.99,13.46 14.07,12.76 L14.26,11.06 C14.29,10.76 14.42,10.5 14.59,10.28 L15.67,8.94 C16.11,8.39 16.11,7.61 15.67,7.06 L15.67,7.06 Z M9,11.5 C9,11.78 8.78,12 8.5,12 L7.5,12 C7.23,12 7,11.78 7,11.5 L7,10.5 C7,10.22 7.23,10 7.5,10 L8.5,10 C8.78,10 9,10.22 9,10.5 L9,11.5 L9,11.5 Z M10.56,6.61 C10.5,6.78 10.39,6.94 10.26,7.08 C10.13,7.24 10.12,7.27 9.93,7.46 C9.77,7.63 9.62,7.76 9.41,7.91 C9.3,8 9.21,8.1 9.13,8.18 C9.05,8.26 8.99,8.35 8.94,8.45 C8.89,8.55 8.86,8.64 8.83,8.75 C8.8,8.86 8.8,8.88 8.8,9 L7.13,9 C7.13,8.78 7.13,8.69 7.16,8.52 C7.19,8.33 7.24,8.16 7.3,8 C7.36,7.86 7.44,7.72 7.55,7.58 C7.66,7.45 7.78,7.33 7.96,7.2 C8.23,7.01 8.32,6.9 8.44,6.68 C8.56,6.46 8.64,6.3 8.64,6.09 C8.64,5.82 8.58,5.64 8.44,5.51 C8.31,5.38 8.13,5.32 7.86,5.32 C7.77,5.32 7.67,5.34 7.56,5.37 C7.45,5.4 7.39,5.46 7.31,5.53 C7.23,5.6 7.17,5.64 7.11,5.73 C7.05,5.82 7.02,5.87 7.02,6.01 L5.02,6.01 C5.02,5.63 5.15,5.45 5.29,5.18 C5.45,4.91 5.65,4.68 5.9,4.51 C6.15,4.34 6.45,4.21 6.78,4.13 C7.11,4.05 7.48,4 7.87,4 C8.31,4 8.7,4.05 9.04,4.13 C9.38,4.22 9.67,4.35 9.92,4.52 C10.15,4.69 10.33,4.9 10.47,5.15 C10.6,5.4 10.66,5.7 10.66,6.03 C10.66,6.25 10.66,6.45 10.58,6.62 L10.56,6.61 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/verified.svg b/htdocs/theme/common/octicons/lib/svg/verified.svg
deleted file mode 100644
index c0c0a7223e5..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/verified.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>verified</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="verified" fill="#000000">
-            <path d="M15.67,7.06 L14.59,5.72 C14.42,5.5 14.31,5.24 14.28,4.95 L14.09,3.25 C14.01,2.55 13.46,2 12.76,1.92 L11.06,1.73 C10.76,1.7 10.5,1.57 10.28,1.4 L8.94,0.32 C8.39,-0.12 7.61,-0.12 7.06,0.32 L5.72,1.4 C5.5,1.57 5.24,1.68 4.95,1.71 L3.25,1.9 C2.55,1.98 2,2.53 1.92,3.23 L1.73,4.93 C1.7,5.23 1.57,5.49 1.4,5.71 L0.32,7.05 C-0.12,7.6 -0.12,8.38 0.32,8.93 L1.4,10.27 C1.57,10.49 1.68,10.75 1.71,11.04 L1.9,12.74 C1.98,13.44 2.53,13.99 3.23,14.07 L4.93,14.26 C5.23,14.29 5.49,14.42 5.71,14.59 L7.05,15.67 C7.6,16.11 8.38,16.11 8.93,15.67 L10.27,14.59 C10.49,14.42 10.75,14.31 11.04,14.28 L12.74,14.09 C13.44,14.01 13.99,13.46 14.07,12.76 L14.26,11.06 C14.29,10.76 14.42,10.5 14.59,10.28 L15.67,8.94 C16.11,8.39 16.11,7.61 15.67,7.06 L15.67,7.06 Z M6.5,12 L3,8.5 L4.5,7 L6.5,9 L11.5,4 L13,5.55 L6.5,12 L6.5,12 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/versions.svg b/htdocs/theme/common/octicons/lib/svg/versions.svg
deleted file mode 100644
index 62b9c199811..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/versions.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>versions</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="versions" fill="#000000">
-            <path d="M13,3 L7,3 C6.45,3 6,3.45 6,4 L6,12 C6,12.55 6.45,13 7,13 L13,13 C13.55,13 14,12.55 14,12 L14,4 C14,3.45 13.55,3 13,3 L13,3 Z M12,11 L8,11 L8,5 L12,5 L12,11 L12,11 Z M4,4 L5,4 L5,5 L4,5 L4,11 L5,11 L5,12 L4,12 C3.45,12 3,11.55 3,11 L3,5 C3,4.45 3.45,4 4,4 L4,4 Z M1,5 L2,5 L2,6 L1,6 L1,10 L2,10 L2,11 L1,11 C0.45,11 0,10.55 0,10 L0,6 C0,5.45 0.45,5 1,5 L1,5 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/watch.svg b/htdocs/theme/common/octicons/lib/svg/watch.svg
deleted file mode 100644
index 705f441ae5f..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/watch.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>watch</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="watch" fill="#000000">
-            <path d="M6,8 L8,8 L8,9 L5,9 L5,5 L6,5 L6,8 L6,8 Z M12,8 C12,10.22 10.8,12.16 9,13.19 L9,15 C9,15.55 8.55,16 8,16 L4,16 C3.45,16 3,15.55 3,15 L3,13.19 C1.2,12.16 0,10.22 0,8 C0,5.78 1.2,3.84 3,2.81 L3,1 C3,0.45 3.45,0 4,0 L8,0 C8.55,0 9,0.45 9,1 L9,2.81 C10.8,3.84 12,5.78 12,8 L12,8 Z M11,8 C11,5.23 8.77,3 6,3 C3.23,3 1,5.23 1,8 C1,10.77 3.23,13 6,13 C8.77,13 11,10.77 11,8 L11,8 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/x.svg b/htdocs/theme/common/octicons/lib/svg/x.svg
deleted file mode 100644
index 51466da25a4..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/x.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>x</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="x" fill="#000000">
-            <polygon id="Shape" points="7.48 8 11.23 11.75 9.75 13.23 6 9.48 2.25 13.23 0.77 11.75 4.52 8 0.77 4.25 2.25 2.77 6 6.52 9.75 2.77 11.23 4.25"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/zap.svg b/htdocs/theme/common/octicons/lib/svg/zap.svg
deleted file mode 100644
index 95641465029..00000000000
--- a/htdocs/theme/common/octicons/lib/svg/zap.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
-    <title>zap</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="zap" fill="#000000">
-            <polygon id="Shape" points="10 7 6 7 9 0 0 9 4 9 1 16"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/package.json b/htdocs/theme/common/octicons/package.json
index 61def286fac..77188450670 100644
--- a/htdocs/theme/common/octicons/package.json
+++ b/htdocs/theme/common/octicons/package.json
@@ -1,14 +1,15 @@
 {
-  "version": "5.0.1",
+  "version": "7.2.0",
   "name": "octicons",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://octicons.github.com",
   "author": "GitHub Inc.",
-  "license": "(OFL-1.1 OR MIT)",
-  "style": "build/octicons.css",
+  "license": "MIT",
+  "style": "index.scss",
   "main": "index.js",
   "files": [
     "index.js",
+    "index.scss",
     "build"
   ],
   "repository": "https://github.com/primer/octicons.git",
@@ -16,24 +17,18 @@
     "url": "https://github.com/primer/octicons/issues"
   },
   "scripts": {
-    "build": "grunt",
-    "prepublish": "npm run build",
-    "test": "npm run build && ava --verbose \"test/**/*.js\""
-  },
-  "devDependencies": {
-    "autoprefixer": "^6.3.6",
-    "ava": "^0.16.0",
-    "grunt": "^1.0.1",
-    "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-cssnano": "^2.1.0",
-    "grunt-svgmin": "^4.0.0",
-    "grunt-svgstore": "^1.0.0"
+    "publish": "../../script/notify success",
+    "prepublishOnly": "../../script/notify pending",
+    "prepare": "cp -R ../build . && cp index.scss build/build.css",
+    "test": "ava --verbose 'tests/*.js'"
   },
   "keywords": [
     "GitHub",
     "icons",
     "svg",
     "octicons"
-  ]
+  ],
+  "dependencies": {
+    "object-assign": "^4.1.1"
+  }
 }
diff --git a/htdocs/theme/eldy/img/menus/chart.png b/htdocs/theme/eldy/img/menus/chart.png
deleted file mode 100644
index 6efce90a788..00000000000
Binary files a/htdocs/theme/eldy/img/menus/chart.png and /dev/null differ
diff --git a/htdocs/theme/eldy/img/menus/holiday_over.png b/htdocs/theme/eldy/img/menus/holiday_over.png
new file mode 100644
index 00000000000..493974477f3
Binary files /dev/null and b/htdocs/theme/eldy/img/menus/holiday_over.png differ
diff --git a/htdocs/theme/eldy/img/menus/money_over.png b/htdocs/theme/eldy/img/menus/money_over.png
index 9a501e762d0..82b864a83d7 100644
Binary files a/htdocs/theme/eldy/img/menus/money_over.png and b/htdocs/theme/eldy/img/menus/money_over.png differ
diff --git a/htdocs/theme/eldy/img/menus/ticketsup.png b/htdocs/theme/eldy/img/menus/ticketsup.png
index 03354cc98e0..98a482c4701 100644
Binary files a/htdocs/theme/eldy/img/menus/ticketsup.png and b/htdocs/theme/eldy/img/menus/ticketsup.png differ
diff --git a/htdocs/theme/eldy/img/menus/ticketsup_over.png b/htdocs/theme/eldy/img/menus/ticketsup_over.png
new file mode 100644
index 00000000000..246b638e71f
Binary files /dev/null and b/htdocs/theme/eldy/img/menus/ticketsup_over.png differ
diff --git a/htdocs/theme/eldy/img/menus_black/holiday_over.png b/htdocs/theme/eldy/img/menus_black/holiday_over.png
new file mode 100644
index 00000000000..de788526bc1
Binary files /dev/null and b/htdocs/theme/eldy/img/menus_black/holiday_over.png differ
diff --git a/htdocs/theme/eldy/img/menus_black/ticketsup.png b/htdocs/theme/eldy/img/menus_black/ticketsup.png
index 3ec332075e6..132888161e7 100644
Binary files a/htdocs/theme/eldy/img/menus_black/ticketsup.png and b/htdocs/theme/eldy/img/menus_black/ticketsup.png differ
diff --git a/htdocs/theme/eldy/img/menus_black/ticketsup_over.png b/htdocs/theme/eldy/img/menus_black/ticketsup_over.png
new file mode 100644
index 00000000000..5012d189410
Binary files /dev/null and b/htdocs/theme/eldy/img/menus_black/ticketsup_over.png differ
diff --git a/htdocs/theme/eldy/img/object_ticketsup.png b/htdocs/theme/eldy/img/object_ticketsup.png
index 8ece94fbefc..38df927744e 100644
Binary files a/htdocs/theme/eldy/img/object_ticketsup.png and b/htdocs/theme/eldy/img/object_ticketsup.png differ
diff --git a/htdocs/theme/eldy/img/statut3.png b/htdocs/theme/eldy/img/statut3.png
index 158c640bb60..77476349d6d 100644
Binary files a/htdocs/theme/eldy/img/statut3.png and b/htdocs/theme/eldy/img/statut3.png differ
diff --git a/htdocs/theme/eldy/img/statut3_40x40.png b/htdocs/theme/eldy/img/statut3_40x40.png
index f71ef4eb962..48314ccb183 100644
Binary files a/htdocs/theme/eldy/img/statut3_40x40.png and b/htdocs/theme/eldy/img/statut3_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut4.png b/htdocs/theme/eldy/img/statut4.png
index d0df7e40aef..616f10de496 100644
Binary files a/htdocs/theme/eldy/img/statut4.png and b/htdocs/theme/eldy/img/statut4.png differ
diff --git a/htdocs/theme/eldy/img/statut4_40x40.png b/htdocs/theme/eldy/img/statut4_40x40.png
index 2da24b66484..879f48739f6 100644
Binary files a/htdocs/theme/eldy/img/statut4_40x40.png and b/htdocs/theme/eldy/img/statut4_40x40.png differ
diff --git a/htdocs/theme/eldy/img/title_accountancy.png b/htdocs/theme/eldy/img/title_accountancy.png
index 6e7c2a412c6..fba1c91e05b 100644
Binary files a/htdocs/theme/eldy/img/title_accountancy.png and b/htdocs/theme/eldy/img/title_accountancy.png differ
diff --git a/htdocs/theme/eldy/img/title_agenda.png b/htdocs/theme/eldy/img/title_agenda.png
index eb4c8d2bea2..93c5a814bc3 100644
Binary files a/htdocs/theme/eldy/img/title_agenda.png and b/htdocs/theme/eldy/img/title_agenda.png differ
diff --git a/htdocs/theme/eldy/img/title_bank.png b/htdocs/theme/eldy/img/title_bank.png
index 034a8d0c5e4..c916e89d8f6 100644
Binary files a/htdocs/theme/eldy/img/title_bank.png and b/htdocs/theme/eldy/img/title_bank.png differ
diff --git a/htdocs/theme/eldy/img/title_commercial.png b/htdocs/theme/eldy/img/title_commercial.png
index 46394177698..6671810c5de 100644
Binary files a/htdocs/theme/eldy/img/title_commercial.png and b/htdocs/theme/eldy/img/title_commercial.png differ
diff --git a/htdocs/theme/eldy/img/title_companies.png b/htdocs/theme/eldy/img/title_companies.png
index b2539dba849..ca172c460ac 100644
Binary files a/htdocs/theme/eldy/img/title_companies.png and b/htdocs/theme/eldy/img/title_companies.png differ
diff --git a/htdocs/theme/eldy/img/title_generic.png b/htdocs/theme/eldy/img/title_generic.png
index ae224327549..a44830798aa 100644
Binary files a/htdocs/theme/eldy/img/title_generic.png and b/htdocs/theme/eldy/img/title_generic.png differ
diff --git a/htdocs/theme/eldy/img/title_home.png b/htdocs/theme/eldy/img/title_home.png
index e9273e727f5..505d18ab403 100644
Binary files a/htdocs/theme/eldy/img/title_home.png and b/htdocs/theme/eldy/img/title_home.png differ
diff --git a/htdocs/theme/eldy/img/title_products.png b/htdocs/theme/eldy/img/title_products.png
index d3c5b125bbe..100edf445f1 100644
Binary files a/htdocs/theme/eldy/img/title_products.png and b/htdocs/theme/eldy/img/title_products.png differ
diff --git a/htdocs/theme/eldy/img/title_project.png b/htdocs/theme/eldy/img/title_project.png
index 05d8ea630b8..bec7144c109 100644
Binary files a/htdocs/theme/eldy/img/title_project.png and b/htdocs/theme/eldy/img/title_project.png differ
diff --git a/htdocs/theme/eldy/img/title_setup.png b/htdocs/theme/eldy/img/title_setup.png
index d7548d28709..fa4ff3aded1 100644
Binary files a/htdocs/theme/eldy/img/title_setup.png and b/htdocs/theme/eldy/img/title_setup.png differ
diff --git a/htdocs/theme/eldy/img/title_ticketsup.png b/htdocs/theme/eldy/img/title_ticketsup.png
index 3ec332075e6..b1cf5df0e75 100644
Binary files a/htdocs/theme/eldy/img/title_ticketsup.png and b/htdocs/theme/eldy/img/title_ticketsup.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 25bc95c4830..a8798901a21 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -44,8 +44,8 @@ $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
 $colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='248,248,248';    // line pair
-$colorbacklinepair2='248,248,248';    // line pair
+$colorbacklinepair1='246,246,246';    // line pair
+$colorbacklinepair2='246,246,246';    // line pair
 $colorbacklinepairhover='238,246,252';    // line pair
 $colorbacklinebreak='214,218,220';		// line break
 $colorbackbody='255,255,255';
@@ -53,12 +53,12 @@ $colortexttitlenotab='100,60,20';
 $colortexttitle='0,0,0';
 $colortext='0,0,0';
 $colortextlink='0,0,100';
-$fontsize='13';
-$fontsizesmaller='12';
+$fontsize='0.85em';
+$fontsizesmaller='0.75em';
 
 if (defined('THEME_ONLY_CONSTANT')) return;
 
-session_cache_limiter(FALSE);
+session_cache_limiter(false);
 
 require_once '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -73,9 +73,6 @@ top_httphead('text/css');
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
 
-// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
-
 if (GETPOST('theme','alpha')) $conf->theme=GETPOST('theme','alpha');  // If theme was forced on URL
 if (GETPOST('lang','aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL
 
@@ -120,8 +117,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 	$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
 	$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
 	$conf->global->THEME_ELDY_TEXT='0,0,0';
-	$conf->global->THEME_ELDY_FONT_SIZE1='13';
-	$conf->global->THEME_ELDY_FONT_SIZE2='12';
+	$conf->global->THEME_ELDY_FONT_SIZE1='0.85em';
+	$conf->global->THEME_ELDY_FONT_SIZE2='0.75em';
 }
 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
@@ -202,6 +199,15 @@ $colortextlink=join(',',colorStringToArray($colortextlink));
 
 $nbtopmenuentries=$menumanager->showmenu('topnb');
 
+
+$minwidthtmenu=66;		/* minimum width for one top menu entry */
+$heightmenu=46;			/* height of top menu, part with image */
+$heightmenu2=48;        /* height of top menu, part with login  */
+$disableimages = 0;
+$maxwidthloginblock = 130;
+if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu=0; }
+
+
 print '/*'."\n";
 print 'colorbackbody='.$colorbackbody."\n";
 print 'colorbackvmenu1='.$colorbackvmenu1."\n";
@@ -242,7 +248,7 @@ body {
 	background: rgb(<?php print $colorbackbody; ?>);
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
-	font-size: <?php print $fontsize ?>px;
+	font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
 	line-height: 1.4;
 	font-family: <?php print $fontlist ?>;
     margin-top: 0;
@@ -252,7 +258,7 @@ body {
     <?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
 }
 
-.thumbstat, a.tab { color: rgb(<?php print $colortexttitle; ?>) !important; font-weight: bold !important; }
+.thumbstat, a.tab { font-weight: bold !important; }
 th a { font-weight: <?php echo ($useboldtitle?'bold':'normal'); ?> !important; }
 a.tab { font-weight: bold !important; }
 
@@ -716,6 +722,9 @@ select.flat.selectlimit {
 .marginleftonly {
 	margin-left: 10px !important;
 }
+.nomarginleft {
+	margin-left: 0px !important;
+}
 .selectlimit, .selectlimit:focus {
     border-left: none !important;
     border-top: none !important;
@@ -813,6 +822,9 @@ select.flat.selectlimit {
 .fa-trash, .fa-crop, .fa-pencil {
 	font-size: 1.4em;
 }
+.fa-15 {
+	font-size: 1.5em;
+}
 
 /* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
 /*.table-responsive {
@@ -876,7 +888,7 @@ select.selectarrowonleft option {
 .hideobject { display: none; }
 .minwidth50  { min-width: 50px; }
 /* rule for not too small screen only */
-@media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
+@media only screen and (min-width: <?php echo round($nbtopmenuentries * 45, 0) + 7; ?>px)
 {
 	.width25  { width: 25px; }
     .width50  { width: 50px; }
@@ -963,10 +975,10 @@ select.selectarrowonleft option {
 @media only screen and (max-width: 767px)
 {
 	body {
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print is_numeric($fontsize) ? ($fontsize+3).'px' : $fontsize; ?>;
 	}
 	div.refidno {
-		font-size: <?php print $fontsize+3; ?>px !important;
+		font-size: <?php print is_numeric($fontsize) ? ($fontsize+3).'px' : $fontsize; ?> !important;
 	}
 }
 
@@ -974,10 +986,10 @@ select.selectarrowonleft option {
 @media only screen and (max-width: 570px)
 {
 	body {
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print is_numeric($fontsize) ? ($fontsize+3).'px' : $fontsize; ?>;
 	}
 	div.refidno {
-		font-size: <?php print $fontsize+3; ?>px !important;
+		font-size: <?php print is_numeric($fontsize) ? ($fontsize+3).'px' : $fontsize; ?> !important;
 	}
 
 	.divmainbodylarge { margin-left: 20px !important; margin-right: 20px !important; }
@@ -988,9 +1000,6 @@ select.selectarrowonleft option {
         text-overflow: ellipsis;
         white-space: nowrap;
     }
-	div.fiche {
-		    margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important;
-	}
 	div.titre {
 		/* margin-top: 12px; */
 		/* line-height: 2em; */
@@ -1005,11 +1014,11 @@ select.selectarrowonleft option {
 
 	select {
 		padding-top: 4px;
-		padding-bottom: 5px;
+		padding-bottom: 4px;
 	}
 	input, input[type=text], input[type=password], select, textarea     {
 		min-width: 20px;
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print is_numeric($fontsize)?($fontsize+3).'px':$fontsize; ?>;
     	/* min-height: 1.4em; */
     	/* line-height: 1.4em; */
     	/* padding: .4em .1em; */
@@ -1223,8 +1232,8 @@ div.fiche {
 div.fiche {
 	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'25':'6')); ?>px;
 	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'24':'6')); ?>px;
-	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
-	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
+	<?php if (! empty($dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
+	<?php if (! empty($dol_hide_leftmenu)) print 'margin-top: 12px;'."\n"; ?>
 }
 body.onlinepaymentbody div.fiche {	/* For online payment page */
 	margin: 20px !important;
@@ -1274,7 +1283,6 @@ div.secondcolumn div.box {
     div.fiche {
     	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px;
     	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:6); ?>px;
-    	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
     }
     div.fichecenter {
     	width: 100%;
@@ -1405,6 +1413,7 @@ div.statusref img {
     padding-left: 8px;
    	padding-right: 9px;
    	vertical-align: text-bottom;
+   	width: 18px;
 }
 div.statusrefbis {
     padding-left: 8px;
@@ -1456,15 +1465,6 @@ img.photorefnoborder {
 /* Menu top et 1ere ligne tableau                                                 */
 /* ============================================================================== */
 
-<?php
-$minwidthtmenu=66;		/* minimum width for one top menu entry */
-$heightmenu=46;			/* height of top menu, part with image */
-$heightmenu2=48;        /* height of top menu, part with login  */
-$disableimages = 0;
-$maxwidthloginblock = 130;
-if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu=0; }
-?>
-
 div#id-top {
 <?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
@@ -1574,7 +1574,6 @@ div.tmenuleft
 	margin-top: 0px;
 	<?php if (empty($conf->dol_optimize_smallscreen)) { ?>
 	width: 5px;
-	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 -6px no-repeat; */
 	<?php } ?>
 	<?php if ($disableimages) { ?>
 	height: 26px;
@@ -1594,13 +1593,6 @@ div.tmenucenter
     height: <?php print $heightmenu; ?>px;
 	<?php } ?>
     width: 100%;
-	/*
-    max-width: <?php echo round($fontsize * 8); ?>px;
-   	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	color: #<?php echo $colortextbackhmenu; ?>;
-	*/
 }
 #menu_titre_logo {
 	padding-top: 0;
@@ -1628,85 +1620,91 @@ div.mainmenu {
 	min-width: 40px;
 }
 
-/* Do not load menu img if hidden to save bandwidth */
+/* For mainmenu, we always load the img */
+
+div.mainmenu.menu {
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png',1) ?>);
+	<?php print $disableimages?'':'top: 7px'; ?>
+}
+#mainmenutd_menu a.tmenuimage {
+    display: unset;
+}
+
+/* Do not load menu img for other if hidden to save bandwidth */
+
 <?php if (empty($dol_hide_topmenu)) { ?>
 
 div.mainmenu.home{
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home_over.png',1) ?>);
 	background-position-x: center;
 }
 
 div.mainmenu.billing {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money_over.png',1) ?>);
 }
 
 div.mainmenu.accountancy {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money_over.png',1) ?>);
 }
 
 div.mainmenu.agenda {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda_over.png',1) ?>);
 }
 
 div.mainmenu.bank {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank_over.png',1) ?>);
 }
 
 div.mainmenu.cashdesk {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale_over.png',1) ?>);
 }
 
 div.mainmenu.companies {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company_over.png',1) ?>);
 }
 
 div.mainmenu.commercial {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial_over.png',1) ?>);
 }
 
 div.mainmenu.ecm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm_over.png',1) ?>);
 }
 
 div.mainmenu.externalsite {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite_over.png',1) ?>);
 }
 
 div.mainmenu.ftp {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools_over.png',1) ?>);
 }
 
 div.mainmenu.hrm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday_over.png',1) ?>);
 }
 
 div.mainmenu.members {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>);
-}
-
-div.mainmenu.menu {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png',1) ?>);
-	top: 7px;
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members_over.png',1) ?>);
 }
 
 div.mainmenu.products {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products_over.png',1) ?>);
 }
 
 div.mainmenu.project {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project_over.png',1) ?>);
 }
 
 div.mainmenu.ticketsup {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticketsup.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticketsup_over.png',1) ?>);
 }
 
 div.mainmenu.tools {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools_over.png',1) ?>);
 }
 
 div.mainmenu.website {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite_over.png',1) ?>);
 }
 
 <?php
@@ -1743,9 +1741,9 @@ foreach($mainmenuusedarray as $val)
 	$found=0; $url='';
 	foreach($conf->file->dol_document_root as $dirroot)
 	{
-		if (file_exists($dirroot."/".$val."/img/".$val.".png"))
+		if (file_exists($dirroot."/".$val."/img/".$val."_over.png"))
 		{
-			$url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+			$url=dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1);
 			$found=1;
 			break;
 		}
@@ -1753,7 +1751,7 @@ foreach($mainmenuusedarray as $val)
 	// Img file not found
 	if (! $found)
 	{
-		$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1);
+		$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic."_over.png",1);
 		$found=1;
 		if ($generic < 4) $generic++;
 		print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
@@ -1820,8 +1818,13 @@ form#login {
 	padding-top:16px;
 	padding-bottom:12px;
 	max-width: 560px;
-
-	background-color: #FFFFFF;
+<?php
+if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
+	print '	background-color: rgba(255, 255, 255, 0.9);';
+} else {
+	print '	background-color: #FFFFFF;';
+}
+?>
 
 	-webkit-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
 	box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
@@ -1898,7 +1901,7 @@ div.login_block {
 	<?php print $right; ?>: 0;
 	top: <?php print $disableimages?'4px':'0'; ?>;
 	font-weight: bold;
-	max-width: <?php echo $maxwidthloginblock; ?>px;
+	<?php echo (empty($disableimages) && $maxwidthloginblock)?'max-width: '.$maxwidthloginblock.'px;':''; ?>
 	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
@@ -1930,7 +1933,7 @@ div.login_block_user {
 }
 div.login_block_other {
 	display: inline-block;
-	clear: both;
+	clear: <?php echo $disableimages?'none':'both'; ?>;
 }
 div.login_block_other { padding-top: 3px; text-align: right; }
 .login_block_elem {
@@ -1955,7 +1958,6 @@ div.login_block_other { padding-top: 3px; text-align: right; }
 }
 .alogin, .alogin:hover {
 	font-weight: normal !important;
-	font-size: <?php echo $fontsizesmaller; ?>px !important;
 	padding-top: 2px;
 }
 .alogin:hover, .atoplogin:hover {
@@ -2044,17 +2046,17 @@ input.vmenusearchselectcombo[type=text] {
 .companylogo { }
 .searchform { padding-top: 10px; }
 
-a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu { white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
-font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; }
+a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu { white-space: nowrap; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
+font.vmenudisabled  { font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; }
 a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
 
-a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
-font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
+a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
+font.vsmenudisabled { font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
 
-a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
+a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print is_numeric($fontsizesmaller)?($fontsizesmaller.'px'):$fontsizesmaller; ?>; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
 
 .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
 {
@@ -2304,7 +2306,7 @@ a.tabunactive {
 }
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: <?php print $fontlist ?>;
-	padding: 12px 9px 12px;
+	padding: 12px 9px 13px;
     margin: 0em 0.2em;
     text-decoration: none;
     white-space: nowrap;
@@ -2379,36 +2381,58 @@ span.butAction, span.butActionDelete {
 	cursor: pointer;
 }
 
-.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
+.butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
 	text-decoration: none;
 	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em !important;
 	padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
 	font-family: <?php print $fontlist ?>;
     font-weight: normal;
-    border-color: #c5c5c5;
     border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
     display: inline-block;
     text-align: center;
     cursor: pointer;
-    color: #fff;
-    background: rgb(<?php echo $colorbackhmenu1 ?>);
-    border: 1px solid rgb(<?php echo $colorbackhmenu1 ?>);
+    /* color: #fff; */
+    /* background: rgb(<?php echo $colorbackhmenu1 ?>); */
+    color: #000;
+    /* text-transform: uppercase; */
+    border: 1px solid #aaa;
 
     border-top-right-radius: 0 !important;
     border-bottom-right-radius: 0 !important;
     border-top-left-radius: 0 !important;
     border-bottom-left-radius: 0 !important;
 }
+.butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active {
+	text-decoration: none;
+	margin: 0em 0.3em 0 0.3em !important;
+	padding: 0.2em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em 0.3em;
+	font-family: <?php print $fontlist ?>;
+    font-weight: normal;
+    border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+    display: inline-block;
+    text-align: center;
+    cursor: pointer;
+    /*color: #fff !important;
+    background: rgb(<?php echo $colorbackhmenu1 ?>);
+    border: 1px solid rgb(<?php echo $colorbackhmenu1 ?>);*/
 
-.butAction:hover   {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+    border-top-left-radius: 0 !important;
+    border-bottom-left-radius: 0 !important;
+}
+a.butActionNew>span.fa-plus-circle, a.butActionNew>span.fa-plus-circle:hover { padding-left: 6px; font-size: 1.5em; border: none; box-shadow: none; webkit-box-shadow: none; }
+a.butActionNewRefused>span.fa-plus-circle, a.butActionNewRefused>span.fa-plus-circle:hover { padding-left: 6px; font-size: 1.5em; border: none; box-shadow: none; webkit-box-shadow: none; }
+
+.butAction:hover, .butActionNew:hover   {
   -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
   box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
 }
 
 .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
-    background: #633;
+    /* background: #633; */
     border: 1px solid #633;
-    color: #FFF;
+    color: #633;
 }
 
 .butActionDelete:hover {
@@ -2430,6 +2454,22 @@ span.butAction, span.butActionDelete {
     color: #999 !important;
     border: 1px solid #bbb;
 }
+.butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active {
+    text-decoration: none !important;
+	white-space: nowrap !important;
+	cursor: not-allowed !important;
+	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+	padding: 0.2em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
+    font-family: <?php print $fontlist ?> !important;
+    font-weight: normal !important;
+    display: inline-block;
+    text-align: center;
+    cursor: pointer;
+    color: #999 !important;
+    padding-top: 0.2em;
+    box-shadow: none !important;
+    -webkit-box-shadow: none !important;
+}
 
 .butActionTransparent {
 	color: #222 ! important;
@@ -2437,7 +2477,7 @@ span.butAction, span.butActionDelete {
 }
 
 <?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (! $user->admin)) { ?>
-.butActionRefused {
+.butActionRefused, .butActionNewRefused {
 	display: none;
 }
 <?php } ?>
@@ -2682,13 +2722,13 @@ div.refidpadding  {
 div.refid  {
 	font-weight: bold;
   	color: #625;
-  	font-size: 160%;
+  	font-size: 1.2em;
 }
 div.refidno  {
 	padding-top: 3px;
 	font-weight: normal;
   	color: #444;
-  	font-size: <?php print $fontsize ?>px;
+  	font-size: <?php print is_numeric($fontsize)?$fontsize.'px':$fontsize ?>;
   	line-height: 21px;
 }
 div.refidno form {
@@ -2701,6 +2741,12 @@ div.pagination {
 div.pagination a {
 	font-weight: normal;
 }
+/*div.pagination a.butAction, div.fichehalfright a.butAction {
+    margin-right: 0px !important;
+}
+div.tabsAction a.butActionDelete:last-child, div.tabsAction a.butAction:last-child {
+    margin-right: 0px !important;
+}*/
 div.pagination ul
 {
   list-style: none;
@@ -2768,13 +2814,13 @@ div.pagination li span {
 div.pagination li:first-child a,
 div.pagination li:first-child span {
   margin-left: 0;
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
+  /*border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;*/
 }
 div.pagination li:last-child a,
 div.pagination li:last-child span {
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
+  /*border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;*/
 }
 div.pagination li a:hover,
 div.pagination li span:hover,
@@ -2782,7 +2828,6 @@ div.pagination li a:focus,
 div.pagination li span:focus {
   -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
   box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
-	padding-top: 8px;
 }
 div.pagination li .active a,
 div.pagination li .active span,
@@ -3179,6 +3224,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 span.boxstatstext {
 	opacity: 0.8;
     line-height: 18px;
+    color: #000;
 }
 span.boxstatstext img, a.dashboardlineindicatorlate img {
 	border: 0;
@@ -3186,6 +3232,9 @@ span.boxstatstext img, a.dashboardlineindicatorlate img {
 a img {
 	border: 0;
 }
+.boxstatsindicator.thumbstat150 {	/* If we remove this, box position is ko on ipad */
+	display: inline-flex;
+}
 span.boxstatsindicator {
 	font-size: 130%;
 	font-weight: normal;
@@ -3463,7 +3512,7 @@ div.titre {
     padding-bottom: 5px;
 }
 
-#dolpaymenttable { min-width: 300px; font-size: 16px; }	/* Width must have min to make stripe input area visible */
+#dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
@@ -3529,7 +3578,6 @@ div#card-errors {
 .ui-dialog-titlebar {
 }
 .ui-dialog-content {
-    font-size: <?php print $fontsize; ?>px !important;
 }
 
 
@@ -3677,7 +3725,7 @@ table.dp {
     border-style:none;
     background-color:transparent;
     padding:0px;
-    font-size:9px;
+    font-size: 0.85em;
     border-width:0px;
     color:#0B63A2;
     vertical-align:middle;
@@ -4038,7 +4086,6 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 }
 .ui-widget {
     font-family:<?php echo $fontlist; ?>;
-    font-size:<?php echo $fontsize; ?>px;
 }
 /* .ui-button { margin-left: -2px; <?php print (preg_match('/chrome/',$conf->browser->name)?'padding-top: 1px;':''); ?> } */
 .ui-button { margin-left: -2px; }
@@ -4502,6 +4549,10 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+.select2-container--focus span.select2-selection.select2-selection--single {
+    border-bottom: 1px solid #666 !important;
+}
+
 .blockvmenusearch .select2-container--default .select2-selection--single,
 .blockvmenubookmarks .select2-container--default .select2-selection--single
 {
@@ -4802,6 +4853,9 @@ dl.dropdown {
     display:inline-block;
     padding: 0 3px 2px 0;
 }
+.dropdown span.value {
+    display:none;
+}
 .dropdown dd ul {
     background-color: #FFF;
     border: 1px solid #888;
@@ -4814,13 +4868,12 @@ dl.dropdown {
     max-height: 264px;
     overflow: auto;
 }
-.dropdown span.value {
-    display:none;
-}
 .dropdown dd ul li {
 	white-space: nowrap;
 	font-weight: normal;
 	padding: 2px;
+	/* color: rgb(<?php print $colortext; ?>); */
+	color: #000;
 }
 .dropdown dd ul li input[type="checkbox"] {
     margin-<?php echo $right; ?>: 3px;
@@ -4871,7 +4924,7 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
 	min-width: .4em;
 	padding-left: 6px;
 	padding-right: 6px;
-	font-size: <?php print $fontsize ?>px;
+	font-size: <?php print is_numeric($fontsize)?$fontsize.'px':$fontsize; ?>;
 	/* white-space: normal; */		/* Warning, enable this break the truncate feature */
 }
 .ui-btn-icon-right .ui-btn-inner {
@@ -5454,20 +5507,19 @@ div.tabsElem a.tab {
 	}
 }
 
-/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
+/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo is_numeric($fontsize)?$fontsize.'px':$fontsize ?> */
 /* rule to reduce top menu - 1st reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 24; ?>px)	/* reduction 1 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * 91, 0) + 24; ?>px)	/* reduction 1 */
 {
 	div.tmenucenter {
-	    width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */
+	    width: <?php echo round(52); ?>px;	/* size of viewport */
     	white-space: nowrap;
   		overflow: hidden;
   		text-overflow: ellipsis;
   		color: #<?php echo $colortextbackhmenu; ?>;
 	}
 	.mainmenuaspan {
-    	/*display: none;*/
-  		font-size: 10px;
+  		font-size: 0.9em;
   		padding-right: 0;
     }
     .topmenuimage {
@@ -5490,20 +5542,20 @@ div.tabsElem a.tab {
 	}
 }
 /* rule to reduce top menu - 2nd reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 5, 0) + 24; ?>px)	/* reduction 2 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * 75, 0) + 24; ?>px)	/* reduction 2 */
 {
 	div.mainmenu {
 		height: 23px;
 	}
 	div.tmenucenter {
-	    max-width: <?php echo round($fontsize * 2); ?>px;	/* size of viewport */
+	    max-width: <?php echo round(26); ?>px;	/* size of viewport */
   		text-overflow: clip;
 	}
 	span.mainmenuaspan {
     	margin-left: 1px;
 	}
 	.mainmenuaspan {
-  		font-size: 10px;
+  		font-size: 0.9em;
   		padding-left: 0;
   		padding-right: 0;
     }
@@ -5514,7 +5566,7 @@ div.tabsElem a.tab {
 	}
 }
 /* rule to reduce top menu - 3rd reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 3.6, 0) + 12; ?>px)	/* reduction 3 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * 49, 0) + 12; ?>px)	/* reduction 3 */
 {
 	.side-nav {
 		z-index: 200;
diff --git a/htdocs/theme/md/img/statut3.png b/htdocs/theme/md/img/statut3.png
index 158c640bb60..77476349d6d 100644
Binary files a/htdocs/theme/md/img/statut3.png and b/htdocs/theme/md/img/statut3.png differ
diff --git a/htdocs/theme/md/img/statut3_40x40.png b/htdocs/theme/md/img/statut3_40x40.png
index f71ef4eb962..48314ccb183 100644
Binary files a/htdocs/theme/md/img/statut3_40x40.png and b/htdocs/theme/md/img/statut3_40x40.png differ
diff --git a/htdocs/theme/md/img/statut4.png b/htdocs/theme/md/img/statut4.png
index d0df7e40aef..616f10de496 100644
Binary files a/htdocs/theme/md/img/statut4.png and b/htdocs/theme/md/img/statut4.png differ
diff --git a/htdocs/theme/md/img/statut4_40x40.png b/htdocs/theme/md/img/statut4_40x40.png
index 2da24b66484..879f48739f6 100644
Binary files a/htdocs/theme/md/img/statut4_40x40.png and b/htdocs/theme/md/img/statut4_40x40.png differ
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2d7389dae0e..2188a5bff9c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -45,8 +45,8 @@ $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
 $colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='250,250,250';    // line pair
-$colorbacklinepair2='248,248,248';    // line pair
+$colorbacklinepair1='248,248,248';    // line pair
+$colorbacklinepair2='246,246,246';    // line pair
 $colorbacklinepairhover='244,244,244';    // line pair
 $colorbacklinebreak='214,218,220';
 $colorbackbody='248,248,248';
@@ -59,7 +59,7 @@ $fontsizesmaller='11';
 
 if (defined('THEME_ONLY_CONSTANT')) return;
 
-session_cache_limiter(FALSE);
+session_cache_limiter(false);
 
 require_once '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -74,9 +74,6 @@ top_httphead('text/css');
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
 
-// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
-
 if (GETPOST('theme','alpha')) $conf->theme=GETPOST('theme','alpha');  // If theme was forced on URL
 if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL
 
@@ -254,7 +251,7 @@ body {
     <?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
 }
 
-th a, .thumbstat, a.tab { color: rgb(<?php print $colortexttitle; ?>) !important; font-weight: bold !important; }
+th a, .thumbstat, a.tab { font-weight: bold !important; }
 a.tab { font-weight: bold !important; }
 
 a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: normal; color: rgb(<?php print $colortextlink; ?>); text-decoration: none;  }
@@ -719,6 +716,9 @@ select.flat.selectlimit {
 .marginleftonly {
 	margin-left: 10px !important;
 }
+.nomarginleft {
+	margin-left: 0px !important;
+}
 .selectlimit, .selectlimit:focus {
     border-left: none !important;
     border-top: none !important;
@@ -1237,7 +1237,7 @@ div.fiche {
 div.fiche {
 	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'24':'6')); ?>px;
 	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'22':'6')); ?>px;
-	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
+	<?php if (! empty($dol_hide_leftmenu) && ! empty($dol_hide_topmenu)) print 'margin-top: 12px;'; ?>
 	margin-bottom: 15px;
 }
 body.onlinepaymentbody div.fiche {	/* For online payment page */
@@ -1366,7 +1366,7 @@ table.noborder tr.liste_titre td {
 .fiche .arearef img.pictoedit, .fiche .arearef span.pictoedit,
 .fiche .fichecenter img.pictoedit, .fiche .fichecenter span.pictoedit,
 .tagtdnote span.pictoedit {
-    opacity: 0.9;
+    opacity: 0.6;
 }
 img.hideonsmartphone.pictoactionview {
     vertical-align: bottom;
@@ -1416,6 +1416,7 @@ div.statusref img {
     padding-left: 8px;
     padding-right: 9px;
     vertical-align: text-bottom;
+    width: 18px;
 }
 div.statusrefbis {
     padding-left: 8px;
@@ -1583,20 +1584,12 @@ li.tmenu, li.tmenusel {
 	margin: 0px 0px 0px 0px;
 	font-weight: normal;
 }
-li.tmenusel, li.tmenu:hover {
-/*
-    background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
-    background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%) !important;
-    background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0) 100%) !important;
-    background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
-    background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
-	background: rgb(<?php echo $colorbackhmenu1 ?>);
-*/
-	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */
-}
-li.tmenusel, li.tmenu:hover {
+li.tmenu:hover {
 	opacity: .50; /* show only a slight shadow */
 }
+li.tmenusel {
+	text-decoration: underline;
+}
 .tmenuend .tmenuleft { width: 0px; }
 .tmenuend { display: none; }
 
@@ -1609,7 +1602,6 @@ div.tmenuleft
 	<?php if (! $disableimages) { ?>
 	height: <?php print $heightmenu+4; ?>px;
 	<?php } ?>
-	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 -6px no-repeat; */
 	<?php } ?>
 }
 div.tmenucenter
@@ -2359,8 +2351,7 @@ span.butAction, span.butActionDelete {
 }
 
 
-.button, .butAction, .butActionDelete, .butActionRefused {
-	border-color: #c5c5c5;
+.button, .butAction, .butActionDelete, .butActionRefused, .butActionNewRefused {
 	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
 	display: inline-block;
     padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
@@ -2388,6 +2379,32 @@ span.butAction, span.butActionDelete {
 	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
+.butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active {
+	text-decoration: none;
+	/* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */
+	display: inline-block;
+    padding: 0.2em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
+    margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+	line-height: 20px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	/* color: #ffffff !important; */
+	/* text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); */
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	/* -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); */
+	/* background-color: #006dcc;
+	background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+	background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+	background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+	background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+	background-repeat: repeat-x; */
+}
+a.butActionNew>span.fa-plus-circle { padding-left: 6px; font-size: 1.5em; }
+a.butActionNewRefused>span.fa-plus-circle { padding-left: 6px; font-size: 1.5em; }
 
 .button, .butAction {
 	color: #ffffff !important;
@@ -2434,7 +2451,7 @@ a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
 	color: #FFFFFF;
 }
 
-.butActionRefused {
+.butActionRefused, .butActionNewRefused {
 	color: #AAAAAA !important;
 	cursor: not-allowed !important;
 }
@@ -2442,7 +2459,11 @@ a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
 a.butAction:hover, a.butActionDelete:hover, a.butActionRefused:hover {
     text-decoration: none;
 }
-a.butAction:hover, a.butActionDelete:hover {
+a.butActionNewRefused:hover {
+	border-color: unset !important;
+	border: 1px solid #bbbbbb;
+}
+a.butAction:hover, a.butActionNew:hover, a.butActionDelete:hover {
 	opacity: 0.9;
 }
 
@@ -2452,7 +2473,7 @@ a.butAction:hover, a.butActionDelete:hover {
 }
 
 <?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
-.butActionRefused {
+.butActionRefused, .butActionNewRefused {
 	display: none;
 }
 <?php } ?>
@@ -2518,15 +2539,16 @@ table.border, table.bordernooddeven, table.dataTable, .table-border, .table-bord
 table.borderplus {
 	border: 1px solid #BBB;
 }
+
 .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
-	height: 22px;
+	height: 26px;
 }
 tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
-    height: 22px;
+    height: 26px;
 }
 
-table.border td, div.border div div.tagtd {
-	padding: 2px 2px 2px 2px;
+table.border td, table.bordernooddeven td, div.border div div.tagtd {
+	padding: 2px 4px 2px 4px;
 	border: 1px solid #f0f0f0;
 	border-collapse: collapse;
 }
@@ -2754,10 +2776,6 @@ div.pagination li.noborder a:hover {
   border: none;
   background-color: transparent;
 }
-div.pagination li a,
-div.pagination li span {
-  background-color: #fff;
-}
 div.pagination li:first-child a,
 div.pagination li:first-child span {
   margin-left: 0;
@@ -3172,8 +3190,12 @@ div .tdtop {
 }
 span.boxstatstext {
     line-height: 18px;
+    color: #000;
     /* opacity: 0.7; */		/* a bug if browser make z-index infintie when opacity is set so we disable it */
 }
+.boxstatsindicator.thumbstat150 {	/* If we remove this, box position is ko on ipad */
+	display: inline-flex;
+}
 span.boxstatsindicator {
 	font-size: 110%;
 	font-weight: normal;
@@ -3440,7 +3462,7 @@ div.titre {
 	<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
 }
 
-#dolpaymenttable { min-width: 300px; font-size: 16px; }	/* Width must have min to make stripe input area visible */
+#dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
@@ -3643,7 +3665,7 @@ table.dp {
     border-style:none;
     background-color:transparent;
     padding:0px;
-    font-size:9px;
+    font-size: 0.85em;
     border-width:0px;
     color: #eee;
     vertical-align:middle;
@@ -4251,7 +4273,6 @@ ul.ecmjqft li {
 	padding: 0px;
 	padding-left: 20px;
 	margin: 0px;
-	white-space: nowrap;
 	display: block;
 }
 
@@ -4727,6 +4748,9 @@ dl.dropdown {
     display:inline-block;
     padding: 0 3px 2px 0;
 }
+.dropdown span.value {
+    display:none;
+}
 .dropdown dd ul {
     background-color: #FFF;
     border: 1px solid #888;
@@ -4739,13 +4763,11 @@ dl.dropdown {
     max-height: 264px;
     overflow: auto;
 }
-.dropdown span.value {
-    display:none;
-}
 .dropdown dd ul li {
 	white-space: nowrap;
 	font-weight: normal;
 	padding: 2px;
+	color: #000;
 }
 .dropdown dd ul li input[type="checkbox"] {
     margin-right: 3px;
diff --git a/htdocs/ticketsup/README.md b/htdocs/ticketsup/README.md
new file mode 100644
index 00000000000..e4c9b49f6b3
--- /dev/null
+++ b/htdocs/ticketsup/README.md
@@ -0,0 +1,10 @@
+Ticket module
+=============
+
+
+An issue tracker that provides a delicate balance between simplicity and power and complete integration with the other modules.
+Offer your customers an easy to use interface to report and follow status of their issue. Manage your issues from
+your backoffice.
+ 
+
+(c) The development of this module has been initiated by the company <a href="https://librethic.io">Libr&thic</a> and is now part of Dolibarr ERP CRM core.
diff --git a/htdocs/ticketsup/card.php b/htdocs/ticketsup/card.php
index bb6b5804578..4b186867302 100644
--- a/htdocs/ticketsup/card.php
+++ b/htdocs/ticketsup/card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016 Jean-François FERRY <hello@librethic.io>
  * Copyright (C) 2016      Christophe Battarel <christophe@altairis.fr>
+ * Copyright (C) 2018      Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * 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,25 +45,25 @@ if (!empty($conf->contrat->enabled)) {
 $langs->loadLangs(array("companies","other","ticketsup"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
-$track_id = GETPOST('track_id', 'alpha', 3);
-$ref = GETPOST('ref', 'alpha');
+$id        = GETPOST('id', 'int');
+$track_id  = GETPOST('track_id', 'alpha', 3);
+$ref       = GETPOST('ref', 'alpha');
 $projectid = GETPOST('projectid', 'int');
-$action = GETPOST('action', 'alpha', 3);
+$action    = GETPOST('action', 'alpha', 3);
 
 // Initialize technical object to manage hooks of ticketsup. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('ticketsupcard','globalcard'));
 
+$object = new Ticketsup($db);
+
 $extrafields = new ExtraFields($db);
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
-$object = new Ticketsup($db);
-
 if (!$action) {
     $action = 'view';
 }
 //Select mail models is same action as add_message
-if (GETPOST('modelselected')) {
+if (GETPOST('modelselected','alpha')) {
     $action = 'add_message';
 }
 
@@ -76,15 +77,69 @@ if ($id || $track_id || $ref) {
 // Security check
 $result = restrictedArea($user, 'ticketsup', $object->id);
 
+$triggermodname = 'TICKETSUP_MODIFY';
+$permissiontoadd = $user->rights->ticketsup->write;
+
 
 
 /*
  * Actions
  */
 
+if ($cancel)
+{
+	if (! empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
+	$action='';
+}
+
+
 $actionobject = new ActionsTicketsup($db);
 $actionobject->doActions($action, $object);
 
+// Action to update one extrafield
+if ($action == "update_extras" && ! empty($permissiontoadd))
+{
+	$object->fetch(GETPOST('id','int'), '', GETPOST('track_id','alpha'));
+	$attributekey = GETPOST('attribute','alpha');
+	$attributekeylong = 'options_'.$attributekey;
+	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
+
+	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+	if ($result > 0)
+	{
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+		$action = 'view';
+	}
+	else
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = 'edit_extras';
+	}
+}
+
+if ($action == "change_property" && GETPOST('btn_update_ticket_prop','alpha') && $user->rights->ticketsup->write)
+{
+	$object->fetch(GETPOST('id','int'), '', GETPOST('track_id','alpha'));
+
+	$object->type_code = GETPOST('update_value_type','az09');
+	$object->category_code = GETPOST('update_value_category','az09');
+	$object->severity_code = GETPOST('update_value_severity','az09');
+
+	$ret = $object->update($user);
+	if ($ret > 0) {
+		$log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
+		$ret = $object->createTicketLog($user, $log_action);
+		if ($ret > 0) {
+			setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
+		}
+	}
+	$action = 'view';
+}
+
 $permissiondellink = $user->rights->ticketsup->write;
 include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';        // Must be include, not include_once
 
@@ -98,9 +153,14 @@ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';        // Must be inc
 $userstat = new User($db);
 $form = new Form($db);
 $formticket = new FormTicketsup($db);
-$formproject = new FormProjets($db);
 
-if ($action == 'view' || $action == 'add_message' || $action == 'close' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen' || $action == 'editsubject' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink') {
+if (! empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
+
+if ($action == 'view' || $action == 'add_message' || $action == 'close' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
+	|| $action == 'editsubject' || $action == 'edit_extras' || $action == 'update_extras' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink')
+{
 
     if ($res > 0) {
         // or for unauthorized internals users
@@ -412,29 +472,8 @@ if ($action == 'view' || $action == 'add_message' || $action == 'close' || $acti
         print '</td></tr>';
 
         // Other attributes
-        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        if (empty($reshook) && !empty($extrafields->attribute_label)) {
-            if ($action == "edit_extrafields") {
-                print '<form method="post" name="form_edit_extrafields" enctype="multipart/form-data" action="' . $url_page_current . '">';
-                print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-                print '<input type="hidden" name="action" value="set_extrafields">';
-                print '<input type="hidden" name="track_id" value="' . $object->track_id . '">';
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-                print $object->showOptionals($extrafields, 'edit');
-                print '<tr><td colspan="2" align="center">';
-                print ' <input class="button" type="submit" name="btn_edit_extrafields" value="' . $langs->trans("Modify") . '" />';
-                print ' <input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '" />';
-                print '</tr>';
-                print '</form>';
-            } else {
-                print $object->showOptionals($extrafields);
-                if ($user->rights->ticketsup->write) {
-                    print '<tr><td colspan="2" align="center">';
-                    print '<a href="' . $url_page_current . '?track_id=' . $object->track_id . '&action=edit_extrafields">' . img_picto('', 'edit') . ' ' . $langs->trans('Edit') . '</a>';
-                    print '</tr>';
-                }
-            }
-        }
         print '</table>';
 
 
@@ -451,92 +490,82 @@ if ($action == 'view' || $action == 'add_message' || $action == 'close' || $acti
          *      Classification and actions on ticket
          *
          ***************************************************/
-        /*
-         * Ticket properties
-         */
+
+        print '<form method="post" name="formticketsupproperties" action="' . $url_page_current . '">';
+        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        print '<input type="hidden" name="action" value="change_property">';
+        print '<input type="hidden" name="property" value="' . $property['dict'] . '">';
+        print '<input type="hidden" name="track_id" value="' . $track_id . '">';
+
         print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
         print '<table class="border centpercent margintable">';
         print '<tr class="liste_titre">';
-        print '<td colspan="2">';
+        print '<td>';
         print $langs->trans('Properties');
         print '</td>';
+        print '<td>';
+        if (GETPOST('set','alpha') == 'properties' && $user->rights->ticketsup->write) {
+        	print '<input class="button" type="submit" name="btn_update_ticket_prop" value="' . $langs->trans("Modify") . '" />';
+        }
+        else {
+        	//    Button to edit Properties
+        	if ($object->fk_statut < 5 && $user->rights->ticketsup->write) {
+        		print '<a href="card.php?track_id=' . $object->track_id . '&action=view&set=properties">' . img_edit($langs->trans('Modify')) . '</a>';
+        	}
+        }
+        print '</td>';
         print '</tr>';
-        if (GETPOST('set') == 'properties' && $user->rights->ticketsup->write) {
-            /*
-             *  Form to change ticket properties
-             */
-            $j = 0;
-            $ticketprop[$j] = array(
-                'dict' => 'type',
-                'list_function' => 'selectTypesTickets',
-                'label' => 'TicketChangeType',
-            );
-            $j++;
-            $ticketprop[$j] = array(
-                'dict' => 'category',
-                'list_function' => 'selectCategoriesTickets',
-                'label' => 'TicketChangeCategory',
-            );
-            $j++;
-            $ticketprop[$j] = array(
-                'dict' => 'severity',
-                'list_function' => 'selectSeveritiesTickets',
-                'label' => 'TicketChangeSeverity',
-            );
-            foreach ($ticketprop as $property) {
-                print '<tr>';
-                print '<td>';
-
-                print '<form method="post" name="ticketsup" action="' . $url_page_current . '">';
-                print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-                print '<input type="hidden" name="action" value="change_property">';
-                print '<input type="hidden" name="property" value="' . $property['dict'] . '">';
-                print '<input type="hidden" name="track_id" value="' . $track_id . '">';
-                print '<table class="nobordernopadding" style="width:100%;">';
-                print '<tr>';
-                print '<td width="40%">';
-                print '<label for="type_code">' . $langs->trans($property['label']) . '</label> ';
-                print '</td><td width="50%">';
-                print $formticket->{$property['list_function']}($object->type_code, 'update_value', '', 0);
-                print '</td><td>';
-                print ' <input class="button" type="submit" name="btn_update_ticket_prop" value="' . $langs->trans("Modify") . '" />';
-                print '</td>';
-                print '</tr></table>';
-                print '</form>';
-
-                print '</td>';
-                print '</tr>';
-            }
+        if (GETPOST('set','alpha') == 'properties' && $user->rights->ticketsup->write) {
+            print '<tr>';
+            print '<td class="titlefield">';
+            print $langs->trans('TicketChangeType');
+            print '</td><td>';
+            print $formticket->selectTypesTickets($object->type_code, 'update_value_type', '', 2);
+            print '</td>';
+            print '</tr>';
+            print '<tr>';
+            print '<td>';
+            print $langs->trans('TicketChangeCategory');
+            print '</td><td>';
+            print $formticket->selectCategoriesTickets($object->category_code, 'update_value_category', '', 2);
+            print '</td>';
+            print '</tr>';
+            print '<tr>';
+            print '<td>';
+            print $langs->trans('TicketChangeSeverity');
+            print '</td><td>';
+            print $formticket->selectSeveritiesTickets($object->severity_code, 'update_value_severity', '', 2);
+            print '</td>';
+            print '</tr>';
         } else {
             // Type
-            print '<tr><td width="40%">' . $langs->trans("Type") . '</td><td>';
-            print $object->type_label;
+            print '<tr><td class="titlefield">' . $langs->trans("Type") . '</td><td>';
+            print $langs->getLabelFromKey($db, $object->type_code, 'c_ticketsup_type', 'code', 'label');
             /*if ($user->admin && !$noadmininfo) {
                 print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             }*/
-
             print '</td></tr>';
 
             // Category
             print '<tr><td>' . $langs->trans("Category") . '</td><td>';
-            print $object->category_label;
+            print $langs->getLabelFromKey($db, $object->category_code, 'c_ticketsup_category', 'code', 'label');
             /*if ($user->admin && !$noadmininfo) {
                 print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             }*/
-
             print '</td></tr>';
 
             // Severity
             print '<tr><td>' . $langs->trans("TicketSeverity") . '</td><td>';
-            print $object->severity_label;
+            print $langs->getLabelFromKey($db, $object->severity_code, 'c_ticketsup_severity', 'code', 'label');
             /*if ($user->admin && !$noadmininfo) {
                 print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             }*/
-
             print '</td></tr>';
         }
         print '</table>'; // End table actions
-		print '</div>';
+
+        print '</form>';
+        print '</div>';
 
         // Display navbar with links to change ticket status
         print '<!-- navbar with status -->';
@@ -614,15 +643,15 @@ if ($action == 'view' || $action == 'add_message' || $action == 'close' || $acti
 
 	                print '<div class="tagtd">';
 
-	                print dol_print_phone($tab[$i]['phone'], '', '', '', AC_TEL).'<br>';
+	                print dol_print_phone($tab[$i]['phone'], '', '', '', 'AC_TEL').'<br>';
 
 	                if (! empty($tab[$i]['phone_perso'])) {
 	                    //print img_picto($langs->trans('PhonePerso'),'object_phoning.png','',0,0,0).' ';
-	                    print '<br>'.dol_print_phone($tab[$i]['phone_perso'], '', '', '', AC_TEL).'<br>';
+	                    print '<br>'.dol_print_phone($tab[$i]['phone_perso'], '', '', '', 'AC_TEL').'<br>';
 	                }
 	                if (! empty($tab[$i]['phone_mobile'])) {
 	                    //print img_picto($langs->trans('PhoneMobile'),'object_phoning.png','',0,0,0).' ';
-	                    print dol_print_phone($tab[$i]['phone_mobile'], '', '', '', AC_TEL).'<br>';
+	                    print dol_print_phone($tab[$i]['phone_mobile'], '', '', '', 'AC_TEL').'<br>';
 	                }
 	                print '</div>';
 
@@ -698,11 +727,6 @@ if ($action == 'view' || $action == 'add_message' || $action == 'close' || $acti
             print '<div class="inline-block divButAction"><a class="butAction" href="' . dol_buildpath('/fichinter/card.php', 1) . '?action=create&socid=' . $object->fk_soc . '&origin=ticketsup_ticketsup&originid=' . $object->id . '">' . $langs->trans('TicketAddIntervention') . '</a></div>';
         }
 
-        //    Button to edit Properties
-        if ($object->fk_statut < 5 && $user->rights->ticketsup->write) {
-            print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id=' . $object->track_id . '&action=view&set=properties">' . $langs->trans('TicketEditProperties') . '</a></div>';
-        }
-
         //    Button to link to a contract
         if ($user->rights->ticketsup->write && $object->fk_statut < 5 && $user->rights->contrat->creer) {
             print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id=' . $object->track_id . '&action=sel_contract">' . $langs->trans('LinkToAContract') . '</a></div>';
diff --git a/htdocs/ticketsup/class/actions_ticketsup.class.php b/htdocs/ticketsup/class/actions_ticketsup.class.php
index 035b43ea1c6..a3fda3ac543 100644
--- a/htdocs/ticketsup/class/actions_ticketsup.class.php
+++ b/htdocs/ticketsup/class/actions_ticketsup.class.php
@@ -292,7 +292,7 @@ class ActionsTicketsup
                 $object->description = GETPOST("description");
 
                 //...
-                $ret = $object->update(GETPOST('id'), $user);
+                $ret = $object->update($user);
                 if ($ret <= 0) {
                     $error++;
                     $this->errors = $object->error;
@@ -383,31 +383,6 @@ class ActionsTicketsup
             $action = 'view';
         }
 
-        if ($action == "change_property" && GETPOST('btn_update_ticket_prop') && $user->rights->ticketsup->write) {
-            $this->fetch('', '', GETPOST('track_id','alpha'));
-
-            $fieldtomodify = GETPOST('property') . '_code';
-            $fieldtomodify_label = GETPOST('property') . '_label';
-
-            $oldvalue_code = $object->$fieldtomodify;
-            $newvalue_code = $object->getValueFrom('c_ticketsup_' . GETPOST('property'), GETPOST('update_value'), 'code');
-
-            $oldvalue_label = $object->$fieldtomodify_label;
-            $newvalue_label = $object->getValueFrom('c_ticketsup_' . GETPOST('property'), GETPOST('update_value'), 'label');
-
-            $object->$fieldtomodify = $newvalue_code;
-
-            $ret = $object->update($user);
-            if ($ret > 0) {
-                $log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
-                $ret = $object->createTicketLog($user, $log_action);
-                if ($ret > 0) {
-                    setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
-                }
-            }
-            $action = 'view';
-        }
-
         if ($action == "new_message" && GETPOST('btn_add_message') && $user->rights->ticketsup->read) {
             $ret = $this->newMessage($user, $action);
             if ($ret) {
@@ -436,7 +411,7 @@ class ActionsTicketsup
                 $log_action = $langs->trans('TicketLogClosedBy', $user->getFullName($langs));
                 $ret = $object->createTicketLog($user, $log_action);
                 if ($ret > 0) {
-                    setEventMessages('<div class="confirm">' . $langs->trans('TicketMarkedAsClosed') . '</div>');
+                    setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
                 } else {
                     setEventMessages($langs->trans('TicketMarkedAsClosedButLogActionNotSaved'), null, 'warnings');
                 }
@@ -523,24 +498,8 @@ class ActionsTicketsup
             }
         }
 
-        if ($action == "set_extrafields" && GETPOST('btn_edit_extrafields') && $user->rights->ticketsup->write && !GETPOST('cancel')) {
-            $res = $this->fetch('', '', GETPOST('track_id','alpha'));
 
-            $extrafields = new ExtraFields($this->db);
-            $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-            $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-
-            $ret = $object->update($user);
-            if ($ret > 0) {
-                setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
-                $url = 'card.php?action=view&track_id=' . $object->track_id;
-                header("Location: " . $url);
-                exit();
-            }
-
-            $action = 'view';
-        } // Reopen ticket
-        elseif ($action == 'confirm_reopen' && $user->rights->ticketsup->manage && !GETPOST('cancel')) {
+        if ($action == 'confirm_reopen' && $user->rights->ticketsup->manage && !GETPOST('cancel')) {
             if ($this->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
                 // prevent browser refresh from reopening ticket several times
                 if ($object->fk_statut == 8) {
@@ -775,7 +734,7 @@ class ActionsTicketsup
                             $url_public_ticket = (!empty($conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) ?
                             		(!empty($conf->global->TICKETS_URL_PUBLIC_INTERFACE) ?
                             			$conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/view.php' :
-                            			dol_buildpath('/ticketsup/public/view.php', 2)
+                            			dol_buildpath('/public/ticketsup/view.php', 2)
                             		) :
                             		dol_buildpath('/ticketsup/card.php', 2)
                             	) . '?track_id=' . $object->track_id;
@@ -944,7 +903,7 @@ class ActionsTicketsup
                         $message .= (!empty($recipient) ? $langs->trans('TicketNotificationRecipient') . ' : ' . $recipient . "\n" : '');
                     }
 
-                    $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/view.php' : dol_buildpath('/ticketsup/public/view.php', 2)) . '?track_id=' . $object->track_id;
+                    $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/view.php' : dol_buildpath('/public/ticketsup/view.php', 2)) . '?track_id=' . $object->track_id;
                     $message .= "\n\n" . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : ' . $url_public_ticket . "\n";
 
                     // Add signature
@@ -1168,16 +1127,16 @@ class ActionsTicketsup
     	print '<div class="underbanner clearboth"></div>';
     	print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
     	print '<table class="border centpercent margintable">';
-    	print '<tr class="liste_titre"><td class="nowrap" colspan="2">';
-    	print '<strong>' . $langs->trans("InitialMessage") . '</strong> ';
+    	print '<tr class="liste_titre"><td class="nowrap titlefield">';
+    	print $langs->trans("InitialMessage");
+    	print '</td><td>';
     	if ($user->rights->ticketsup->manage) {
-    		print '<a  href="' . $_SERVER['PHP_SELF'] . '?action=edit_message_init&amp;track_id=' . $object->track_id . '">' . img_edit($langs->trans('Modify')) . ' ' . $langs->trans('Modify') . '</a>';
+    		print '<a  href="' . $_SERVER['PHP_SELF'] . '?action=edit_message_init&amp;track_id=' . $object->track_id . '">' . img_edit($langs->trans('Modify')) . '</a>';
     	}
     	print '</td></tr>';
 
     	print '<tr>';
-
-    	print '<td>';
+    	print '<td colspan="2">';
     	if (!empty($user->rights->ticketsup->manage) && $action == 'edit_message_init') {
     		// MESSAGE
     		$msg = GETPOST('message_initial', 'alpha') ? GETPOST('message_initial', 'alpha') : $object->message;
@@ -1486,7 +1445,7 @@ class ActionsTicketsup
         global $langs;
 
         print '<div class="div-table-responsive-no-min">';
-        print '<div class="tagtable noborder ">';
+        print '<div class="tagtable centpercent">';
         print '<div class="tagtr liste_titre">';
         print '<div class="tagtd">';
         print '<strong>' . $langs->trans('TicketChangeStatus') . '</strong>';
diff --git a/htdocs/ticketsup/class/api_dictionaryticketsupcategories.class.php b/htdocs/ticketsup/class/api_dictionaryticketsupcategories.class.php
deleted file mode 100644
index d33f96db881..00000000000
--- a/htdocs/ticketsup/class/api_dictionaryticketsupcategories.class.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
- * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-use Luracast\Restler\RestException;
-
-require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
-
-/**
- * API class for ticketsup types
- *
- * @access protected
- * @class DolibarrApiAccess {@requires user,external}
- */
-class DictionaryTicketsupCategories extends DolibarrApi
-{
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
-
-    /**
-     * Get the list of ticketsup types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
-     *
-     * @throws RestException
-     */
-    function index($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, pos,  label, use_default, description";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ticketsup_category as t";
-        $sql.= " WHERE t.active = 1";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql.= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of ticketsup categories : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-
-}
diff --git a/htdocs/ticketsup/class/api_dictionaryticketsupseverities.class.php b/htdocs/ticketsup/class/api_dictionaryticketsupseverities.class.php
deleted file mode 100644
index 892563ad426..00000000000
--- a/htdocs/ticketsup/class/api_dictionaryticketsupseverities.class.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
- * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-use Luracast\Restler\RestException;
-
-require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
-
-/**
- * API class for ticketsup severities
- *
- * @access protected
- * @class DolibarrApiAccess {@requires user,external}
- */
-class DictionaryTicketsupSeverities extends DolibarrApi
-{
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
-
-    /**
-     * Get the list of ticketsup types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
-     *
-     * @throws RestException
-     */
-    function index($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, pos,  label, use_default, color, description";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ticketsup_severity as t";
-        $sql.= " WHERE t.active = 1";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql.= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of ticketsup severities : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-
-}
diff --git a/htdocs/ticketsup/class/api_dictionaryticketsuptypes.class.php b/htdocs/ticketsup/class/api_dictionaryticketsuptypes.class.php
deleted file mode 100644
index 90b8d4f6bbc..00000000000
--- a/htdocs/ticketsup/class/api_dictionaryticketsuptypes.class.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
- * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-use Luracast\Restler\RestException;
-
-require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
-
-/**
- * API class for ticketsup types
- *
- * @access protected
- * @class DolibarrApiAccess {@requires user,external}
- */
-class DictionaryTicketsupTypes extends DolibarrApi
-{
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
-
-    /**
-     * Get the list of ticketsup types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
-     *
-     * @throws RestException
-     */
-    function index($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, pos,  label, use_default, description";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ticketsup_type as t";
-        $sql.= " WHERE t.active = 1";
-        if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql.= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of ticketsup types : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-
-}
diff --git a/htdocs/ticketsup/class/api_ticketsups.class.php b/htdocs/ticketsup/class/api_tickets.class.php
similarity index 67%
rename from htdocs/ticketsup/class/api_ticketsups.class.php
rename to htdocs/ticketsup/class/api_tickets.class.php
index ee696b34505..d0cd018648c 100644
--- a/htdocs/ticketsup/class/api_ticketsups.class.php
+++ b/htdocs/ticketsup/class/api_tickets.class.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/ticketsup.lib.php';
  *
  *
  */
-class Ticketsups extends DolibarrApi
+class Tickets extends DolibarrApi
 {
     /**
      * @var array   $FIELDS     Mandatory fields, checked when create and update object
@@ -53,36 +53,93 @@ class Ticketsups extends DolibarrApi
 
     /**
      * Constructor
-     *
-     * @url     GET ticketsup/
-     *
      */
     public function __construct()
     {
-    		global $db;
-    		$this->db = $db;
+    	global $db;
+    	$this->db = $db;
         $this->ticketsup = new Ticketsup($this->db);
     }
 
     /**
-    * Get properties of a ticketsup object
-    *
-    * Return an array with ticketsup informations
-    *
-    * @param 	int 	$id ID of ticketsup
-    * @param   string  $track_id Tracking ID of ticket
-    * @param   string  $ref    Reference for ticket
-    * @return 	array|mixed data without useless information
-    *
-    * @url GET track_id/{track_id}
-    * @url GET ref/{ref}
-    * @url GET {id}
-    * @throws 	RestException
-    */
-    public function get($id = 0, $track_id = '', $ref = '')
+     * Get properties of a Ticket object.
+     *
+     * Return an array with ticket informations
+     *
+     * @param	int 			$id 		ID of ticketsup
+     * @return 	array|mixed 				Data without useless information
+     *
+     * @throws 	401
+     * @throws 	403
+     * @throws 	404
+     */
+    function get($id)
+    {
+    	return $this->getCommon($id, '', '');
+    }
+
+    /**
+     * Get properties of a Ticket object from track id
+     *
+     * Return an array with ticket informations
+     *
+     * @param	string  		$track_id 	Tracking ID of ticket
+     * @return 	array|mixed 				Data without useless information
+     *
+     * @url GET track_id/{track_id}
+     *
+     * @throws 	401
+     * @throws 	403
+     * @throws 	404
+     */
+    public function getByTrackId($track_id)
+    {
+		return $this->getCommon(0, $track_id, '');
+    }
+
+    /**
+     * Get properties of a Ticket object from ref
+     *
+     * Return an array with ticket informations
+     *
+     * @param	string  		$ref    	Reference for ticket
+     * @return 	array|mixed 				Data without useless information
+     *
+     * @url GET ref/{ref}
+     *
+     * @throws 	401
+     * @throws 	403
+     * @throws 	404
+     */
+    public function getByRef($ref)
+    {
+    	try {
+    		return $this->getCommon(0, '', $ref);
+    	}
+    	catch(Exception $e)
+    	{
+   			throw $e;
+    	}
+    }
+
+    /**
+     * Get properties of a Ticket object
+     *
+     * Return an array with ticket informations
+     *
+     * @param	int 			$id 		ID of ticketsup
+     * @param	string  		$track_id 	Tracking ID of ticket
+     * @param	string  		$ref    	Reference for ticket
+     * @return 	array|mixed 				Data without useless information
+     *
+     * @throws 	401
+     * @throws 	403
+     * @throws 	404
+     */
+    public function getCommon($id = 0, $track_id = '', $ref = '')
     {
         if (! DolibarrApiAccess::$user->rights->ticketsup->read) {
-            throw new RestException(401);
+            throw new RestException(403);
         }
 
         // Check parameters
@@ -258,16 +315,15 @@ class Ticketsups extends DolibarrApi
         if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
             $result = $db->query($sql);
             $nbtotalofrecords = $db->num_rows($result);
-        }
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
+            if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+            {
+            	$page = 0;
+            	$offset = 0;
             }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
         }
+
+        $sql.= $db->plimit($limit + 1, $offset);
+
         $result = $db->query($sql);
         if ($result) {
             $num = $db->num_rows($result);
@@ -422,6 +478,190 @@ class Ticketsups extends DolibarrApi
         );
     }
 
+
+    /**
+     * Get the list of tickets categories.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number (starting from zero)
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+     * @return List of events types
+     *
+     * @url     GET setup/dictionary/categories
+     *
+     * @throws RestException
+     */
+    function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+    {
+    	$list = array();
+
+    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticketsup_category as t";
+    	$sql.= " WHERE t.active = 1";
+    	// Add sql filters
+    	if ($sqlfilters)
+    	{
+    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		{
+    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+    		}
+    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    	}
+
+
+    	$sql.= $this->db->order($sortfield, $sortorder);
+
+    	if ($limit) {
+    		if ($page < 0) {
+    			$page = 0;
+    		}
+    		$offset = $limit * $page;
+
+    		$sql .= $this->db->plimit($limit, $offset);
+    	}
+
+    	$result = $this->db->query($sql);
+
+    	if ($result) {
+    		$num = $this->db->num_rows($result);
+    		$min = min($num, ($limit <= 0 ? $num : $limit));
+    		for ($i = 0; $i < $min; $i++) {
+    			$list[] = $this->db->fetch_object($result);
+    		}
+    	} else {
+    		throw new RestException(503, 'Error when retrieving list of ticketsup categories : '.$this->db->lasterror());
+    	}
+
+    	return $list;
+    }
+
+    /**
+     * Get the list of tickets severity.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number (starting from zero)
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+     * @return List of events types
+     *
+     * @url     GET setup/dictionary/severities
+     *
+     * @throws RestException
+     */
+    function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+    {
+    	$list = array();
+
+    	$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticketsup_severity as t";
+    	$sql.= " WHERE t.active = 1";
+    	// Add sql filters
+    	if ($sqlfilters)
+    	{
+    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		{
+    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+    		}
+    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    	}
+
+
+    	$sql.= $this->db->order($sortfield, $sortorder);
+
+    	if ($limit) {
+    		if ($page < 0) {
+    			$page = 0;
+    		}
+    		$offset = $limit * $page;
+
+    		$sql .= $this->db->plimit($limit, $offset);
+    	}
+
+    	$result = $this->db->query($sql);
+
+    	if ($result) {
+    		$num = $this->db->num_rows($result);
+    		$min = min($num, ($limit <= 0 ? $num : $limit));
+    		for ($i = 0; $i < $min; $i++) {
+    			$list[] = $this->db->fetch_object($result);
+    		}
+    	} else {
+    		throw new RestException(503, 'Error when retrieving list of ticketsup severities : '.$this->db->lasterror());
+    	}
+
+    	return $list;
+    }
+
+    /**
+     * Get the list of tickets types.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number (starting from zero)
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+     * @return List of events types
+     *
+     * @url     GET setup/dictionary/types
+     *
+     * @throws RestException
+     */
+    function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+    {
+    	$list = array();
+
+    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticketsup_type as t";
+    	$sql.= " WHERE t.active = 1";
+    	if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
+    	if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+    	// Add sql filters
+    	if ($sqlfilters)
+    	{
+    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		{
+    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+    		}
+    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    	}
+
+
+    	$sql.= $this->db->order($sortfield, $sortorder);
+
+    	if ($limit) {
+    		if ($page < 0) {
+    			$page = 0;
+    		}
+    		$offset = $limit * $page;
+
+    		$sql .= $this->db->plimit($limit, $offset);
+    	}
+
+    	$result = $this->db->query($sql);
+
+    	if ($result) {
+    		$num = $this->db->num_rows($result);
+    		$min = min($num, ($limit <= 0 ? $num : $limit));
+    		for ($i = 0; $i < $min; $i++) {
+    			$list[] = $this->db->fetch_object($result);
+    		}
+    	} else {
+    		throw new RestException(503, 'Error when retrieving list of ticketsup types : '.$this->db->lasterror());
+    	}
+
+    	return $list;
+    }
+
+
+
+
+
     /**
      * Validate fields before create or update object
      *
@@ -475,9 +715,9 @@ class Ticketsups extends DolibarrApi
     function _cleanObjectDatas($object)
     {
 
-        // Remove $db object property for object
-        unset($object->db);
+    	$object = parent::_cleanObjectDatas($object);
 
+    	// Other attributes to clean
         $attr2clean = array(
             "contact",
             "contact_id",
@@ -516,7 +756,9 @@ class Ticketsups extends DolibarrApi
             "firstname",
             "civility_id",
             "cache_msgs_ticket",
-            "cache_logs_ticket"
+            "cache_logs_ticket",
+        	"statuts_short",
+        	"statuts"
         );
         foreach ($attr2clean as $toclean) {
             unset($object->$toclean);
diff --git a/htdocs/ticketsup/class/ticketsup.class.php b/htdocs/ticketsup/class/ticketsup.class.php
index ed27003846b..61e5f5dd04a 100644
--- a/htdocs/ticketsup/class/ticketsup.class.php
+++ b/htdocs/ticketsup/class/ticketsup.class.php
@@ -175,27 +175,27 @@ class Ticketsup extends CommonObject
     public $fields=array(
         'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'position'=>1, 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id"),
     	'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1),
-    	'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object"),
-        'notify_tiers_at_create' => array('type'=>'integer', 'label'=>'NotifyThirdparty', 'visible'=>-2, 'enabled'=>0, 'position'=>20, 'notnull'=>1, 'index'=>1),
-        'track_id' => array('type'=>'varchar(255)', 'label'=>'TrackID', 'visible'=>0, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),
-	    'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>1, 'enabled'=>1, 'position'=>49, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object"),
+    	'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'aaa'),
+	    'track_id' => array('type'=>'varchar(255)', 'label'=>'TrackID', 'visible'=>0, 'enabled'=>1, 'position'=>11, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),
+	    'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1),
+    	'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>1, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object"),
+    	'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>""),
+    	'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth100'),
+    	'category_code' => array('type'=>'varchar(32)', 'label'=>'Category', 'visible'=>1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth100'),
+	    'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth100'),
     	'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToThirparty"),
-        'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToProject"),
-        'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
+	    'notify_tiers_at_create' => array('type'=>'integer', 'label'=>'NotifyThirdparty', 'visible'=>-2, 'enabled'=>0, 'position'=>51, 'notnull'=>1, 'index'=>1),
+    	'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>1, 'enabled'=>1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToProject"),
         'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
-        'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>12, 'notnull'=>-1, 'searchall'=>1, 'help'=>""),
         'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>60, 'notnull'=>-1,),
-        'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-2, 'enabled'=>1, 'position'=>40, 'notnull'=>1),
         'progress' => array('type'=>'varchar(100)', 'label'=>'Progression', 'visible'=>1, 'enabled'=>1, 'position'=>41, 'notnull'=>-1, 'searchall'=>1, 'help'=>""),
         'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'help'=>""),
-        'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'searchall'=>1, 'help'=>""),
-        'category_code' => array('type'=>'varchar(32)', 'label'=>'Category', 'visible'=>1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'searchall'=>1, 'help'=>""),
-        'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'searchall'=>1, 'help'=>""),
         'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
         'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
         'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
         'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>501, 'notnull'=>1),
-	    'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'Closed', 9 => 'Deleted'))
+	    'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-2, 'enabled'=>1, 'position'=>550, 'notnull'=>1),
+    	'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'Closed', 9 => 'Deleted'))
     );
 
     /**
@@ -400,7 +400,7 @@ class Ticketsup extends CommonObject
             }
 
             //Update extrafield
-            if (!$error) {
+            if (! $error) {
                 if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used
                     $result = $this->insertExtraFields();
                     if ($result < 0) {
@@ -489,7 +489,8 @@ class Ticketsup extends CommonObject
         dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
-            if ($this->db->num_rows($resql)) {
+            if ($this->db->num_rows($resql))
+            {
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id = $obj->rowid;
@@ -529,10 +530,14 @@ class Ticketsup extends CommonObject
                 $this->tms = $this->db->jdate($obj->tms);
 
                 $this->fetch_optionals();
-            }
-            $this->db->free($resql);
 
-            return 1;
+                $this->db->free($resql);
+                return 1;
+            }
+			else
+			{
+            	return 0;
+			}
         } else {
             $this->error = "Error " . $this->db->lasterror();
             dol_syslog(get_class($this) . "::fetch " . $this->error, LOG_ERR);
@@ -586,8 +591,8 @@ class Ticketsup extends CommonObject
         $sql .= " t.tms";
         $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
         // Add fields for extrafields
-        foreach ($extrafields->attribute_list as $key => $val) {
-        	$sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef." . $key . ' as options_' . $key : '');
+        foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
+        	$sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? ",ef." . $key . ' as options_' . $key : '');
         }
         $sql .= " FROM " . MAIN_DB_PREFIX . "ticketsup as t";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_ticketsup_type as type ON type.code=t.type_code";
@@ -596,7 +601,7 @@ class Ticketsup extends CommonObject
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid=t.fk_soc";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as uc ON uc.rowid=t.fk_user_create";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as ua ON ua.rowid=t.fk_user_assign";
-        if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+        if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label'])) {
             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "ticketsup_extrafields as ef on (t.rowid = ef.fk_object)";
         }
         if (!$user->rights->societe->client->voir && !$user->socid) {
@@ -690,8 +695,8 @@ class Ticketsup extends CommonObject
                     $line->date_close = $this->db->jdate($obj->date_close);
 
                     // Extra fields
-                    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
-                        foreach ($extrafields->attribute_label as $key => $val) {
+                    if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label'])) {
+                    	foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
                             $tmpkey = 'options_' . $key;
                             $line->{$tmpkey} = $obj->$tmpkey;
                         }
@@ -810,44 +815,35 @@ class Ticketsup extends CommonObject
         $sql .= " datec=" . (dol_strlen($this->datec) != 0 ? "'" . $this->db->idate($this->datec) . "'" : 'null') . ",";
         $sql .= " date_read=" . (dol_strlen($this->date_read) != 0 ? "'" . $this->db->idate($this->date_read) . "'" : 'null') . ",";
         $sql .= " date_close=" . (dol_strlen($this->date_close) != 0 ? "'" . $this->db->idate($this->date_close) . "'" : 'null') . "";
-
         $sql .= " WHERE rowid=" . $this->id;
 
         $this->db->begin();
 
-        dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
             $this->errors[] = "Error " . $this->db->lasterror();
         }
 
-        if (!$error) {
-            // FIXME le hook fait double emploi avec le trigger !!
-            $hookmanager->initHooks(array('TicketSupDao'));
-            $parameters = array('ticketsupid' => $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++;
-                    }
-                }
-            } elseif ($reshook < 0) {
-                $error++;
-            }
-
-            if (!$notrigger) {
-            	// Call trigger
-            	$result=$this->call_trigger('TICKET_MODIFY', $user);
-            	if ($result < 0) {
+        if (! $error) {
+            // Update extrafields
+            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used
+                $result = $this->insertExtraFields();
+                if ($result < 0) {
                     $error++;
                 }
-            	// End call triggers
             }
         }
 
+        if (! $error && ! $notrigger) {
+        	// Call trigger
+        	$result=$this->call_trigger('TICKET_MODIFY', $user);
+        	if ($result < 0) {
+                $error++;
+            }
+          	// End call triggers
+        }
+
         // Commit or rollback
         if ($error) {
             foreach ($this->errors as $errmsg) {
@@ -1595,7 +1591,7 @@ class Ticketsup extends CommonObject
                     $url_internal_ticket = dol_buildpath('/ticketsup/card.php', 2) . '?track_id=' . $this->track_id;
                     $message .= "\n" . $langs->transnoentities('TicketNotificationEmailBodyInfosTrackUrlinternal') . ' : ' . '<a href="' . $url_internal_ticket . '">' . $this->track_id . '</a>' . "\n";
                 } else {
-                    $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/ticketsup/public/view.php', 2)) . '?track_id=' . $this->track_id;
+                    $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/public/ticketsup/view.php', 2)) . '?track_id=' . $this->track_id;
                     $message .= "\n" . $langs->transnoentities('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : ' . '<a href="' . $url_public_ticket . '">' . $this->track_id . '</a>' . "\n";
                 }
 
@@ -1646,7 +1642,7 @@ class Ticketsup extends CommonObject
     {
         global $langs;
 
-        if (count($this->cache_logs_ticket)) {
+        if (is_array($this->cache_logs_ticket) && count($this->cache_logs_ticket)) {
             return 0;
         }
         // Cache deja charge
@@ -1758,7 +1754,7 @@ class Ticketsup extends CommonObject
     {
         global $langs;
 
-        if (count($this->cache_msgs_ticket)) {
+        if (is_array($this->cache_msgs_ticket) && count($this->cache_msgs_ticket)) {
             return 0;
         }
         // Cache deja charge
@@ -1941,7 +1937,7 @@ class Ticketsup extends CommonObject
 
         // Generation requete recherche
         $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "socpeople";
-        $sql .= " WHERE entity IN (" . getEntity('ticketsup', 1) . ")";
+        $sql .= " WHERE entity IN (" . getEntity('socpeople') . ")";
         if (!empty($socid)) {
             $sql .= " AND fk_soc='" . $this->db->escape($socid) . "'";
         }
diff --git a/htdocs/ticketsup/css/bg.css.php b/htdocs/ticketsup/css/bg.css.php
deleted file mode 100755
index d54233860f7..00000000000
--- a/htdocs/ticketsup/css/bg.css.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
-if (! defined('NOREQUIRESOC')) {
-    define('NOREQUIRESOC', '1');
-}
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (! defined('NOCSRFCHECK')) {
-    define('NOCSRFCHECK', 1);
-}
-if (! defined('NOTOKENRENEWAL')) {
-    define('NOTOKENRENEWAL', 1);
-}
-if (! defined('NOLOGIN')) {
-    define('NOLOGIN', 1);          // File must be accessed by logon page so without login
-}if (! defined('NOREQUIREMENU')) {
-    define('NOREQUIREMENU', 1);
-}
-if (! defined('NOREQUIREHTML')) {
-    define('NOREQUIREHTML', 1);
-}
-if (! defined('NOREQUIREAJAX')) {
-    define('NOREQUIREAJAX', '1');
-}
-
-session_cache_limiter(false);
-
-require_once '../../../main.inc.php';
-
-// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
-if (empty($user->id) && ! empty($_SESSION['dol_login'])) {
-    $user->fetch('', $_SESSION['dol_login']);
-}
-
-
-// Define css type
-header('Content-type: text/css');
-// Important: Following code is to avoid page request by browser and PHP CPU at
-// each Dolibarr page access.
-if (empty($dolibarr_nocache)) {
-    header('Cache-Control: max-age=3600, public, must-revalidate');
-} else {
-    header('Cache-Control: no-cache');
-}
-
-// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
-    ob_start("ob_gzhandler");
-}
-
-
-print 'html {';
-if (! empty($conf->global->TICKETS_SHOW_MODULE_LOGO)) {
-    print 'background: url("../public/img/bg_ticket.png") no-repeat 95% 90%;';
-}
-print '}';
diff --git a/htdocs/ticketsup/css/styles.css b/htdocs/ticketsup/css/styles.css.php
similarity index 60%
rename from htdocs/ticketsup/css/styles.css
rename to htdocs/ticketsup/css/styles.css.php
index 694e1c27816..d52739d9dc0 100644
--- a/htdocs/ticketsup/css/styles.css
+++ b/htdocs/ticketsup/css/styles.css.php
@@ -1,7 +1,61 @@
+<?php
+/* Copyright (C) 2018	Laurent Destailleur		<eldy@users.sourceforge.net>
+ *
+ * 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 FI8TNESS 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/ticketsup/css/styles.css.php
+ *		\brief      File for CSS style sheet for ticket module
+ */
+
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
+//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
+if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
+if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
+if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be accessed by logon page so without login
+//if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
+if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
+if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+
+session_cache_limiter(false);
+
+require_once '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+// Define css type
+top_httphead('text/css');
+// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
+
+?>
+
 html {
     min-height: 100%; height: 100%;
 }
 
+html {
+<?php
+if (! empty($conf->global->TICKETS_SHOW_MODULE_LOGO)) {
+    print 'background: url("../public/img/bg_ticket.png") no-repeat 95% 90%;';
+}
+?>
+}
+
 body {
     font-size: 0.88em;
     background: none;
@@ -103,13 +157,3 @@ div.corps {
 }
 #form_create_ticket input.text,
 #form_create_ticket textarea { width:450px;}
- div.info {
-    background: none repeat scroll 0% 0% rgb(252, 245, 184);
-    padding: 2px 4px 2px 6px;
-    margin: 1.5em 1em;
-    border: 1px solid rgb(188, 169, 54);
-    font-weight: normal;
-
-}
-
-div.warning { color: #333333;}
diff --git a/htdocs/ticketsup/img/ticketsup.png b/htdocs/ticketsup/img/ticketsup.png
index ce4b71ca624..b1cf5df0e75 100644
Binary files a/htdocs/ticketsup/img/ticketsup.png and b/htdocs/ticketsup/img/ticketsup.png differ
diff --git a/htdocs/ticketsup/list.php b/htdocs/ticketsup/list.php
index 364eab864e2..d2127fd875f 100644
--- a/htdocs/ticketsup/list.php
+++ b/htdocs/ticketsup/list.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2013-2018    Jean-François FERRY <hello@librethic.io>
- * Copyright (C) 2016         Christophe Battarel <christophe@altairis.fr>
+/* Copyright (C) 2013-2018	Jean-François FERRY	<hello@librethic.io>
+ * Copyright (C) 2016		Christophe Battarel	<christophe@altairis.fr>
+ * Copyright (C) 2018		Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -86,7 +87,7 @@ $search_all=trim(GETPOST("search_all",'alpha'));
 $search=array();
 foreach($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
 }
 
 
@@ -94,23 +95,24 @@ foreach($object->fields as $key => $val)
 $fieldstosearchall = array();
 foreach($object->fields as $key => $val)
 {
-    if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
 }
 
 // Definition of fields for list
 $arrayfields=array();
 foreach($object->fields as $key => $val)
 {
-    // If $val['visible']==0, then we never show the field
-    if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	// If $val['visible']==0, then we never show the field
+	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
 {
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-    }
+	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	{
+		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -141,32 +143,32 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
-    {
-        foreach($object->fields as $key => $val)
-        {
-            $search[$key]='';
-        }
-        $toselect='';
-        $search_array_options=array();
-    }
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-        || GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
-    {
-        $massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	{
+		foreach($object->fields as $key => $val)
+		{
+			$search[$key]='';
+		}
+		$toselect='';
+		$search_array_options=array();
+	}
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
+		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+	{
+		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    $objectclass='Ticketsup';
-    $objectlabel='Ticketsup';
-    $permtoread = $user->rights->ticketsup->read;
-    $permtodelete = $user->rights->ticketsup->delete;
-    $uploaddir = $conf->ticketsup->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass='Ticketsup';
+	$objectlabel='Ticketsup';
+	$permtoread = $user->rights->ticketsup->read;
+	$permtodelete = $user->rights->ticketsup->delete;
+	$uploaddir = $conf->ticketsup->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -191,17 +193,18 @@ $socstatic = new Societe($db);
 $sql = 'SELECT ';
 foreach($object->fields as $key => $val)
 {
-    $sql.='t.'.$key.', ';
+	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+if (! empty($extrafields->attributes[$object->table_element]['label']))
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."ticketsup_extrafields as ef on (t.rowid = ef.fk_object)";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."ticketsup_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('ticketsup').")";
 else $sql.=" WHERE 1 = 1";
 foreach($search as $key => $val)
@@ -230,18 +233,19 @@ $reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters, $object)
 $sql.=$hookmanager->resPrint;
 
 /* If a group by is required
- $sql.= " GROUP BY "
- foreach($object->fields as $key => $val)
- {
- $sql.='t.'.$key.', ';
- }
- // Add fields from extrafields
- foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
- // Add where from hooks
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
- $sql.=$hookmanager->resPrint;
- */
+$sql.= " GROUP BY "
+foreach($object->fields as $key => $val)
+{
+	$sql.='t.'.$key.', ';
+}
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+*/
 
 $sql.=$db->order($sortfield,$sortorder);
 
@@ -249,42 +253,41 @@ $sql.=$db->order($sortfield,$sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-}
-// if total resultset is smaller then paging size (filtering), goto and load page 0
-if (($page * $limit) > $nbtotalofrecords)
-{
-    $page = 0;
-    $offset = 0;
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 // if total resultset is smaller the limit, no need to do paging.
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
-    $resql = $result;
-    $num = $nbtotalofrecords;
+	$resql = $result;
+	$num = $nbtotalofrecords;
 }
 else
 {
-    $sql.= $db->plimit($limit+1, $offset);
+	$sql.= $db->plimit($limit+1, $offset);
 
-    $resql=$db->query($sql);
-    if (! $resql)
-    {
-        dol_print_error($db);
-        exit;
-    }
+	$resql=$db->query($sql);
+	if (! $resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
 
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 }
 
 // Direct jump if only one record found
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/ticketsup/card.php?id='.$id);
-    exit;
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".DOL_URL_ROOT.'/ticketsup/card.php?id='.$id);
+	exit;
 }
 
 
@@ -313,17 +316,28 @@ if ($socid && !$projectid && $user->rights->societe->lire) {
         // Customer code
         if ($socstat->client && !empty($socstat->code_client)) {
             print '<tr><td class="titlefield">';
-            print $langs->trans('CustomerCode') . '</td><td colspan="' . (2 + (($showlogo || $showbarcode) ? 0 : 1)) . '">';
+            print $langs->trans('CustomerCode') . '</td><td>';
             print $socstat->code_client;
             if ($socstat->check_codeclient() != 0) {
                 print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
             }
 
             print '</td>';
-            print $htmllogobar;
-            $htmllogobar = '';
             print '</tr>';
         }
+        // Supplier code
+        if ($socstat->fournisseur && !empty($socstat->code_fournisseur)) {
+        	print '<tr><td class="titlefield">';
+        	print $langs->trans('SupplierCode') . '</td><td>';
+        	print $socstat->code_fournisseur;
+        	if ($socstat->check_codefournisseur() != 0) {
+        		print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+        	}
+
+        	print '</td>';
+        	print '</tr>';
+        }
+
         print '</table>';
         print '</div>';
         dol_fiche_end();
@@ -403,7 +417,7 @@ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&con
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 foreach($search as $key => $val)
 {
-    $param.= '&search_'.$key.'='.urlencode($search[$key]);
+	$param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -413,8 +427,8 @@ if ($projectid) $param.='&projectid='.urlencode($projectid);
 
 // List of mass actions available
 $arrayofmassactions =  array(
-    //'presend'=>$langs->trans("SendByMail"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($user->rights->ticketsup->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
 if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
@@ -434,9 +448,15 @@ print '<input type="hidden" name="mode" value="' . $mode . '" >';
 if ($socid)     print '<input type="hidden" name="socid" value="' . $socid . '" >';
 if ($projectid) print '<input type="hidden" name="projectid" value="' . $projectid . '" >';
 
-$buttontocreate = '<a class="butAction" href="new.php?action=create_ticket' . ($socid ? '&socid=' . $socid : '') . ($projectid ? '&origin=projet_project&originid=' . $projectid : '') . '">' . $langs->trans('NewTicket') . '</a>';
+$newcardbutton='';
+if ($user->rights->ticketsup->write)
+{
+	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/ticketsup/new.php?action=create_ticket' . ($socid ? '&socid=' . $socid : '') . ($projectid ? '&origin=projet_project&originid=' . $projectid : '') . '">' . $langs->trans('NewTicket');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
+}
 
-print_barre_liste($langs->trans('TicketList'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_ticketsup', 0, $buttontocreate, '', $limit);
+print_barre_liste($langs->trans('TicketList'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_ticketsup', 0, $newcardbutton, '', $limit);
 
 if ($mode == 'my_assign') {
     print '<div class="opacitymedium">' . $langs->trans('TicketAssignedToMeInfos') . '</div><br>';
@@ -445,13 +465,13 @@ if ($mode == 'my_assign') {
 $topicmail="SendTicketsupRef";
 $modelmail="ticketsup";
 $objecttmp=new Ticketsup($db);
-$trackid='xxxx'.$object->id;
+$trackid='tick'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+	print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
 }
 
 if ($search_fk_status == 'non_closed') {
@@ -466,8 +486,8 @@ if ($search_fk_status == 'non_closed') {
 
 $moreforfilter = '';
 /*$moreforfilter.='<div class="divsearchfield">';
- $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
- $moreforfilter.= '</div>';*/
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
@@ -476,9 +496,9 @@ else $moreforfilter = $hookmanager->resPrint;
 
 if (! empty($moreforfilter))
 {
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print $moreforfilter;
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -495,32 +515,32 @@ print '<tr class="liste_titre">';
 
 foreach($object->fields as $key => $val)
 {
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-    if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-    if ($key == 'status') $align.=($align?' ':'').'center';
-    if (! empty($arrayfields['t.'.$key]['checked'])) {
-        if ($key == 'type_code') {
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-            $formTicket->selectTypesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 0, 1, 1, 0, 'maxwidth200');
-            print '</td>';
-        } elseif ($key == 'category_code') {
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-            $formTicket->selectCategoriesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 0, 1, 1, 0, 'maxwidth200');
-            print '</td>';
-        } elseif ($key == 'severity_code') {
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-            $formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 0, 1, 1, 0, 'maxwidth200');
-            print '</td>';
-        } elseif ($key == 'fk_statut') {
-        	print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	$object->printSelectStatus(dol_escape_htmltag($search[$key]));
-        	print '</td>';
-        }
-        else {
-            print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
-        }
-    }
+	$align='';
+	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
+	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
+	if ($key == 'status') $align.=($align?' ':'').'center';
+	if (! empty($arrayfields['t.'.$key]['checked'])) {
+		if ($key == 'type_code') {
+			print '<td class="liste_titre'.($align?' '.$align:'').'">';
+			$formTicket->selectTypesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 0, 1, 1, 0, ($val['css']?$val['css']:'maxwidth200'));
+			print '</td>';
+		} elseif ($key == 'category_code') {
+			print '<td class="liste_titre'.($align?' '.$align:'').'">';
+			$formTicket->selectCategoriesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 0, 1, 1, 0, ($val['css']?$val['css']:'maxwidth200'));
+			print '</td>';
+		} elseif ($key == 'severity_code') {
+			print '<td class="liste_titre'.($align?' '.$align:'').'">';
+			$formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 0, 1, 1, 0, ($val['css']?$val['css']:'maxwidth200'));
+			print '</td>';
+		} elseif ($key == 'fk_statut') {
+			print '<td class="liste_titre'.($align?' '.$align:'').'">';
+			$object->printSelectStatus(dol_escape_htmltag($search[$key]));
+			print '</td>';
+		}
+		else {
+			print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+		}
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -534,7 +554,6 @@ print '<td class="liste_titre" align="right">';
 $searchpicto=$form->showFilterButtons();
 print $searchpicto;
 print '</td>';
-
 print '</tr>'."\n";
 
 
@@ -543,11 +562,11 @@ print '</tr>'."\n";
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-    if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-    if ($key == 'status') $align.=($align?' ':'').'center';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+	$align='';
+	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
+	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
+	if ($key == 'status') $align.=($align?' ':'').'center';
+	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -561,102 +580,102 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine=0;
-foreach ($extrafields->attribute_computed as $key => $val)
-{
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+if (! empty($extrafields->attributes[$object->table_element]['computed'])) {
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
+	{
+		if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	}
 }
 
-
-
 // Loop on record
 // --------------------------------------------------------------------
 $i=0;
 $totalarray=array();
 while ($i < min($num, $limit))
 {
-    $obj = $db->fetch_object($resql);
-    if (empty($obj)) break;		// Should not happen
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break;		// Should not happen
 
-    // Store properties in $object
-    $object->id = $obj->rowid;
-    foreach($object->fields as $key => $val)
-    {
-        if (isset($obj->$key)) $object->$key = $obj->$key;
-    }
+	// Store properties in $object
+	$object->id = $obj->rowid;
+	foreach($object->fields as $key => $val)
+	{
+		if (isset($obj->$key)) $object->$key = $obj->$key;
+	}
 
-    // Show here line of result
-    print '<tr class="oddeven">';
-    foreach($object->fields as $key => $val)
-    {
-    	$align='';
-    	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-    	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-    	if ($key == 'status') $align.=($align?' ':'').'center';
-    	if (! empty($arrayfields['t.'.$key]['checked']))
-    	{
-    		print '<td';
-    		if ($align) print ' class="'.$align.'"';
-    		print '>';
-    		print $object->showOutputField($val, $key, $obj->$key, '');
-    		print '</td>';
-    		if (! $i) $totalarray['nbfield']++;
-    		if (! empty($val['isameasure']))
-    		{
-    			if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
-    			$totalarray['val']['t.'.$key] += $obj->$key;
-    		}
-    	}
-    }
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-    // Fields from hook
-    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-    $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    // Action column
-    print '<td class="nowrap" align="center">';
-    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-    {
-        $selected=0;
-        if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-    }
-    print '</td>';
-    if (! $i) $totalarray['nbfield']++;
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach($object->fields as $key => $val)
+	{
+		$align='';
+		if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
+		if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
+		if ($key == 'status') $align.=($align?' ':'').'center';
+		if (! empty($arrayfields['t.'.$key]['checked']))
+		{
+			print '<td';
+			if ($align) print ' class="'.$align.'"';
+			print '>';
+			print $object->showOutputField($val, $key, $obj->$key, '');
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+			if (! empty($val['isameasure']))
+			{
+				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				$totalarray['val']['t.'.$key] += $obj->$key;
+			}
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap" align="center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	{
+		$selected=0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+	}
+	print '</td>';
+	if (! $i) $totalarray['nbfield']++;
 
-    print '</tr>';
+	print '</tr>';
 
-    $i++;
+	$i++;
 }
 
 // Show total line
 if (isset($totalarray['pos']))
 {
-    print '<tr class="liste_total">';
-    $i=0;
-    while ($i < $totalarray['nbfield'])
-    {
-        $i++;
-        if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-        else
-        {
-            if ($i == 1)
-            {
-                if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-                else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-            }
-            else print '<td></td>';
-        }
-    }
-    print '</tr>';
+	print '<tr class="liste_total">';
+	$i=0;
+	while ($i < $totalarray['nbfield'])
+	{
+		$i++;
+		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		else
+		{
+			if ($i == 1)
+			{
+				if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+				else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+			}
+			else print '<td></td>';
+		}
+	}
+	print '</tr>';
 }
 
 // If no record found
 if ($num == 0)
 {
-    $colspan=1;
-    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	$colspan=1;
+	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
@@ -671,27 +690,25 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-
-
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-    $hidegeneratedfilelistifempty=1;
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-    require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
-    $formfile = new FormFile($db);
+	require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
+	$formfile = new FormFile($db);
 
-    // Show list of available documents
-    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource.=str_replace('&amp;','&',$param);
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-    $filedir=$diroutputmassaction;
-    $genallowed=$user->rights->ticketsup->read;
-    $delallowed=$user->rights->ticketsup->write;
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->ticketsup->read;
+	$delallowed=$user->rights->ticketsup->write;
 
-    print $formfile->showdocuments('massfilesarea_ticketsup','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_ticketsup','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 
 // End of page
-llxFooter('');
+llxFooter();
 $db->close();
diff --git a/htdocs/ticketsup/new.php b/htdocs/ticketsup/new.php
index 0428f5286c2..9fe7411186a 100644
--- a/htdocs/ticketsup/new.php
+++ b/htdocs/ticketsup/new.php
@@ -88,7 +88,7 @@ if ($action == 'create_ticket') {
         $defaultref = '';
     }
 
-    $formticket->showForm();
+    $formticket->showForm(1);
 }
 
 //$somethingshown=$object->showLinkedObjectBlock();
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index d711fd8b4b4..48dc1049706 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -335,7 +335,7 @@ if (empty($reshook)) {
 				$object->gender = GETPOST("gender", 'alpha');
 				$birth = dol_mktime(0, 0, 0, GETPOST('birthmonth'), GETPOST('birthday'), GETPOST('birthyear'));
 				$object->birth = $birth;
-				$object->pass = GETPOST("password");
+				$object->pass = GETPOST("password",'none');
 				$object->api_key = (GETPOST("api_key", 'alpha')) ? GETPOST("api_key", 'alpha') : $object->api_key;
 				if (! empty($user->admin)) $object->admin = GETPOST("admin"); 	// admin flag can only be set/unset by an admin user. A test is also done later when forging sql request
 				$object->address = GETPOST('address', 'alpha');
@@ -349,20 +349,20 @@ if (empty($reshook)) {
 				$object->skype = GETPOST("skype", 'alpha');
 				$object->email = preg_replace('/\s+/', '', GETPOST("email", 'alpha'));
 				$object->job = GETPOST("job", 'alpha');
-				$object->signature = GETPOST("signature");
-				$object->accountancy_code = GETPOST("accountancy_code");
-				$object->openid = GETPOST("openid");
-				$object->fk_user = GETPOST("fk_user") > 0 ? GETPOST("fk_user") : 0;
+				$object->signature = GETPOST("signature",'none');
+				$object->accountancy_code = GETPOST("accountancy_code",'alpha');
+				$object->openid = GETPOST("openid",'alpha');
+				$object->fk_user = GETPOST("fk_user",'int') > 0 ? GETPOST("fk_user",'int') : 0;
 				$object->employee = GETPOST('employee');
 
-				$object->thm = GETPOST("thm") != '' ? GETPOST("thm") : '';
-				$object->tjm = GETPOST("tjm") != '' ? GETPOST("tjm") : '';
-				$object->salary = GETPOST("salary") != '' ? GETPOST("salary") : '';
-				$object->salaryextra = GETPOST("salaryextra") != '' ? GETPOST("salaryextra") : '';
-				$object->weeklyhours = GETPOST("weeklyhours") != '' ? GETPOST("weeklyhours") : '';
+				$object->thm = GETPOST("thm",'alphanohtml') != '' ? GETPOST("thm",'alphanohtml') : '';
+				$object->tjm = GETPOST("tjm",'alphanohtml') != '' ? GETPOST("tjm",'alphanohtml') : '';
+				$object->salary = GETPOST("salary",'alphanohtml') != '' ? GETPOST("salary",'alphanohtml') : '';
+				$object->salaryextra = GETPOST("salaryextra",'alphanohtml') != '' ? GETPOST("salaryextra",'alphanohtml') : '';
+				$object->weeklyhours = GETPOST("weeklyhours",'alphanohtml') != '' ? GETPOST("weeklyhours",'alphanohtml') : '';
 
-				$object->color = GETPOST("color") != '' ? GETPOST("color") : '';
-				$dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth'), GETPOST('dateemploymentday'), GETPOST('dateemploymentyear'));
+				$object->color = GETPOST("color",'alpha') != '' ? GETPOST("color",'alpha') : '';
+				$dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth','int'), GETPOST('dateemploymentday','int'), GETPOST('dateemploymentyear','int'));
 				$object->dateemployment = $dateemployment;
 
 				if (! empty($conf->multicompany->enabled))
@@ -781,7 +781,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	}
 	else
 	{
-		print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="'.GETPOST('login').'">';
+		print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="'.dol_escape_htmltag(GETPOST('login','alpha')).'">';
 	}
 	print '</td></tr>';
 
@@ -796,26 +796,39 @@ if ($action == 'create' || $action == 'adduserldap')
 	// Password
 	print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td>';
 	print '<td>';
-	if (! empty($ldap_sid))
+	$valuetoshow='';
+	if (preg_match('/ldap/',$dolibarr_main_authentication))
 	{
-		print 'Mot de passe du domaine';
+		$valuetoshow.=($valuetoshow?', ':'').$langs->trans("PasswordOfUserInLDAP");
 	}
-	else
+	if (preg_match('/http/',$dolibarr_main_authentication))
 	{
-		if (! empty($ldap_pass))
+		$valuetoshow.=($valuetoshow?', ':'').$langs->trans("HTTPBasicPassword");
+	}
+	if (preg_match('/dolibarr/',$dolibarr_main_authentication))
+	{
+		if (! empty($ldap_pass))	// For very old system comaptibilty. Now clear password can't be viewed from LDAP read
 		{
-			print '<input type="hidden" name="password" value="'.$ldap_pass.'">';
-			print preg_replace('/./i','*',$ldap_pass);
+			$valuetoshow.= ($valuetoshow?', ':'').'<input type="hidden" name="password" value="'.$ldap_pass.'">';	// Dolibarr password is preffiled with LDAP known password
+			$valuetoshow.= preg_replace('/./i','*',$ldap_pass);
 		}
 		else
 		{
 			// We do not use a field password but a field text to show new password to use.
-			print '<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="off">';
+			$valuetoshow.= ($valuetoshow?', ':'').'<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
 		}
 	}
+
+	// Other form for user password
+	$parameters=array('valuetoshow' => $valuetoshow, 'password' => $password);
+	$reshook=$hookmanager->executeHooks('printUserPasswordField',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if ($reshook > 0) $valuetoshow=$hookmanager->resPrint;	// to replace
+	else $valuetoshow.=$hookmanager->resPrint;				// to add
+
+	print $valuetoshow;
 	print '</td></tr>';
 
-	if(! empty($conf->api->enabled))
+	if (! empty($conf->api->enabled))
 	{
 		// API key
 		$generated_api_key = '';
@@ -1064,7 +1077,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	$parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -1315,36 +1328,57 @@ else
 
 			// Password
 			print '<tr><td>'.$langs->trans("Password").'</td>';
-			if (! empty($object->ldap_sid))
+
+			print '<td>';
+			$valuetoshow='';
+			if (preg_match('/ldap/',$dolibarr_main_authentication))
 			{
-				if ($passDoNotExpire)
+				if (! empty($object->ldap_sid))
 				{
-					print '<td>'.$langs->trans("LdapUacf_".$statutUACF).'</td>';
-				}
-				else if($userChangePassNextLogon)
-				{
-					print '<td class="warning">'.$langs->trans("UserMustChangePassNextLogon",$ldap->domainFQDN).'</td>';
-				}
-				else if($userDisabled)
-				{
-					print '<td class="warning">'.$langs->trans("LdapUacf_".$statutUACF,$ldap->domainFQDN).'</td>';
+					if ($passDoNotExpire)
+					{
+						$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').$langs->trans("LdapUacf_".$statutUACF);
+					}
+					else if($userChangePassNextLogon)
+					{
+						$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').'<span class="warning">'.$langs->trans("UserMustChangePassNextLogon",$ldap->domainFQDN).'</span>';
+					}
+					else if($userDisabled)
+					{
+						$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').'<span class="warning">'.$langs->trans("LdapUacf_".$statutUACF,$ldap->domainFQDN).'</span>';
+					}
+					else
+					{
+						$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').$langs->trans("PasswordOfUserInLDAP");
+					}
 				}
 				else
 				{
-					print '<td>'.$langs->trans("DomainPassword").'</td>';
+					$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').$langs->trans("PasswordOfUserInLDAP");
 				}
 			}
-			else
+			if (preg_match('/http/',$dolibarr_main_authentication))
 			{
-				print '<td>';
-				if ($object->pass) print preg_replace('/./i','*',$object->pass);
+				$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').$langs->trans("HTTPBasicPassword");
+			}
+			if (preg_match('/dolibarr/',$dolibarr_main_authentication))
+			{
+				if ($object->pass) $valuetoshow.= preg_replace('/./i','*',$object->pass);
 				else
 				{
-					if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
-					else print $langs->trans("Hidden");
+					if ($user->admin) $valuetoshow.= ($valuetoshow?(' '.$langs->trans("or").' '):'').$langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
+					else $valuetoshow.= ($valuetoshow?(' '.$langs->trans("or").' '):'').$langs->trans("Hidden");
 				}
-				print "</td>";
 			}
+
+			// Other form for user password
+			$parameters=array('valuetoshow' => $valuetoshow);
+			$reshook=$hookmanager->executeHooks('printUserPasswordField',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			if ($reshook > 0) $valuetoshow=$hookmanager->resPrint;	// to replace
+			else $valuetoshow.=$hookmanager->resPrint;				// to add
+
+			print $valuetoshow;
+			print "</td>";
 			print '</tr>'."\n";
 
 			// API key
@@ -1883,23 +1917,34 @@ else
 			// Pass
 			print '<tr><td>'.$langs->trans("Password").'</td>';
 			print '<td>';
-			if ($object->ldap_sid)
+			$valuetoshow='';
+			if (preg_match('/ldap/',$dolibarr_main_authentication))
 			{
-				$text=$langs->trans("DomainPassword");
+				$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').$langs->trans("PasswordOfUserInLDAP");
 			}
-			else if ($caneditpassword)
+			if (preg_match('/http/',$dolibarr_main_authentication))
 			{
-				$text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
-				if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
+				$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
+			}
+			if (preg_match('/dolibarr/',$dolibarr_main_authentication))
+			{
+				if ($caneditpassword)
 				{
-					$text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
+					$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').'<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
+				}
+				else
+				{
+					$valuetoshow.=($valuetoshow?(' '.$langs->trans("or").' '):'').preg_replace('/./i','*',$object->pass);
 				}
 			}
-			else
-			{
-				$text=preg_replace('/./i','*',$object->pass);
-			}
-			print $text;
+
+			// Other form for user password
+			$parameters=array('valuetoshow' => $valuetoshow, 'caneditpassword' => $caneditpassword);
+			$reshook=$hookmanager->executeHooks('printUserPasswordField',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			if ($reshook > 0) $valuetoshow=$hookmanager->resPrint;	// to replace
+			else $valuetoshow.=$hookmanager->resPrint;				// to add
+
+			print $valuetoshow;
 			print "</td></tr>\n";
 
 			// API key
@@ -2009,7 +2054,7 @@ else
 		   	else
 			{
 				$type=0;
-				if ($object->contact_id) $type=$object->contact_id;
+				if ($object->contactid) $type=$object->contactid;
 				print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
 			   	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
 			}
@@ -2179,12 +2224,12 @@ else
 				print '<td>';
 				if ($caneditfield)
 				{
-								print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
+					print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
 				}
 				else
 				{
-								print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
-								print $object->accountancy_code;
+					print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
+					print $object->accountancy_code;
 				}
 				print '</td>';
 				print "</tr>";
@@ -2298,7 +2343,7 @@ else
 			$parameters=array('colspan' => ' colspan="2"');
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			if (empty($reshook))
 			{
 				print $object->showOptionals($extrafields,'edit');
 			}
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index c30cacd72c0..556b86332bc 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -162,7 +162,7 @@ class Users extends DolibarrApi
 	 * @param array $request_data New user data
 	 * @return int
 	 */
-	function post($request_data = NULL) {
+	function post($request_data = null) {
 	    // check user authorization
 	    //if(! DolibarrApiAccess::$user->rights->user->creer) {
 	    //   throw new RestException(401, "User creation not allowed");
@@ -194,7 +194,7 @@ class Users extends DolibarrApi
 	 * @param array $request_data   Datas
 	 * @return int
 	 */
-	function put($id, $request_data = NULL) {
+	function put($id, $request_data = null) {
 		//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
 			//throw new RestException(401);
 		//}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6d992246eea..8ac4963f5b5 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -115,7 +115,7 @@ class User extends CommonObject
 	public $lastsearch_values_tmp;  // To store current search criterias for user
 	public $lastsearch_values;      // To store last saved search criterias for user
 
-	public $users;					// To store all tree of users hierarchy
+	public $users = array();		// To store all tree of users hierarchy
 	public $parentof;				// To store an array of all parents for all ids.
 	private $cache_childids;
 
@@ -1572,7 +1572,7 @@ class User extends CommonObject
 
 			$action='update';
 
-			// Actions on extra fields (by external module or standard code)
+			// Actions on extra fields
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
 				$result=$this->insertExtraFields();
@@ -3003,5 +3003,105 @@ class User extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
+	/**
+	 *  Return property of user from its id
+	 *
+	 *  @param	int		$rowid      id of contact
+	 *  @param  string	$mode       'email' or 'mobile'
+	 *  @return string  			Email of user with format: "Full name <email>"
+	 */
+	function user_get_property($rowid,$mode)
+	{
+		$user_property='';
+
+		if (empty($rowid)) return '';
+
+		$sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user";
+		$sql.= " WHERE rowid = '".$rowid."'";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$nump = $this->db->num_rows($resql);
+
+			if ($nump)
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				if ($mode == 'email') $user_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
+				else if ($mode == 'mobile') $user_property = $obj->user_mobile;
+			}
+			return $user_property;
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 *	Load all objects into $this->users
+	 *
+	 *  @param	string		$sortorder    sort order
+	 *  @param	string		$sortfield    sort field
+	 *  @param	int			$limit		  limit page
+	 *  @param	int			$offset    	  page
+	 *  @param	array		$filter    	  filter output
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, $filter=array())
+	{
+		global $conf;
+
+		$sql="SELECT t.rowid";
+		$sql.= ' FROM '.MAIN_DB_PREFIX .$this->table_element.' as t ';
+		$sql.= " WHERE 1";
+
+		//Manage filter
+		if (!empty($filter)){
+			foreach($filter as $key => $value) {
+				if (strpos($key,'date')) {
+					$sql.= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
+				}
+				elseif ($key=='customsql') {
+					$sql.= ' AND '.$value;
+				} else {
+					$sql.= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+				}
+			}
+		}
+		$sql.= $this->db->order($sortfield,$sortorder);
+		if ($limit) $sql.= $this->db->plimit($limit+1,$offset);
+
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->users=array();
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$line = new self($this->db);
+					$result = $line->fetch($obj->rowid);
+					if ($result>0 && !empty($line->id)) {
+						$this->users[$obj->rowid] = clone $line;
+					}
+				}
+				$this->db->free($resql);
+			}
+			return $num;
+		}
+		else
+		{
+			$this->errors[] = $this->db->lasterror();
+			return -1;
+		}
+
+	}
+
 }
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 859c5267d04..bfdb80b56d2 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -831,9 +831,9 @@ class UserGroup extends CommonObject
 			{
 				$langs->load("users");
 				$label=$langs->trans("ShowGroup");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1, 1).'"';
 			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
 			$linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
 		}
 		/*if (! is_object($hookmanager))
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 5d89ef1b162..9e665bd563b 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -159,7 +159,7 @@ if ($object->id)
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
 
 	//Total taille
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
 
 	print '</table>';
     print '</div>';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 3f350b7773e..11850940f85 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -304,7 +304,7 @@ if ($action == 'create')
     $parameters=array('object' => $object, 'colspan' => ' colspan="2"');
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    if (empty($reshook))
     {
 		print $object->showOptionals($extrafields,'edit');
     }
@@ -570,7 +570,7 @@ else
             $parameters=array();
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            if (empty($reshook))
             {
 				print $object->showOptionals($extrafields,'edit');
             }
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 29bd19a25ae..c5dcb7a53bd 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -45,6 +45,14 @@ $sall=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alp
 $search_group=GETPOST('search_group');
 $optioncss = GETPOST('optioncss','alpha');
 
+// Defini si peux lire/modifier utilisateurs et permisssions
+$caneditperms=($user->admin || $user->rights->user->user->creer);
+// Advanced permissions
+if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+{
+	$caneditperms=($user->admin || $user->rights->user->group_advance->write);
+}
+
 // Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
@@ -131,9 +139,11 @@ if ($resql)
     $text = $langs->trans("ListOfGroups");
 
     $newcardbutton='';
-    if ($user->rights->propal->creer)
+    if ($caneditperms)
     {
-    	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/user/group/card.php?action=create&leftmenu=">'.$langs->trans('NewGroup').'</a>';
+    	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/user/group/card.php?action=create&leftmenu=">'.$langs->trans('NewGroup');
+    	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+    	$newcardbutton.= '</a>';
     }
 
     print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 2020af40323..b3b0ff91ff8 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -56,6 +56,9 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield="u.login";
 if (! $sortorder) $sortorder="ASC";
 
+// Define value to know what current user can do on users
+$canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new User($db);
 $hookmanager->initHooks(array('userlist'));
@@ -272,9 +275,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 $text = $langs->trans("ListOfUsers");
 
 $newcardbutton='';
-if ($user->rights->propal->creer)
+if ($canadduser)
 {
-	$newcardbutton='<a class="butAction" href="'.DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1': '').'&leftmenu=">'.$langs->trans('NewUser').'</a>';
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1': '').'&leftmenu=">'.$langs->trans('NewUser');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index 5958c71f295..ceeaf35fddf 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -48,6 +48,13 @@ $result=$interface->run_triggers('USER_LOGOUT',$user,$user,$langs,$conf);
 if ($result < 0) { $error++; }
 // Fin appel triggers
 
+// Hooks on logout
+$action='';
+$hookmanager->initHooks(array('logout'));
+$parameters=array();
+$reshook=$hookmanager->executeHooks('afterLogout',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) { $error++; }
+
 // Define url to go after disconnect
 $urlfrom=empty($_SESSION["urlfrom"])?'':$_SESSION["urlfrom"];
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 096567d728a..2bcf4fc0663 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -411,6 +411,11 @@ if ($result > 0)
     {
         $result = $db->query($sql);
         $nbtotalofrecords = $db->num_rows($result);
+        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+        {
+        	$page = 0;
+        	$offset = 0;
+        }
     }
 
     $sql.= $db->plimit($limit+1, $offset);
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index cde5c5199e0..584fa6f2427 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -96,7 +96,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
 if ($action == 'buildnewpassword' && $username)
 {
     $sessionkey = 'dol_antispam_value';
-    $ok=(array_key_exists($sessionkey, $_SESSION) === TRUE && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+    $ok=(array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
     // Verify code
     if (! $ok)
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index 8b7baaee27e..14f2c2a415c 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -16,11 +16,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('NOTOKENRENEWAL','1');
-define('NOREQUIREMENU','1');
-define('NOREQUIREHTML','1');
-define('NOREQUIREAJAX','1');
-define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
 header('Content-Type: application/json');
 
-$id = GETPOST('id');
+$id = GETPOST('id', 'int');
 
 if (!$id) {
 	print json_encode(array(
diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index 6f3571c1856..8fd5c45fade 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('NOTOKENRENEWAL','1');
-define('NOREQUIREMENU','1');
-define('NOREQUIREHTML','1');
-define('NOREQUIREAJAX','1');
-define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/variants/ajax/orderAttribute.php b/htdocs/variants/ajax/orderAttribute.php
index 95bad6a427d..92bbcc241d5 100644
--- a/htdocs/variants/ajax/orderAttribute.php
+++ b/htdocs/variants/ajax/orderAttribute.php
@@ -22,10 +22,10 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');  // Disable "main.inc.php" hooks
 
 require '../../main.inc.php';
 
+
 /*
  * View
  */
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 4f647aa2cb3..92bba2f70f8 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -275,10 +275,11 @@ class ProductCombination
 	/**
 	 * Deletes all product combinations of a parent product
 	 *
-	 * @param int $fk_product_parent Rowid of parent product
+	 * @param User		$user Object user
+	 * @param int 		$fk_product_parent Rowid of parent product
 	 * @return int <0 KO >0 OK
 	 */
-	public function deleteByFkProductParent($fk_product_parent)
+	public function deleteByFkProductParent($user, $fk_product_parent)
 	{
 		$this->db->begin();
 
@@ -289,11 +290,11 @@ class ProductCombination
 			$res = $prodstatic->fetch($prodcomb->fk_product_child);
 
 			if ($res > 0) {
-				$res = $prodcomb->delete();
+				$res = $prodcomb->delete($user);
 			}
 
 			if ($res > 0 && !$prodstatic->isObjectUsed($prodstatic->id)) {
-				$res = $prodstatic->delete();
+				$res = $prodstatic->delete($user);
 			}
 
 			if ($res < 0) {
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 84f3b7fa91c..dbc413542c4 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -71,7 +71,7 @@ if ($cancel) {
     unset($_SESSION['addvariant_'.$object->id]);
 }
 
-if (! $object->isProduct()) {
+if (! $object->isProduct() && ! $object->isService()) {
 	header('Location: '.dol_buildpath('/product/card.php?id='.$object->id, 2));
 	exit();
 }
@@ -327,11 +327,31 @@ if (! empty($id) || ! empty($ref))
 
 		if ($action == 'add') {
 			$title = $langs->trans('NewProductCombination');
+			print dol_fiche_head();
+			$features = $_SESSION['addvariant_'.$object->id];
+			//First, sanitize
+			print '<div id="parttoaddvariant">';
+			if (! empty($features)) {
+				foreach ($features as $feature) {
+
+					$explode = explode(':', $feature);
+
+					if ($prodattr->fetch($explode[0]) < 0) {
+						continue;
+					}
+
+					if ($prodattr_val->fetch($explode[1]) < 0) {
+						continue;
+					}
+
+					print '<i>' . $prodattr->label . '</i>:'. $prodattr_val->value . ' ';
+				}
+			}
+			print '</div>';
+			print dol_fiche_end();
 		} else {
 			$title = $langs->trans('EditProductCombination');
 		}
-
-		print '<div id="parttoaddvariant"></div>';
 		print_fiche_titre($title);
 
 		if ($action == 'add') {
@@ -346,8 +366,8 @@ if (! empty($id) || ! empty($ref))
 			foreach ($prodattr_all as $each) {
 				$prodattr_alljson[$each->id] = $each;
 			}
-                
-		?>
+
+			?>
 
 		<script type="text/javascript">
 
@@ -397,7 +417,7 @@ if (! empty($id) || ! empty($ref))
 
 					select.empty().append('<option value="">Loading...</option>');
 
-					jQuery.getJSON("<?php echo dol_buildpath('/variants/ajax/get_attribute_values.php', 2) ?>", {
+					jQuery.getJSON("ajax/get_attribute_values.php", {
 						id: jQuery(this).val()
 					}, function(data) {
 						if (data.error) {
@@ -523,12 +543,13 @@ if (! empty($id) || ! empty($ref))
 				<td><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
 				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label></td>
 			</tr>
-			<tr>
-				<td><label for="weight_impact"><?php echo $langs->trans('WeightImpact') ?></label></td>
-				<td><input type="text" id="weight_impact" name="weight_impact" value="<?php echo price($weight_impact) ?>"></td>
-			</tr>
-		</table>
-		<?php
+<?php   	if ($object->isProduct()) {
+				print '<tr>';
+				print '<td><label for="weight_impact">'.$langs->trans('WeightImpact').'</label></td>';
+				print '<td><input type="text" id="weight_impact" name="weight_impact" value="'.price($weight_impact).'"></td>';
+				print '</tr>';
+			}
+			print '</table>';
 		}
 
 		print dol_fiche_end();
@@ -678,7 +699,7 @@ if (! empty($id) || ! empty($ref))
 				<td class="liste_titre"><?php echo $langs->trans('Product') ?></td>
 				<td class="liste_titre"><?php echo $langs->trans('Combination') ?></td>
 				<td class="liste_titre right"><?php echo $langs->trans('PriceImpact') ?></td>
-				<td class="liste_titre right"><?php echo $langs->trans('WeightImpact') ?></td>
+                <?php if ($object->isProduct()) print'<td class="liste_titre right">'.$langs->trans('WeightImpact').'</td>'; ?>
 				<td class="liste_titre center"><?php echo $langs->trans('OnSell') ?></td>
 				<td class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></td>
 				<td class="liste_titre"></td>
@@ -714,7 +735,7 @@ if (! empty($id) || ! empty($ref))
     					} ?>
     				</td>
     				<td class="right"><?php echo ($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?></td>
-    				<td class="right"><?php echo ($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?></td>
+                    <?php if ($object->isProduct()) print '<td class="right">'.($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight').'</td>'; ?>
     				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 0) ?></td>
     				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 1) ?></td>
     				<td class="right">
@@ -747,8 +768,12 @@ if (! empty($id) || ! empty($ref))
 
 		print '</form>';
 	}
+} else {
+	llxHeader();
+	// not found
 }
 
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index d4162899874..4daa2d8f45a 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -95,7 +95,7 @@ if ($_POST) {
 		$delete_prev_comb_res = 1;
 
 		if (!$donotremove) {
-			$delete_prev_comb_res = $combination->deleteByFkProductParent($id);
+			$delete_prev_comb_res = $combination->deleteByFkProductParent($user, $id);
 		}
 
 		//Current combinations will be deleted
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 74fb252147d..bb2ca6ef2f6 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -18,7 +18,7 @@
 require '../main.inc.php';
 require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
-$id = GETPOST('id');
+$id = GETPOST('id','int');
 $action = GETPOST('action','aZ09');
 $object = new ProductAttribute($db);
 
@@ -57,9 +57,15 @@ $variants = $object->fetchAll();
 
 llxHeader('', $title);
 
-$buttonadd='<a href="create.php" class="butAction">'.$langs->trans('Create').'</a>';
+$newcardbutton='';
+if ($user->rights->produit->creer)
+{
+	$newcardbutton='<a href="'.DOL_URL_ROOT.'/variants/create.php" class="butActionNew">'.$langs->trans('Create');
+	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton.= '</a>';
+}
 
-print load_fiche_titre($title, $buttonadd);
+print load_fiche_titre($title, $newcardbutton, 'title_products');
 
 $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 ?>
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index ed4dd22e953..ffc0f3a6af5 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -35,21 +35,27 @@ if (! defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL','1');
 if (! defined('NOREQUIREMENU'))		define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIREHOOK'))		define('NOREQUIREHOOK','1');	// Disable "main.inc.php" hooks
+
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')) && ! defined("NOLOGIN"))
+if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')))
 {
-	define("NOLOGIN",'1');
+	if (! defined("NOLOGIN"))		define("NOLOGIN",1);
+	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 // For direct external download link, we don't need to load/check we are into a login session
 if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))
 {
-	define("NOLOGIN",1);
+	if (! defined("NOLOGIN"))		define("NOLOGIN",1);
+	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined("NOLOGIN"))
+if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
 {
-	define("NOLOGIN",'1');
+	if (! defined("NOLOGIN"))		define("NOLOGIN",1);
+	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip
 	// For multicompany
 	$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 	if (is_numeric($entity)) define("DOLENTITY", $entity);
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index f141c6cf417..3a92029e205 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -542,10 +542,10 @@ if ($action == 'addcontainer')
 	}
 	else
 	{
+		$objectpage->title = GETPOST('WEBSITE_TITLE','alpha');
 		$objectpage->type_container = GETPOST('WEBSITE_TYPE_CONTAINER','alpha');
 		$objectpage->pageurl = GETPOST('WEBSITE_PAGENAME','alpha');
 		$objectpage->aliasalt = GETPOST('WEBSITE_ALIASALT','alpha');
-		$objectpage->title = GETPOST('WEBSITE_TITLE','alpha');
 		$objectpage->description = GETPOST('WEBSITE_DESCRIPTION','alpha');
 		$objectpage->keywords = GETPOST('WEBSITE_KEYWORDS','alpha');
 		$objectpage->lang = GETPOST('WEBSITE_LANG','aZ09');
@@ -958,10 +958,10 @@ if ($action == 'updatemeta')
 	{
 		$objectpage->old_object = clone $objectpage;
 
+		$objectpage->title = GETPOST('WEBSITE_TITLE', 'alpha');
 		$objectpage->type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
 		$objectpage->pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
 		$objectpage->aliasalt = GETPOST('WEBSITE_ALIASALT', 'alpha');
-		$objectpage->title = GETPOST('WEBSITE_TITLE', 'alpha');
 		$objectpage->description = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
 		$objectpage->keywords = GETPOST('WEBSITE_KEYWORDS', 'alpha');
 		$objectpage->lang = GETPOST('WEBSITE_LANG', 'aZ09');
@@ -2026,14 +2026,22 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		$pagelang=$objectpage->lang;
 		$pagehtmlheader=$objectpage->htmlheader;
 	}
+	if (GETPOST('WEBSITE_TITLE','alpha'))       $pagetitle=GETPOST('WEBSITE_TITLE','alpha');
 	if (GETPOST('WEBSITE_PAGENAME','alpha'))    $pageurl=GETPOST('WEBSITE_PAGENAME','alpha');
 	if (GETPOST('WEBSITE_ALIASALT','alpha'))    $pagealiasalt=GETPOST('WEBSITE_ALIASALT','alpha');
-	if (GETPOST('WEBSITE_TITLE','alpha'))       $pagetitle=GETPOST('WEBSITE_TITLE','alpha');
 	if (GETPOST('WEBSITE_DESCRIPTION','alpha')) $pagedescription=GETPOST('WEBSITE_DESCRIPTION','alpha');
 	if (GETPOST('WEBSITE_KEYWORDS','alpha'))    $pagekeywords=GETPOST('WEBSITE_KEYWORDS','alpha');
 	if (GETPOST('WEBSITE_LANG','aZ09'))         $pagelang=GETPOST('WEBSITE_LANG','aZ09');
 	if (GETPOST('htmlheader','none'))			$pagehtmlheader=GETPOST('htmlheader','none');
 
+	// Title
+	print '<tr><td class="fieldrequired">';
+	print $langs->trans('WEBSITE_TITLE');
+	print '</td><td>';
+	print '<input type="text" class="flat quatrevingtpercent" name="WEBSITE_TITLE" value="'.dol_escape_htmltag($pagetitle).'">';
+	print '</td></tr>';
+
+	// Alias
 	print '<tr><td class="titlefieldcreate fieldrequired">';
 	print $langs->trans('WEBSITE_PAGENAME');
 	print '</td><td>';
@@ -2055,12 +2063,6 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		print '</td></tr>';
 	}
 
-	print '<tr><td class="fieldrequired">';
-	print $langs->trans('WEBSITE_TITLE');
-	print '</td><td>';
-	print '<input type="text" class="flat quatrevingtpercent" name="WEBSITE_TITLE" value="'.dol_escape_htmltag($pagetitle).'">';
-	print '</td></tr>';
-
 	print '<tr><td>';
 	print $langs->trans('WEBSITE_DESCRIPTION');
 	print '</td><td>';
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 8daab76e38c..15ced283957 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -21,20 +21,6 @@
  *		\brief      Page to create/edit/view websiteaccount
  */
 
-//if (! defined('NOREQUIREUSER'))          define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))            define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))           define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))          define('NOREQUIRETRAN','1');
-//if (! defined('NOSCANGETFORINJECTION'))  define('NOSCANGETFORINJECTION','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');		// Do not check anti CSRF attack test
-//if (! defined('NOCSRFCHECK'))            define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test done when option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
-//if (! defined('NOSTYLECHECK'))           define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL'))         define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))          define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))          define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))          define('NOREQUIREAJAX','1');         // Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
 // Load Dolibarr environment
 $res=0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index e5ba6bad702..2d557768d7d 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -201,13 +201,9 @@ if ($resql) {
 	print '<td align="left">' . $langs->trans("Phone") . '</td>';
 	print '<td align="left">' . $langs->trans("Fax") . '</td></tr>';
 
-	$var = True;
-
-	while ( $obj = $db->fetch_object($resql) ) {
-
-		$var = ! $var;
-
-		print '<tr'. $bc[$var].'>';
+	while ($obj = $db->fetch_object($resql))
+	{
+		print '<tr class="oddeven">';
 		print '<td>';
 		$thirdpartystatic->id = $obj->rowid;
 		$thirdpartystatic->name = $obj->name;
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 246fd3d75b4..43ff66dc656 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -73,7 +73,21 @@ $error=0;
 $now=dol_now();
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." ***** userlogin=" . $userlogin . " ***** " . $now . " *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." ***** userlogin=" . $userlogin . " ***** " . dol_print_date($now, 'dayrfc') . " *****\n";
+
+// Check module cron is activated
+if (empty($conf->cron->enabled))
+{
+	print "Error: module Scheduled jobs (cron) not activated\n";
+	exit(-1);
+}
+
+// Check module cron is activated
+if (empty($conf->cron->enabled))
+{
+	print "Error: module Scheduled jobs (cron) not activated\n";
+	exit(-1);
+}
 
 // Check security key
 if ($key != $conf->global->CRON_KEY)
@@ -154,7 +168,7 @@ $nbofjobs=count($qualifiedjobs);
 $nbofjobslaunchedok=0;
 $nbofjobslaunchedko=0;
 
-if(is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
+if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
 {
 	// Loop over job
 	foreach($qualifiedjobs as $line)
@@ -165,7 +179,7 @@ if(is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
 		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
 		if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now))
 		{
-			dol_syslog("cron_run_jobs.php:: to run line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
+			dol_syslog("cron_run_jobs.php line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
 
 			$cronjob=new Cronjob($db);
 			$result=$cronjob->fetch($line->id);
@@ -204,10 +218,14 @@ if(is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
 		}
 		else
 		{
-			dol_syslog("cron_run_jobs.php:: job not qualified line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
+			dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
 		}
 	}
 }
+else
+{
+	echo "cron_run_jobs.php no qualified job found\n";
+}
 
 $db->close();
 
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 4c92f507f66..a2f4f64aba5 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -317,6 +317,8 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
+        $conf->global->MAIN_FIRSTNAME_NAME_POSITION = 1;	// Force setup for firstname then lastname
+
         $template = '__CIVILITY__,__FIRSTNAME__,__LASTNAME__,__FULLNAME__,__COMPANY__,'.
                     '__ADDRESS__,__ZIP__,__TOWN__,__COUNTRY__,__EMAIL__,__BIRTH__,__PHOTO__,__LOGIN__';
 
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 2d615e0bd06..7b2f3f07e2b 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -142,26 +142,32 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
         $ref_fourn='SUPPLIER_REF_PHPUNIT';
         $tva_tx=19.6;
 
-        // Create supplier price
+        // Delete existing supplier prices
+        // TODO
+
+        // Create 1 supplier price with min qty = 10;
         $result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
         $this->assertGreaterThanOrEqual(1, $result);
         $result=$product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
         $this->assertGreaterThanOrEqual(0, $result);
 
-        // Create supplier order with a too low quantity
+        // Create supplier order with a too low quantity and option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is on
+        $conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 1;
+
         $localobject=new CommandeFournisseur($db);
         $localobject->initAsSpecimen();
         $localobject->lines=array();    // Overwrite lines of order
         $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line too low";
+        $line->desc=$langs->trans("Description")." specimen line with qty too low";
         $line->qty=1;                   // So lower than $quantity
+        $line->subprice=100;
         $line->fk_product=$product->id;
         $line->ref_fourn=$ref_fourn;
         $localobject->lines[]=$line;
 
         $result=$localobject->create($user);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-1, $result);   // must be -1 because quantity is lower than minimum of supplier price
+        $this->assertEquals(-1, $result, 'Creation of too low quantity');   // must be -1 because quantity is lower than minimum of supplier price
 
         $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
         $db->query($sql);
@@ -173,13 +179,53 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
         $line=new CommandeFournisseurLigne($db);
         $line->desc=$langs->trans("Description")." specimen line ok";
         $line->qty=10;                      // So enough quantity
+        $line->subprice=100;
         $line->fk_product=$product->id;
         $line->ref_fourn=$ref_fourn;
         $localobject2->lines[]=$line;
 
         $result=$localobject2->create($user);
         print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(0, $result);
+        $this->assertGreaterThan(0, $result);
+
+
+        // Create supplier order with a too low quantity but option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is off
+        $conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 0;
+
+        $localobject3=new CommandeFournisseur($db);
+        $localobject3->initAsSpecimen();
+        $localobject3->lines=array();    // Overwrite lines of order
+        $line=new CommandeFournisseurLigne($db);
+        $line->desc=$langs->trans("Description")." specimen line with qty too low";
+        $line->qty=1;                   // So lower than $quantity
+        $line->subprice=100;
+        $line->fk_product=$product->id;
+        $line->ref_fourn=$ref_fourn;
+        $localobject3->lines[]=$line;
+
+        $result=$localobject3->create($user);
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok');   // must be id of line because there is no test on minimum quantity
+
+        $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
+        $db->query($sql);
+
+        // Create supplier order
+        $localobject4=new CommandeFournisseur($db);
+        $localobject4->initAsSpecimen();    // This create 5 lines of first product found for socid 1
+        $localobject4->lines=array();       // Overwrite lines of order
+        $line=new CommandeFournisseurLigne($db);
+        $line->desc=$langs->trans("Description")." specimen line ok";
+        $line->qty=10;                      // So enough quantity
+        $line->subprice=100;
+        $line->fk_product=$product->id;
+        $line->ref_fourn=$ref_fourn;
+        $localobject4->lines[]=$line;
+
+        $result=$localobject4->create($user);
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThan(0, $result);
+
 
         return $result;
     }
@@ -206,7 +252,7 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
         $result=$localobject->fetch($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0, 'Failed to fetch supplier order with id '.$id);
         return $localobject;
     }
 
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index d3e202f33c2..2fe0b751e1f 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -216,7 +216,13 @@ class FactureTest extends PHPUnit_Framework_TestCase
         $newlocalobject=new Facture($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva','multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx')), array());    // Actual, Expected
+
+        // Hack to avoid test to be wrong when module sellyoursaas is on
+        unset($localobject->array_options['options_commission']);
+        unset($localobject->array_options['options_reseller']);
+
+        $arraywithdiff = $this->objCompare($localobject,$newlocalobject,true,array('newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva','multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx'));
+        $this->assertEquals($arraywithdiff, array());    // Actual, Expected
 
         return $localobject;
     }
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 87a5fdeb905..7fe65f101de 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -234,12 +234,17 @@ class SecurityTest extends PHPUnit_Framework_TestCase
      */
     public function testEncodeDecode()
     {
-        $stringtotest="This is a string to test encode/decode";
+        $stringtotest="This is a string to test encode/decode. This is a string to test encode/decode. This is a string to test encode/decode.";
 
         $encodedstring=dol_encode($stringtotest);
         $decodedstring=dol_decode($encodedstring);
         print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
-        $this->assertEquals($stringtotest,$decodedstring);
+        $this->assertEquals($stringtotest,$decodedstring, 'Use dol_encode/decode with no parameter');
+
+        $encodedstring=dol_encode($stringtotest, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+        $decodedstring=dol_decode($encodedstring, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+        print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
+        $this->assertEquals($stringtotest,$decodedstring, 'Use dol_encode/decode with a key parameter');
 
         return 0;
     }
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 75cc767b8ee..fe896894d86 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -182,12 +182,12 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
     	$WS_METHOD  = 'createInvoice';
 
     	$body = array (
-    			"id" => NULL,
-				"ref" => NULL,
+    			"id" => null,
+				"ref" => null,
 				"ref_ext" => "ref-phpunit-2",
 				"thirdparty_id" => self::$socid,
-				"fk_user_author" => NULL,
-				"fk_user_valid" => NULL,
+				"fk_user_author" => null,
+				"fk_user_valid" => null,
 				"date" => "2015-04-19 20:16:53",
 				"date_due" => "",
 				"date_creation" => "",
@@ -201,11 +201,11 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 				"note_private" => "Synchronised from Prestashop",
 				"note_public" => "",
 				"status" => "1",
-				"close_code" => NULL ,
-				"close_note" => NULL,
-				"project_id" => NULL,
+				"close_code" => null ,
+				"close_note" => null,
+				"project_id" => null,
 				"lines" => array(
-					array("id" => NULL,
+					array("id" => null,
 					"type" => 0,
 					"desc" => "Horloge Vinyle Serge",
 					"vat_rate" => 20,
@@ -291,7 +291,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 
     	// Test URL
     	$result='';
-    	$parameters = array('authentication'=>$authentication,'id'=>NULL,'ref'=>NULL,'ref_ext'=>'ref-phpunit-2');
+    	$parameters = array('authentication'=>$authentication, 'id'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
@@ -339,12 +339,12 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 
     	// update status to 2
     	$body = array (
-    		"id" => NULL,
-			"ref" => NULL,
+    		"id" => null,
+			"ref" => null,
 			"ref_ext" => "ref-phpunit-2",
 			"thirdparty_id" => self::$socid,
-			"fk_user_author" => NULL,
-			"fk_user_valid" => NULL,
+			"fk_user_author" => null,
+			"fk_user_valid" => null,
 			"date" => "2015-04-19 20:16:53",
 			"date_due" => "",
 			"date_creation" => "",
@@ -358,12 +358,12 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 			"note_private" => "Synchronised from Prestashop",
 			"note_public" => "",
 			"status" => "2",
-			"close_code" => NULL ,
-			"close_note" => NULL,
-			"project_id" => NULL,
+			"close_code" => null ,
+			"close_note" => null,
+			"project_id" => null,
 			"lines"  => array(
 				array(
-				"id"  => NULL,
+				"id"  => null,
 				"type" => 0,
 				"desc" => "Horloge Vinyle Serge",
 				"vat_rate" => 20,
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index e0e22125afe..f974622e013 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -161,11 +161,11 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			'entity'=>'');
 
     	$body = array (
-    			"id" => NULL,
+    			"id" => null,
     			"ref" => "name",
     			"ref_ext" => "12",
-    			"fk_user_author" => NULL,
-    			"status" => NULL,
+    			"fk_user_author" => null,
+    			"status" => null,
     			"client" => 1,
     			"supplier" => 0,
     			"customer_code" => "CU0901-5678",